Coding style...

diff --git a/include/control.h b/include/control.h
index aa70b1a880c3546229d54340e42630e435a4bbdc..7bc33f05ad7a1d8c0bd826bd296e0af8ca839c34 100644 (file)
--- a/include/control.h
+++ b/include/control.h
@@ -9,45 +9,45 @@
 extern "C" {
 #endif
 
-int snd_cards( void );
-unsigned int snd_cards_mask( void );
-int snd_card_name( const char *name );
- 
-int snd_ctl_open( void **handle, int card );
-int snd_ctl_close( void *handle );
-int snd_ctl_file_descriptor( void *handle );
-int snd_ctl_hw_info( void *handle, struct snd_ctl_hw_info *info );
-int snd_ctl_switches( void *handle );
-int snd_ctl_switch( void *handle, const char *switch_id );
-int snd_ctl_switch_read( void *handle, int switchn, snd_ctl_switch_t *data );
-int snd_ctl_switch_write( void *handle, int switchn, snd_ctl_switch_t *data );
-int snd_ctl_pcm_info( void *handle, int dev, snd_pcm_info_t *info );
-int snd_ctl_pcm_playback_info( void *handle, int dev, snd_pcm_playback_info_t *info );
-int snd_ctl_pcm_record_info( void *handle, int dev, snd_pcm_record_info_t *info );
-int snd_ctl_pcm_playback_switches( void *handle, int dev );
-int snd_ctl_pcm_playback_switch( void *handle, int dev, const char *switch_id );
-int snd_ctl_pcm_playback_switch_read( void *handle, int dev, int switchn, snd_pcm_switch_t *data );
-int snd_ctl_pcm_playback_switch_write( void *handle, int dev, int switchn, snd_pcm_switch_t *data );
-int snd_ctl_pcm_record_switches( void *handle, int dev );
-int snd_ctl_pcm_record_switch( void *handle, int dev, const char *switch_id );
-int snd_ctl_pcm_record_switch_read( void *handle, int dev, int switchn, snd_pcm_switch_t *data );
-int snd_ctl_pcm_record_switch_write( void *handle, int dev, int switchn, snd_pcm_switch_t *data );
-int snd_ctl_mixer_info( void *handle, int dev, snd_mixer_info_t *info );
-int snd_ctl_mixer_switches( void *handle, int dev );
-int snd_ctl_mixer_switch( void *handle, int dev, const char *switch_id );
-int snd_ctl_mixer_switch_read( void *handle, int dev, int switchn, snd_mixer_switch_t *data );
-int snd_ctl_mixer_switch_write( void *handle, int dev, int switchn, snd_mixer_switch_t *data );
-int snd_ctl_rawmidi_info( void *handle, int dev, snd_rawmidi_info_t *info );
-int snd_ctl_rawmidi_output_info( void *handle, int dev, snd_rawmidi_output_info_t *info );
-int snd_ctl_rawmidi_input_info( void *handle, int dev, snd_rawmidi_input_info_t *info );
-int snd_ctl_rawmidi_output_switches( void *handle, int dev );
-int snd_ctl_rawmidi_output_switch( void *handle, int dev, const char *switch_id );
-int snd_ctl_rawmidi_output_switch_read( void *handle, int dev, int switchn, snd_rawmidi_switch_t *data );
-int snd_ctl_rawmidi_output_switch_write( void *handle, int dev, int switchn, snd_rawmidi_switch_t *data );
-int snd_ctl_rawmidi_input_switches( void *handle, int dev );
-int snd_ctl_rawmidi_input_switch( void *handle, int dev, const char *switch_id );
-int snd_ctl_rawmidi_input_switch_read( void *handle, int dev, int switchn, snd_rawmidi_switch_t *data );
-int snd_ctl_rawmidi_input_switch_write( void *handle, int dev, int switchn, snd_rawmidi_switch_t *data );
+int snd_cards(void);
+unsigned int snd_cards_mask(void);
+int snd_card_name(const char *name);
+
+int snd_ctl_open(void **handle, int card);
+int snd_ctl_close(void *handle);
+int snd_ctl_file_descriptor(void *handle);
+int snd_ctl_hw_info(void *handle, struct snd_ctl_hw_info *info);
+int snd_ctl_switches(void *handle);
+int snd_ctl_switch(void *handle, const char *switch_id);
+int snd_ctl_switch_read(void *handle, int switchn, snd_ctl_switch_t * data);
+int snd_ctl_switch_write(void *handle, int switchn, snd_ctl_switch_t * data);
+int snd_ctl_pcm_info(void *handle, int dev, snd_pcm_info_t * info);
+int snd_ctl_pcm_playback_info(void *handle, int dev, snd_pcm_playback_info_t * info);
+int snd_ctl_pcm_record_info(void *handle, int dev, snd_pcm_record_info_t * info);
+int snd_ctl_pcm_playback_switches(void *handle, int dev);
+int snd_ctl_pcm_playback_switch(void *handle, int dev, const char *switch_id);
+int snd_ctl_pcm_playback_switch_read(void *handle, int dev, int switchn, snd_pcm_switch_t * data);
+int snd_ctl_pcm_playback_switch_write(void *handle, int dev, int switchn, snd_pcm_switch_t * data);
+int snd_ctl_pcm_record_switches(void *handle, int dev);
+int snd_ctl_pcm_record_switch(void *handle, int dev, const char *switch_id);
+int snd_ctl_pcm_record_switch_read(void *handle, int dev, int switchn, snd_pcm_switch_t * data);
+int snd_ctl_pcm_record_switch_write(void *handle, int dev, int switchn, snd_pcm_switch_t * data);
+int snd_ctl_mixer_info(void *handle, int dev, snd_mixer_info_t * info);
+int snd_ctl_mixer_switches(void *handle, int dev);
+int snd_ctl_mixer_switch(void *handle, int dev, const char *switch_id);
+int snd_ctl_mixer_switch_read(void *handle, int dev, int switchn, snd_mixer_switch_t * data);
+int snd_ctl_mixer_switch_write(void *handle, int dev, int switchn, snd_mixer_switch_t * data);
+int snd_ctl_rawmidi_info(void *handle, int dev, snd_rawmidi_info_t * info);
+int snd_ctl_rawmidi_output_info(void *handle, int dev, snd_rawmidi_output_info_t * info);
+int snd_ctl_rawmidi_input_info(void *handle, int dev, snd_rawmidi_input_info_t * info);
+int snd_ctl_rawmidi_output_switches(void *handle, int dev);
+int snd_ctl_rawmidi_output_switch(void *handle, int dev, const char *switch_id);
+int snd_ctl_rawmidi_output_switch_read(void *handle, int dev, int switchn, snd_rawmidi_switch_t * data);
+int snd_ctl_rawmidi_output_switch_write(void *handle, int dev, int switchn, snd_rawmidi_switch_t * data);
+int snd_ctl_rawmidi_input_switches(void *handle, int dev);
+int snd_ctl_rawmidi_input_switch(void *handle, int dev, const char *switch_id);
+int snd_ctl_rawmidi_input_switch_read(void *handle, int dev, int switchn, snd_rawmidi_switch_t * data);
+int snd_ctl_rawmidi_input_switch_write(void *handle, int dev, int switchn, snd_rawmidi_switch_t * data);
 
 #ifdef __cplusplus
 }

