Update of /cvsroot/playerstage/code/player/client_libs/libplayerc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10938
Modified Files:
playerc.h dev_audio.c
Log Message:
Modifications to audio proxy to make it easier to use
Index: dev_audio.c
===================================================================
RCS file: /cvsroot/playerstage/code/player/client_libs/libplayerc/dev_audio.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** dev_audio.c 12 May 2006 22:52:38 -0000 1.1
--- dev_audio.c 18 Jun 2006 19:33:22 -0000 1.2
***************
*** 113,121 ****
/** @brief Command to play an audio block */
! int playerc_audio_wav_play_cmd(playerc_audio_t *device, player_audio_wav_t *
data)
{
return playerc_client_write(device->info.client, &device->info,
PLAYER_AUDIO_WAV_PLAY_CMD,
! data, NULL);
}
--- 113,127 ----
/** @brief Command to play an audio block */
! int playerc_audio_wav_play_cmd(playerc_audio_t *device, uint32_t data_count,
uint8_t data[], uint32_t format)
{
+ player_audio_wav_t wave_data;
+ memset (&wave_data, 0, sizeof (player_audio_wav_t));
+ wave_data.data_count = data_count;
+ memcpy (&wave_data.data, data, wave_data.data_count);
+ wave_data.format = format;
+
return playerc_client_write(device->info.client, &device->info,
PLAYER_AUDIO_WAV_PLAY_CMD,
! &wave_data, NULL);
}
***************
*** 149,154 ****
}
! /** @brief Command to set mixer levels */
! int playerc_audio_mixer_channel_cmd(playerc_audio_t *device,
player_audio_mixer_channel_list_t * levels)
{
return playerc_client_write(device->info.client, &device->info,
--- 155,160 ----
}
! /** @brief Command to set multiple mixer levels */
! int playerc_audio_mixer_multchannels_cmd(playerc_audio_t *device,
player_audio_mixer_channel_list_t * levels)
{
return playerc_client_write(device->info.client, &device->info,
***************
*** 157,160 ****
--- 163,181 ----
}
+ /** @brief Command to set a single mixer level */
+ int playerc_audio_mixer_channel_cmd(playerc_audio_t *device, uint32_t index,
float amplitude, uint8_t active)
+ {
+ player_audio_mixer_channel_list_t cmd;
+ memset (&cmd, 0, sizeof (player_audio_mixer_channel_list_t));
+ cmd.channels_count = 1;
+ cmd.channels[0].amplitude = amplitude;
+ cmd.channels[0].active.state = active;
+ cmd.channels[0].index = index;
+
+ return playerc_client_write(device->info.client, &device->info,
+ PLAYER_AUDIO_MIXER_CHANNEL_CMD,
+ &cmd, NULL);
+ }
+
/** @brief Request to record a single audio block
***************
*** 174,188 ****
/** @brief Request to load an audio sample */
! int playerc_audio_sample_load(playerc_audio_t *device, int index,
player_audio_wav_t * data)
{
int result = 0;
player_audio_sample_t req;
! req.sample.data_count = data->data_count;
! memcpy(req.sample.data, data->data, req.sample.data_count *
sizeof(req.sample.data[0]));
! req.sample.format = data->format;
req.index = index;
if((result = playerc_client_request(device->info.client, &device->info,
! PLAYER_AUDIO_SAMPLE_LOAD_REQ,
! &req, NULL, 0)) < 0)
return result;
--- 195,208 ----
/** @brief Request to load an audio sample */
! int playerc_audio_sample_load(playerc_audio_t *device, int index, uint32_t
data_count, uint8_t data[], uint32_t format)
{
int result = 0;
player_audio_sample_t req;
! req.sample.data_count = data_count;
! memcpy(req.sample.data, data, req.sample.data_count *
sizeof(req.sample.data[0]));
! req.sample.format = format;
req.index = index;
if((result = playerc_client_request(device->info.client, &device->info,
! PLAYER_AUDIO_SAMPLE_LOAD_REQ, &req, NULL, 0)) < 0)
return result;
***************
*** 190,194 ****
}
! /** @brief Request to retrieve an audio sample
Data is stored in wav_data */
int playerc_audio_sample_retrieve(playerc_audio_t *device, int index)
--- 210,214 ----
}
! /** @brief Request to retrieve an audio sample
Data is stored in wav_data */
int playerc_audio_sample_retrieve(playerc_audio_t *device, int index)
***************
*** 224,228 ****
}
! /** @brief Request mixer channel data
result is stored in mixer_data*/
int playerc_audio_get_mixer_levels(playerc_audio_t *device)
--- 244,248 ----
}
! /** @brief Request mixer channel data
result is stored in mixer_data*/
int playerc_audio_get_mixer_levels(playerc_audio_t *device)
***************
*** 231,235 ****
player_audio_mixer_channel_list_t req;
if((result = playerc_client_request(device->info.client, &device->info,
! PLAYER_AUDIO_MIXER_CHANNEL_LIST_REQ ,
NULL, &req, sizeof(req))) < 0)
return result;
--- 251,255 ----
player_audio_mixer_channel_list_t req;
if((result = playerc_client_request(device->info.client, &device->info,
! PLAYER_AUDIO_MIXER_CHANNEL_LEVEL_REQ ,
NULL, &req, sizeof(req))) < 0)
return result;
***************
*** 242,246 ****
}
! /** @brief Request mixer channel details list
result is stored in channel_details_list*/
int playerc_audio_get_mixer_details(playerc_audio_t *device)
--- 262,266 ----
}
! /** @brief Request mixer channel details list
result is stored in channel_details_list*/
int playerc_audio_get_mixer_details(playerc_audio_t *device)
Index: playerc.h
===================================================================
RCS file: /cvsroot/playerstage/code/player/client_libs/libplayerc/playerc.h,v
retrieving revision 1.198
retrieving revision 1.199
diff -C2 -d -r1.198 -r1.199
*** playerc.h 22 May 2006 15:01:11 -0000 1.198
--- playerc.h 18 Jun 2006 19:33:22 -0000 1.199
***************
*** 947,951 ****
/** @brief Command to play an audio block */
! int playerc_audio_wav_play_cmd(playerc_audio_t *device, player_audio_wav_t *
data);
/** @brief Command to set recording state */
--- 947,951 ----
/** @brief Command to play an audio block */
! int playerc_audio_wav_play_cmd(playerc_audio_t *device, uint32_t data_count,
uint8_t data[], uint32_t format);
/** @brief Command to set recording state */
***************
*** 958,963 ****
int playerc_audio_seq_play_cmd(playerc_audio_t *device, player_audio_seq_t *
tones);
! /** @brief Command to set mixer levels */
! int playerc_audio_mixer_channel_cmd(playerc_audio_t *device,
player_audio_mixer_channel_list_t * levels);
/** @brief Request to record a single audio block
--- 958,966 ----
int playerc_audio_seq_play_cmd(playerc_audio_t *device, player_audio_seq_t *
tones);
! /** @brief Command to set mixer levels for multiple channels */
! int playerc_audio_mixer_multchannels_cmd(playerc_audio_t *device,
player_audio_mixer_channel_list_t * levels);
!
! /** @brief Command to set mixer levels for a single channel */
! int playerc_audio_mixer_channel_cmd(playerc_audio_t *device, uint32_t index,
float amplitude, uint8_t active);
/** @brief Request to record a single audio block
***************
*** 966,970 ****
/** @brief Request to load an audio sample */
! int playerc_audio_sample_load(playerc_audio_t *device, int index,
player_audio_wav_t * data);
/** @brief Request to retrieve an audio sample
--- 969,973 ----
/** @brief Request to load an audio sample */
! int playerc_audio_sample_load(playerc_audio_t *device, int index, uint32_t
data_count, uint8_t data[], uint32_t format);
/** @brief Request to retrieve an audio sample
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
