Update of /cvsroot/playerstage/code/player/client_libs/libplayerc++
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11266
Modified Files:
playerc++.h audioproxy.cc
Log Message:
Modifications to audio proxy to make it easier to use
Index: playerc++.h
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc++/playerc++.h,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -d -r1.64 -r1.65
*** playerc++.h 1 Jun 2006 01:10:16 -0000 1.64
--- playerc++.h 18 Jun 2006 19:33:31 -0000 1.65
***************
*** 246,250 ****
/** @brief Command to play an audio block */
! void PlayWav(player_audio_wav_t * aData);
/** @brief Command to set recording state */
--- 246,250 ----
/** @brief Command to play an audio block */
! void PlayWav(uint32_t aDataCount, uint8_t *aData, uint32_t aFormat);
/** @brief Command to set recording state */
***************
*** 257,262 ****
void PlaySeq(player_audio_seq_t * aTones);
! /** @brief Command to set mixer levels */
! void SetMixerLevels(player_audio_mixer_channel_list_t * aLevels);
/** @brief Request to record a single audio block
--- 257,265 ----
void PlaySeq(player_audio_seq_t * aTones);
! /** @brief Command to set multiple mixer levels */
! void SetMultMixerLevels(player_audio_mixer_channel_list_t * aLevels);
!
! /** @brief Command to set a single mixer level */
! void SetMixerLevel(uint32_t index, float amplitude, uint8_t active);
/** @brief Request to record a single audio block
***************
*** 265,269 ****
/** @brief Request to load an audio sample */
! void LoadSample(int aIndex, player_audio_wav_t * aData);
/** @brief Request to retrieve an audio sample
--- 268,272 ----
/** @brief Request to load an audio sample */
! void LoadSample(int aIndex, uint32_t aDataCount, uint8_t *aData, uint32_t
aFormat);
/** @brief Request to retrieve an audio sample
Index: audioproxy.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc++/audioproxy.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** audioproxy.cc 12 May 2006 22:52:38 -0000 1.3
--- audioproxy.cc 18 Jun 2006 19:33:31 -0000 1.4
***************
*** 95,99 ****
<< channel.amplitude << '\t'
<< channel.active.state << '\t'
! << channel_detail.type << '\t'
<< channel_detail.name
<< std::endl;
--- 95,99 ----
<< channel.amplitude << '\t'
<< channel.active.state << '\t'
! << channel_detail.caps << '\t'
<< channel_detail.name
<< std::endl;
***************
*** 110,117 ****
/** @brief Command to play an audio block */
! void AudioProxy::PlayWav(player_audio_wav_t * aData)
{
scoped_lock_t lock(mPc->mMutex);
! playerc_audio_wav_play_cmd(mDevice, aData);
}
--- 110,117 ----
/** @brief Command to play an audio block */
! void AudioProxy::PlayWav(uint32_t aDataCount, uint8_t *aData, uint32_t
aFormat)
{
scoped_lock_t lock(mPc->mMutex);
! playerc_audio_wav_play_cmd(mDevice, aDataCount, aData, aFormat);
}
***************
*** 137,145 ****
}
! /** @brief Command to set mixer levels */
! void AudioProxy::SetMixerLevels(player_audio_mixer_channel_list_t * aLevels)
{
scoped_lock_t lock(mPc->mMutex);
! playerc_audio_mixer_channel_cmd(mDevice, aLevels);
}
--- 137,152 ----
}
! /** @brief Command to set multiple mixer levels */
! void AudioProxy::SetMultMixerLevels(player_audio_mixer_channel_list_t *
aLevels)
{
scoped_lock_t lock(mPc->mMutex);
! playerc_audio_mixer_multchannels_cmd(mDevice, aLevels);
! }
!
! /** @brief Command to set a single mixer level */
! void AudioProxy::SetMixerLevel(uint32_t index, float amplitude, uint8_t
active)
! {
! scoped_lock_t lock(mPc->mMutex);
! playerc_audio_mixer_channel_cmd(mDevice, index, amplitude, active);
}
***************
*** 160,167 ****
/** @brief Request to load an audio sample */
! void AudioProxy::LoadSample(int aIndex, player_audio_wav_t * aData)
{
scoped_lock_t lock(mPc->mMutex);
! int ret = playerc_audio_sample_load(mDevice, aIndex, aData);
if (ret == -2)
--- 167,174 ----
/** @brief Request to load an audio sample */
! void AudioProxy::LoadSample(int aIndex, uint32_t aDataCount, uint8_t *aData,
uint32_t aFormat)
{
scoped_lock_t lock(mPc->mMutex);
! int ret = playerc_audio_sample_load(mDevice, aIndex, aDataCount, aData,
aFormat);
if (ret == -2)
***************
*** 172,176 ****
ret);
}
! /** @brief Request to retrieve an audio sample
Data is stored in wav_data */
void AudioProxy::GetSample(int aIndex)
--- 179,184 ----
ret);
}
!
! /** @brief Request to retrieve an audio sample
Data is stored in wav_data */
void AudioProxy::GetSample(int aIndex)
***************
*** 201,205 ****
}
! /** @brief Request mixer channel data
result is stored in mixer_data*/
void AudioProxy::GetMixerLevels()
--- 209,213 ----
}
! /** @brief Request mixer channel data
result is stored in mixer_data*/
void AudioProxy::GetMixerLevels()
***************
*** 216,220 ****
}
! /** @brief Request mixer channel details list
result is stored in channel_details_list*/
void AudioProxy::GetMixerDetails()
--- 224,228 ----
}
! /** @brief Request mixer channel details list
result is stored in channel_details_list*/
void AudioProxy::GetMixerDetails()
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