diff --git a/include/mixer.h b/include/mixer.h
index b4026d3695ed6202f6ba896f23766e9dfd93c5cc..2068be478b2dddc347c4850917c38a2882b3c4be 100644 (file)
--- a/include/mixer.h
+++ b/include/mixer.h
@@ -6,30 +6,30 @@
  ****************************************************************************/
 
 typedef struct snd_mixer_callbacks {
-  void *private_data;          /* should be used by application */
-  void (*channel_was_changed)( void *private_data, int channel );
-  void (*switch_was_changed)( void *private_data, int switchn );
-  void *reserved[14];          /* reserved for future use - must be NULL!!! */
+       void *private_data;     /* should be used by application */
+       void (*channel_was_changed) (void *private_data, int channel);
+       void (*switch_was_changed) (void *private_data, int switchn);
+       void *reserved[14];     /* reserved for future use - must be NULL!!! */
 } snd_mixer_callbacks_t;
- 
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-int snd_mixer_open( void **handle, int card, int device );
-int snd_mixer_close( void *handle );
-int snd_mixer_file_descriptor( void *handle );
-int snd_mixer_channels( void *handle );
-int snd_mixer_info( void *handle, snd_mixer_info_t *info );
-int snd_mixer_exact_mode( void *handle, int enable );
-int snd_mixer_channel( void *handle, const char *channel_id );
-int snd_mixer_channel_info( void *handle, int channel, snd_mixer_channel_info_t *info );
-int snd_mixer_channel_read( void *handle, int channel, snd_mixer_channel_t *data );
-int snd_mixer_channel_write( void *handle, int channel, snd_mixer_channel_t *data );
-int snd_mixer_switches( void *handle );
-int snd_mixer_switch_read( void *handle, int switchn, snd_mixer_switch_t *data );
-int snd_mixer_switch_write( void *handle, int switchn, snd_mixer_switch_t *data );
-int snd_mixer_read( void *handle, snd_mixer_callbacks_t *callbacks );
+int snd_mixer_open(void **handle, int card, int device);
+int snd_mixer_close(void *handle);
+int snd_mixer_file_descriptor(void *handle);
+int snd_mixer_channels(void *handle);
+int snd_mixer_info(void *handle, snd_mixer_info_t * info);
+int snd_mixer_exact_mode(void *handle, int enable);
+int snd_mixer_channel(void *handle, const char *channel_id);
+int snd_mixer_channel_info(void *handle, int channel, snd_mixer_channel_info_t * info);
+int snd_mixer_channel_read(void *handle, int channel, snd_mixer_channel_t * data);
+int snd_mixer_channel_write(void *handle, int channel, snd_mixer_channel_t * data);
+int snd_mixer_switches(void *handle);
+int snd_mixer_switch_read(void *handle, int switchn, snd_mixer_switch_t * data);
+int snd_mixer_switch_write(void *handle, int switchn, snd_mixer_switch_t * data);
+int snd_mixer_read(void *handle, snd_mixer_callbacks_t * callbacks);
 
 #ifdef __cplusplus
 }

