Update of /cvsroot/playerstage/code/player/server/drivers/audio
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10464/player/server/drivers/audio
Modified Files:
alsa.cc alsa.h
Log Message:
applied Toby's autopointer patches
Index: alsa.h
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/audio/alsa.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** alsa.h 20 Aug 2007 06:37:26 -0000 1.8
--- alsa.h 23 Aug 2007 19:58:42 -0000 1.9
***************
*** 89,93 ****
virtual int Shutdown (void);
! virtual int ProcessMessage (MessageQueue *resp_queue,
player_msghdr *hdr, void *data);
private:
--- 89,93 ----
virtual int Shutdown (void);
! virtual int ProcessMessage (QueuePointer &resp_queue,
player_msghdr *hdr, void *data);
private:
***************
*** 203,210 ****
int HandleRecordCmd (player_bool_t *data);
int HandleMixerChannelCmd (player_audio_mixer_channel_list_t
*data);
! int HandleSampleLoadReq (player_audio_sample_t *data,
MessageQueue *resp_queue);
! int HandleSampleRetrieveReq (player_audio_sample_t *data,
MessageQueue *resp_queue);
! int HandleSampleRecordReq (player_audio_sample_rec_req_t *data,
MessageQueue *resp_queue);
! int HandleMixerChannelListReq
(player_audio_mixer_channel_list_detail_t *data, MessageQueue *resp_queue);
! int HandleMixerChannelLevelReq
(player_audio_mixer_channel_list_t *data, MessageQueue *resp_queue);
};
--- 203,210 ----
int HandleRecordCmd (player_bool_t *data);
int HandleMixerChannelCmd (player_audio_mixer_channel_list_t
*data);
! int HandleSampleLoadReq (player_audio_sample_t *data,
QueuePointer &resp_queue);
! int HandleSampleRetrieveReq (player_audio_sample_t *data,
QueuePointer &resp_queue);
! int HandleSampleRecordReq (player_audio_sample_rec_req_t *data,
QueuePointer &resp_queue);
! int HandleMixerChannelListReq
(player_audio_mixer_channel_list_detail_t *data, QueuePointer &resp_queue);
! int HandleMixerChannelLevelReq
(player_audio_mixer_channel_list_t *data, QueuePointer &resp_queue);
};
Index: alsa.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/audio/alsa.cc,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** alsa.cc 20 Aug 2007 06:37:26 -0000 1.11
--- alsa.cc 23 Aug 2007 19:58:42 -0000 1.12
***************
*** 1266,1270 ****
// Publish this packet
! Publish (device_addr, NULL, PLAYER_MSGTYPE_DATA,
PLAYER_AUDIO_DATA_WAV_REC, reinterpret_cast<void*> (&packet), sizeof
(player_audio_wav_t), NULL);
delete[] packet.data;
}
--- 1266,1270 ----
// Publish this packet
! Publish (device_addr, PLAYER_MSGTYPE_DATA,
PLAYER_AUDIO_DATA_WAV_REC, reinterpret_cast<void*> (&packet), sizeof
(player_audio_wav_t), NULL);
delete[] packet.data;
}
***************
*** 1938,1942 ****
MixerLevelsToPlayer (&data);
! Publish (device_addr, NULL, PLAYER_MSGTYPE_DATA,
PLAYER_AUDIO_DATA_MIXER_CHANNEL, reinterpret_cast<void*> (&data), sizeof
(player_audio_mixer_channel_list_t), NULL);
}
--- 1938,1942 ----
MixerLevelsToPlayer (&data);
! Publish (device_addr, PLAYER_MSGTYPE_DATA,
PLAYER_AUDIO_DATA_MIXER_CHANNEL, reinterpret_cast<void*> (&data), sizeof
(player_audio_mixer_channel_list_t), NULL);
}
***************
*** 2352,2356 ****
msg.state = PLAYER_AUDIO_STATE_STOPPED;
! Publish (device_addr, NULL, PLAYER_MSGTYPE_DATA,
PLAYER_AUDIO_DATA_STATE, reinterpret_cast<void*> (&msg), sizeof
(player_audio_state_t), NULL);
}
--- 2352,2356 ----
msg.state = PLAYER_AUDIO_STATE_STOPPED;
! Publish (device_addr, PLAYER_MSGTYPE_DATA, PLAYER_AUDIO_DATA_STATE,
reinterpret_cast<void*> (&msg), sizeof (player_audio_state_t), NULL);
}
***************
*** 2432,2436 ****
}
! int Alsa::HandleSampleLoadReq (player_audio_sample_t *data, MessageQueue
*resp_queue)
{
// If the requested index to store at is at end or -1, append to the
list
--- 2432,2436 ----
}
! int Alsa::HandleSampleLoadReq (player_audio_sample_t *data, QueuePointer
&resp_queue)
{
// If the requested index to store at is at end or -1, append to the
list
***************
*** 2479,2483 ****
}
! int Alsa::HandleSampleRetrieveReq (player_audio_sample_t *data, MessageQueue
*resp_queue)
{
// If the requested index to retrieve is beyond the end or negative,
error
--- 2479,2483 ----
}
! int Alsa::HandleSampleRetrieveReq (player_audio_sample_t *data, QueuePointer
&resp_queue)
{
// If the requested index to retrieve is beyond the end or negative,
error
***************
*** 2508,2512 ****
// Handle a request to record a sample and store it locally in the sample
store
! int Alsa::HandleSampleRecordReq (player_audio_sample_rec_req_t *data,
MessageQueue *resp_queue)
{
// Can't record to sample and clients at the same time (yet)
--- 2508,2512 ----
// Handle a request to record a sample and store it locally in the sample
store
! int Alsa::HandleSampleRecordReq (player_audio_sample_rec_req_t *data,
QueuePointer &resp_queue)
{
// Can't record to sample and clients at the same time (yet)
***************
*** 2561,2565 ****
}
! int Alsa::HandleMixerChannelListReq (player_audio_mixer_channel_list_detail_t
*data, MessageQueue *resp_queue)
{
player_audio_mixer_channel_list_detail_t result;
--- 2561,2565 ----
}
! int Alsa::HandleMixerChannelListReq (player_audio_mixer_channel_list_detail_t
*data, QueuePointer &resp_queue)
{
player_audio_mixer_channel_list_detail_t result;
***************
*** 2570,2574 ****
}
! int Alsa::HandleMixerChannelLevelReq (player_audio_mixer_channel_list_t
*data, MessageQueue *resp_queue)
{
player_audio_mixer_channel_list_t result;
--- 2570,2574 ----
}
! int Alsa::HandleMixerChannelLevelReq (player_audio_mixer_channel_list_t
*data, QueuePointer &resp_queue)
{
player_audio_mixer_channel_list_t result;
***************
*** 2580,2584 ****
// Message processing
! int Alsa::ProcessMessage (MessageQueue *resp_queue, player_msghdr *hdr, void
*data)
{
// Check for capabilities requests first
--- 2580,2584 ----
// Message processing
! int Alsa::ProcessMessage (QueuePointer &resp_queue, player_msghdr *hdr, void
*data)
{
// Check for capabilities requests first
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
