Update of /cvsroot/playerstage/code/player/libplayercore
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11345
Modified Files:
player.h
Log Message:
changes to audio interface to make it work right
Index: player.h
===================================================================
RCS file: /cvsroot/playerstage/code/player/libplayercore/player.h,v
retrieving revision 1.101
retrieving revision 1.102
diff -C2 -d -r1.101 -r1.102
*** player.h 1 Jun 2006 21:33:35 -0000 1.101
--- player.h 18 Jun 2006 19:33:23 -0000 1.102
***************
*** 403,411 ****
All drivers will respond to the universal request subtype,
PLAYER_CAPABILTIES_REQ.
! This request takes a data structure that defines the message type and subtype
of the
capability you wish to query. The driver will respond with a NACK if the
capability
is not supported and an ACK if it is.
! The HANDLE_CAPABILITY_REQUEST macro (from driver.h) can be used to make this
process
simpler, an example call would be something like this at the start of
ProcessMessage
--- 403,411 ----
All drivers will respond to the universal request subtype,
PLAYER_CAPABILTIES_REQ.
! This request takes a data structure that defines the message type and subtype
of the
capability you wish to query. The driver will respond with a NACK if the
capability
is not supported and an ACK if it is.
! The HANDLE_CAPABILITY_REQUEST macro (from driver.h) can be used to make this
process
simpler, an example call would be something like this at the start of
ProcessMessage
***************
*** 716,720 ****
/** Mixer channel list length */
! #define PLAYER_AUDIO_MIXER_CHANNEL_LIST_SIZE 16
/** Sequencer sequence length */
--- 716,720 ----
/** Mixer channel list length */
! #define PLAYER_AUDIO_MIXER_CHANNEL_LIST_SIZE 48
/** Sequencer sequence length */
***************
*** 727,736 ****
#define PLAYER_AUDIO_WAV_REC_DATA 1
! /** Data subtype: seq_data, recorded sequence of notes
data is a @ref player_audio_seq_t structure*/
#define PLAYER_AUDIO_SEQ_DATA 2
! /** Data subtype: mixer_channel_data, audio channel levels
data is a @ref player_audio_mixer_channel_list_t structure*/
--- 727,736 ----
#define PLAYER_AUDIO_WAV_REC_DATA 1
! /** Data subtype: seq_data, recorded sequence of notes
data is a @ref player_audio_seq_t structure*/
#define PLAYER_AUDIO_SEQ_DATA 2
! /** Data subtype: mixer_channel_data, audio channel levels
data is a @ref player_audio_mixer_channel_list_t structure*/
***************
*** 739,763 ****
! /** Command subtype: wav_play_cmd, play a raw data block, in structure
player_audio_wav_t
data is a @ref player_audio_wav_t structure*/
#define PLAYER_AUDIO_WAV_PLAY_CMD 1
! /** Command subtype: wav_stream_rec_cmd, start/stop recording, data will be
returned as data blocks
data is a @ref player_bool_t */
#define PLAYER_AUDIO_WAV_STREAM_REC_CMD 2
! /** Command subtype: sample_play_cmd, play a pre stored audio sample
data is a @ref player_audio_sample_item_t structure*/
#define PLAYER_AUDIO_SAMPLE_PLAY_CMD 3
! /** Command subtype: seq_play_cmd, play a sequence of tones
data is a @ref player_audio_seq_t structure*/
#define PLAYER_AUDIO_SEQ_PLAY_CMD 4
! /** Command subtype: mixer_channel_cmd, audio channel levels
data is a @ref player_audio_mixer_channel_list_t structure*/
--- 739,763 ----
! /** Command subtype: wav_play_cmd, play a raw data block, in structure
player_audio_wav_t
data is a @ref player_audio_wav_t structure*/
#define PLAYER_AUDIO_WAV_PLAY_CMD 1
! /** Command subtype: wav_stream_rec_cmd, start/stop recording, data will be
returned as data blocks
data is a @ref player_bool_t */
#define PLAYER_AUDIO_WAV_STREAM_REC_CMD 2
! /** Command subtype: sample_play_cmd, play a pre stored audio sample
data is a @ref player_audio_sample_item_t structure*/
#define PLAYER_AUDIO_SAMPLE_PLAY_CMD 3
! /** Command subtype: seq_play_cmd, play a sequence of tones
data is a @ref player_audio_seq_t structure*/
#define PLAYER_AUDIO_SEQ_PLAY_CMD 4
! /** Command subtype: mixer_channel_cmd, audio channel levels
data is a @ref player_audio_mixer_channel_list_t structure*/
***************
*** 766,795 ****
! /** Request subtype: wav_rec_req, record a fixed size data block, in
structure player_audio_wav_t
data is a @ref player_audio_wav_t structure*/
#define PLAYER_AUDIO_WAV_REC_REQ 1
! /** Request subtype: sample_load_req, store a sample
data is a @ref player_audio_sample_t structure*/
#define PLAYER_AUDIO_SAMPLE_LOAD_REQ 2
! /** Request subtype: sample_retrieve_req, retrieve a stored sample
data is a @ref player_audio_sample_t structure*/
#define PLAYER_AUDIO_SAMPLE_RETRIEVE_REQ 3
! /** Request subtype: sample_rec_req, record a new sample
data is a @ref player_audio_sample_item_t structure*/
#define PLAYER_AUDIO_SAMPLE_REC_REQ 4
! /** Request subtype: mixer_channel_list_req, request the list of channels
data is a @ref player_audio_mixer_channel_list_detail_t structure*/
#define PLAYER_AUDIO_MIXER_CHANNEL_LIST_REQ 5
! /** Request subtype: mixer_channel_level_req, request the channel levels
data is a @ref player_audio_mixer_channel_list_t structure*/
--- 766,795 ----
! /** Request subtype: wav_rec_req, record a fixed size data block, in
structure player_audio_wav_t
data is a @ref player_audio_wav_t structure*/
#define PLAYER_AUDIO_WAV_REC_REQ 1
! /** Request subtype: sample_load_req, store a sample
data is a @ref player_audio_sample_t structure*/
#define PLAYER_AUDIO_SAMPLE_LOAD_REQ 2
! /** Request subtype: sample_retrieve_req, retrieve a stored sample
data is a @ref player_audio_sample_t structure*/
#define PLAYER_AUDIO_SAMPLE_RETRIEVE_REQ 3
! /** Request subtype: sample_rec_req, record a new sample
data is a @ref player_audio_sample_item_t structure*/
#define PLAYER_AUDIO_SAMPLE_REC_REQ 4
! /** Request subtype: mixer_channel_list_req, request the list of channels
data is a @ref player_audio_mixer_channel_list_detail_t structure*/
#define PLAYER_AUDIO_MIXER_CHANNEL_LIST_REQ 5
! /** Request subtype: mixer_channel_level_req, request the channel levels
data is a @ref player_audio_mixer_channel_list_t structure*/
***************
*** 833,838 ****
/** @brief Data: Raw audio data
! This data is used in the PLAYER_AUDIO_WAV_PLAY_CMD, and returned as
! PLAYER_AUDIO_WAV_REC_DATA when stream recording is enabled
*/
typedef struct player_audio_wav
--- 833,838 ----
/** @brief Data: Raw audio data
! This data is used in the PLAYER_AUDIO_WAV_PLAY_CMD, and returned as
! PLAYER_AUDIO_WAV_REC_DATA when stream recording is enabled
*/
typedef struct player_audio_wav
***************
*** 892,895 ****
--- 892,897 ----
/** active (set to false to mute channel) */
player_bool_t active;
+ /** channel index */
+ uint32_t index;
} player_audio_mixer_channel_t;
***************
*** 916,920 ****
#define PLAYER_AUDIO_MIXER_CHANNEL_TYPE_OUTPUT 2
/** Special audio channel */
! #define PLAYER_AUDIO_MIXER_CHANNEL_TYPE_SPECIAL 3
/** @brief Player mixer channel detail
--- 918,922 ----
#define PLAYER_AUDIO_MIXER_CHANNEL_TYPE_OUTPUT 2
/** Special audio channel */
! #define PLAYER_AUDIO_MIXER_CHANNEL_TYPE_SPECIAL 4
/** @brief Player mixer channel detail
***************
*** 928,934 ****
uint32_t name_count;
/** Descriptive channel name */
! uint8_t name;
/** Channel type (input, output or special)*/
! uint8_t type;
} player_audio_mixer_channel_detail_t;
--- 930,936 ----
uint32_t name_count;
/** Descriptive channel name */
! char name[PLAYER_AUDIO_MIXER_CHANNEL_NAME_SIZE];
/** Channel type (input, output or special)*/
! uint8_t caps;
} player_audio_mixer_channel_detail_t;
***************
*** 970,974 ****
/** @brief Player audio sample selection
! Describes a pre-stored audio sample, use -1 for the index when recording
if you wish the next available slot to be used
--- 972,976 ----
/** @brief Player audio sample selection
! Describes a pre-stored audio sample, use -1 for the index when recording
if you wish the next available slot to be used
***************
*** 1872,1878 ****
The @p graphics3d interface provides an interface to graphics
devices. Drivers can implement this interface to provide clients and
! other drivers with graphics output.
! The interface uses an openGL style of command where a type is specified along
with a series of verticies. The interpretation depends on the command type
--- 1874,1880 ----
The @p graphics3d interface provides an interface to graphics
devices. Drivers can implement this interface to provide clients and
! other drivers with graphics output.
! The interface uses an openGL style of command where a type is specified along
with a series of verticies. The interpretation depends on the command type
***************
*** 1925,1929 ****
/** Color in which the points should be drawn. */
player_color_t color;
!
} player_graphics3d_cmd_draw_t;
--- 1927,1931 ----
/** Color in which the points should be drawn. */
player_color_t color;
!
} player_graphics3d_cmd_draw_t;
***************
*** 4316,4320 ****
* @brief Digital waveforms
! The @p waveform interface is used to receive arbitrary digital samples. For
audio data
you should probably use the audio interface.
*/
--- 4318,4322 ----
* @brief Digital waveforms
! The @p waveform interface is used to receive arbitrary digital samples. For
audio data
you should probably use the audio interface.
*/
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