diff --git a/include/pcm.h b/include/pcm.h
index 23aef0003e317cc8be9ac4332785e2330d1a382a..0509aace03beca1e4e7590a33a8f7c04fb74d697 100644 (file)
--- a/include/pcm.h
+++ b/include/pcm.h
@@ -4,44 +4,44 @@
  *                        Digital Audio Interface                           *
  *                                                                          *
  ****************************************************************************/
- 
+
 #define SND_PCM_OPEN_PLAYBACK  (O_WRONLY)
 #define SND_PCM_OPEN_RECORD    (O_RDONLY)
 #define SND_PCM_OPEN_DUPLEX    (O_RDWR)
- 
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-int snd_pcm_open( void **handle, int card, int device, int mode );
-int snd_pcm_close( void *handle );
-int snd_pcm_file_descriptor( void *handle );
-int snd_pcm_block_mode( void *handle, int enable );
-int snd_pcm_info( void *handle, snd_pcm_info_t *info );
-int snd_pcm_playback_info( void *handle, snd_pcm_playback_info_t *info );
-int snd_pcm_record_info( void *handle, snd_pcm_record_info_t *info );
-int snd_pcm_playback_switches( void *handle );
-int snd_pcm_playback_switch( void *handle, const char *switch_id );
-int snd_pcm_playback_switch_read( void *handle, int switchn, snd_pcm_switch_t *data );
-int snd_pcm_playback_switch_write( void *handle, int switchn, snd_pcm_switch_t *data ); 
-int snd_pcm_record_switches( void *handle );
-int snd_pcm_record_switch( void *handle, const char *switch_id );
-int snd_pcm_record_switch_read( void *handle, int switchn, snd_pcm_switch_t *data );
-int snd_pcm_record_switch_write( void *handle, int switchn, snd_pcm_switch_t *data ); 
-int snd_pcm_playback_format( void *handle, snd_pcm_format_t *format );
-int snd_pcm_record_format( void *handle, snd_pcm_format_t *format );
-int snd_pcm_playback_params( void *handle, snd_pcm_playback_params_t *params );
-int snd_pcm_record_params( void *handle, snd_pcm_record_params_t *params );
-int snd_pcm_playback_status( void *handle, snd_pcm_playback_status_t *status );
-int snd_pcm_record_status( void *handle, snd_pcm_record_status_t *status );
-int snd_pcm_drain_playback( void *handle );
-int snd_pcm_flush_playback( void *handle );
-int snd_pcm_flush_record( void *handle );
-int snd_pcm_playback_pause( void *handle, int enable );
-int snd_pcm_playback_time( void *handle, int enable );
-int snd_pcm_record_time( void *handle, int enable );
-ssize_t snd_pcm_write( void *handle, const void *buffer, size_t size );
-ssize_t snd_pcm_read( void *handle, void *buffer, size_t size );
+int snd_pcm_open(void **handle, int card, int device, int mode);
+int snd_pcm_close(void *handle);
+int snd_pcm_file_descriptor(void *handle);
+int snd_pcm_block_mode(void *handle, int enable);
+int snd_pcm_info(void *handle, snd_pcm_info_t * info);
+int snd_pcm_playback_info(void *handle, snd_pcm_playback_info_t * info);
+int snd_pcm_record_info(void *handle, snd_pcm_record_info_t * info);
+int snd_pcm_playback_switches(void *handle);
+int snd_pcm_playback_switch(void *handle, const char *switch_id);
+int snd_pcm_playback_switch_read(void *handle, int switchn, snd_pcm_switch_t * data);
+int snd_pcm_playback_switch_write(void *handle, int switchn, snd_pcm_switch_t * data);
+int snd_pcm_record_switches(void *handle);
+int snd_pcm_record_switch(void *handle, const char *switch_id);
+int snd_pcm_record_switch_read(void *handle, int switchn, snd_pcm_switch_t * data);
+int snd_pcm_record_switch_write(void *handle, int switchn, snd_pcm_switch_t * data);
+int snd_pcm_playback_format(void *handle, snd_pcm_format_t * format);
+int snd_pcm_record_format(void *handle, snd_pcm_format_t * format);
+int snd_pcm_playback_params(void *handle, snd_pcm_playback_params_t * params);
+int snd_pcm_record_params(void *handle, snd_pcm_record_params_t * params);
+int snd_pcm_playback_status(void *handle, snd_pcm_playback_status_t * status);
+int snd_pcm_record_status(void *handle, snd_pcm_record_status_t * status);
+int snd_pcm_drain_playback(void *handle);
+int snd_pcm_flush_playback(void *handle);
+int snd_pcm_flush_record(void *handle);
+int snd_pcm_playback_pause(void *handle, int enable);
+int snd_pcm_playback_time(void *handle, int enable);
+int snd_pcm_record_time(void *handle, int enable);
+ssize_t snd_pcm_write(void *handle, const void *buffer, size_t size);
+ssize_t snd_pcm_read(void *handle, void *buffer, size_t size);
 
 #ifdef __cplusplus
 }
@@ -54,14 +54,15 @@ ssize_t snd_pcm_read( void *handle, void *buffer, size_t size );
 extern "C" {
 #endif
 
-int snd_pcm_loopback_open( void **handle, int card, int device, int mode );
-int snd_pcm_loopback_close( void *handle );
-int snd_pcm_loopback_file_descriptor( void *handle );
-int snd_pcm_loopback_block_mode( void *handle, int enable );
-int snd_pcm_loopback_stream_mode( void *handle, int mode );
-int snd_pcm_loopback_format( void *handle, snd_pcm_format_t *format );
-ssize_t snd_pcm_loopback_read( void *handle, void *buffer, size_t size );
+int snd_pcm_loopback_open(void **handle, int card, int device, int mode);
+int snd_pcm_loopback_close(void *handle);
+int snd_pcm_loopback_file_descriptor(void *handle);
+int snd_pcm_loopback_block_mode(void *handle, int enable);
+int snd_pcm_loopback_stream_mode(void *handle, int mode);
+int snd_pcm_loopback_format(void *handle, snd_pcm_format_t * format);
+ssize_t snd_pcm_loopback_read(void *handle, void *buffer, size_t size);
 
 #ifdef __cplusplus
 }
 #endif
+

diff --git a/include/rawmidi.h b/include/rawmidi.h
index acc391b95db001c941526ce4f79e7ad0b1c83139..ea504014bb7e5d78dae58959895918053a24dd09 100644 (file)
--- a/include/rawmidi.h
+++ b/include/rawmidi.h
@@ -4,37 +4,37 @@
  *                          RawMIDI interface                               *
  *                                                                          *
  ****************************************************************************/
- 
+
 #define SND_RAWMIDI_OPEN_OUTPUT                (O_WRONLY)
 #define SND_RAWMIDI_OPEN_INPUT         (O_RDONLY)
 #define SND_RAWMIDI_OPEN_DUPLEX                (O_RDWR)
- 
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-int snd_rawmidi_open( void **handle, int card, int device, int mode );
-int snd_rawmidi_close( void *handle );
-int snd_rawmidi_file_descriptor( void *handle );
-int snd_rawmidi_block_mode( void *handle, int enable );
-int snd_rawmidi_info( void *handle, snd_rawmidi_info_t *info );
-int snd_rawmidi_output_switches( void *handle );
-int snd_rawmidi_output_switch( void *handle, const char *switch_id );
-int snd_rawmidi_output_switch_read( void *handle, int switchn, snd_rawmidi_switch_t *data );
-int snd_rawmidi_output_switch_write( void *handle, int switchn, snd_rawmidi_switch_t *data );
-int snd_rawmidi_input_switches( void *handle );
-int snd_rawmidi_input_switch( void *handle, const char *switch_id );
-int snd_rawmidi_input_switch_read( void *handle, int switchn, snd_rawmidi_switch_t *data );
-int snd_rawmidi_input_switch_write( void *handle, int switchn, snd_rawmidi_switch_t *data );
-int snd_rawmidi_output_params( void *handle, snd_rawmidi_output_params_t *params );
-int snd_rawmidi_input_params( void *handle, snd_rawmidi_input_params_t *params );
-int snd_rawmidi_output_status( void *handle, snd_rawmidi_output_status_t *status );
-int snd_rawmidi_input_status( void *handle, snd_rawmidi_input_status_t *status );
-int snd_rawmidi_drain_output( void *handle );
-int snd_rawmidi_flush_output( void *handle );
-int snd_rawmidi_flush_input( void *handle );
-ssize_t snd_rawmidi_write( void *handle, const void *buffer, size_t size );
-ssize_t snd_rawmidi_read( void *handle, void *buffer, size_t size );
+int snd_rawmidi_open(void **handle, int card, int device, int mode);
+int snd_rawmidi_close(void *handle);
+int snd_rawmidi_file_descriptor(void *handle);
+int snd_rawmidi_block_mode(void *handle, int enable);
+int snd_rawmidi_info(void *handle, snd_rawmidi_info_t * info);
+int snd_rawmidi_output_switches(void *handle);
+int snd_rawmidi_output_switch(void *handle, const char *switch_id);
+int snd_rawmidi_output_switch_read(void *handle, int switchn, snd_rawmidi_switch_t * data);
+int snd_rawmidi_output_switch_write(void *handle, int switchn, snd_rawmidi_switch_t * data);
+int snd_rawmidi_input_switches(void *handle);
+int snd_rawmidi_input_switch(void *handle, const char *switch_id);
+int snd_rawmidi_input_switch_read(void *handle, int switchn, snd_rawmidi_switch_t * data);
+int snd_rawmidi_input_switch_write(void *handle, int switchn, snd_rawmidi_switch_t * data);
+int snd_rawmidi_output_params(void *handle, snd_rawmidi_output_params_t * params);
+int snd_rawmidi_input_params(void *handle, snd_rawmidi_input_params_t * params);
+int snd_rawmidi_output_status(void *handle, snd_rawmidi_output_status_t * status);
+int snd_rawmidi_input_status(void *handle, snd_rawmidi_input_status_t * status);
+int snd_rawmidi_drain_output(void *handle);
+int snd_rawmidi_flush_output(void *handle);
+int snd_rawmidi_flush_input(void *handle);
+ssize_t snd_rawmidi_write(void *handle, const void *buffer, size_t size);
+ssize_t snd_rawmidi_read(void *handle, void *buffer, size_t size);
 
 #ifdef __cplusplus
 }