Update ALSA driver in progress.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4199 0c269be4-1314-0410-8aa9-9f06e86f4224

linux/alsa/alsa_driver.h

@@ -32,6 +32,9 @@
 #define IS_BE 0
 #endif
 
+#define TRUE 1
+#define FALSE 0
+
 #include "types.h"
 #include "hardware.h"
 #include "driver.h"
@@ -45,13 +48,8 @@ typedef void (*WriteCopyFunction) (char *dst, jack_default_audio_sample_t *src,
                                    unsigned long src_bytes,
                                    unsigned long dst_skip_bytes,
                                    dither_state_t *state);
-typedef void (*CopyCopyFunction)  (char *dst, char *src,
-                                   unsigned long src_bytes,
-                                   unsigned long dst_skip_bytes,
-                                   unsigned long src_skip_byte);
 
-typedef struct _alsa_driver
-{
+typedef struct _alsa_driver {
 
     JACK_DRIVER_NT_DECL
 
@@ -100,7 +98,7 @@ typedef struct _alsa_driver
     snd_pcm_sw_params_t          *playback_sw_params;
     snd_pcm_hw_params_t          *capture_hw_params;
     snd_pcm_sw_params_t          *capture_sw_params;
-    jack_hardware_t              *hw;
+    jack_hardware_t              *hw;  
     ClockSyncStatus              *clock_sync_data;
     jack_client_t                *client;
     JSList                       *capture_ports;
@@ -124,7 +122,6 @@ typedef struct _alsa_driver
 
     ReadCopyFunction read_via_copy;
     WriteCopyFunction write_via_copy;
-    CopyCopyFunction channel_copy;
 
     int             dither;
     dither_state_t *dither_state;
@@ -144,100 +141,81 @@ typedef struct _alsa_driver
     alsa_midi_t *midi;
     int xrun_recovery;
 
-}
-alsa_driver_t;
+} alsa_driver_t;
 
-static inline void
-alsa_driver_mark_channel_done (alsa_driver_t *driver, channel_t chn)
-{
-    bitset_remove (driver->channels_not_done, chn);
-    driver->silent[chn] = 0;
+static inline void 
+alsa_driver_mark_channel_done (alsa_driver_t *driver, channel_t chn) {
+	bitset_remove (driver->channels_not_done, chn);
+	driver->silent[chn] = 0;
 }
 
-static inline void
+static inline void 
 alsa_driver_silence_on_channel (alsa_driver_t *driver, channel_t chn,
-                                jack_nframes_t nframes)
-{
-    if (driver->playback_interleaved) {
-        memset_interleave
-        (driver->playback_addr[chn],
-         0, nframes * driver->playback_sample_bytes,
-         driver->interleave_unit,
-         driver->playback_interleave_skip[chn]);
-    } else {
-        memset (driver->playback_addr[chn], 0,
-                nframes * driver->playback_sample_bytes);
-    }
-    alsa_driver_mark_channel_done (driver, chn);
+				jack_nframes_t nframes) {
+	if (driver->playback_interleaved) {
+		memset_interleave 
+			(driver->playback_addr[chn],
+			 0, nframes * driver->playback_sample_bytes,
+			 driver->interleave_unit,
+			 driver->playback_interleave_skip[chn]);
+	} else {
+		memset (driver->playback_addr[chn], 0,
+			nframes * driver->playback_sample_bytes);
+	}
+	alsa_driver_mark_channel_done (driver,chn);
 }
 
-static inline void
+static inline void 
 alsa_driver_silence_on_channel_no_mark (alsa_driver_t *driver, channel_t chn,
-                                        jack_nframes_t nframes)
-{
-    if (driver->playback_interleaved) {
-        memset_interleave
-        (driver->playback_addr[chn],
-         0, nframes * driver->playback_sample_bytes,
-         driver->interleave_unit,
-         driver->playback_interleave_skip[chn]);
-    } else {
-        memset (driver->playback_addr[chn], 0,
-                nframes * driver->playback_sample_bytes);
-    }
+					jack_nframes_t nframes) {
+	if (driver->playback_interleaved) {
+		memset_interleave 
+			(driver->playback_addr[chn],
+			 0, nframes * driver->playback_sample_bytes,
+			 driver->interleave_unit,
+			 driver->playback_interleave_skip[chn]);
+	} else {
+		memset (driver->playback_addr[chn], 0,
+			nframes * driver->playback_sample_bytes);
+	}
 }
 
-static inline void
+static inline void 
 alsa_driver_read_from_channel (alsa_driver_t *driver,
-                               channel_t channel,
-                               jack_default_audio_sample_t *buf,
-                               jack_nframes_t nsamples)
+			       channel_t channel,
+			       jack_default_audio_sample_t *buf,
+			       jack_nframes_t nsamples)
 {
-    driver->read_via_copy (buf,
-                           driver->capture_addr[channel],
-                           nsamples,
-                           driver->capture_interleave_skip[channel]);
+	driver->read_via_copy (buf, 
+			       driver->capture_addr[channel],
+			       nsamples, 
+			       driver->capture_interleave_skip[channel]);
 }
 
-static inline void
+static inline void 
 alsa_driver_write_to_channel (alsa_driver_t *driver,
-                              channel_t channel,
-                              jack_default_audio_sample_t *buf,
-                              jack_nframes_t nsamples)
-{
-    driver->write_via_copy (driver->playback_addr[channel],
-                            buf,
-                            nsamples,
-                            driver->playback_interleave_skip[channel],
-                            driver->dither_state + channel);
-    alsa_driver_mark_channel_done (driver, channel);
-}
-
-static inline void
-alsa_driver_copy_channel (alsa_driver_t *driver,
-                          channel_t input_channel,
-                          channel_t output_channel,
-                          jack_nframes_t nsamples)
+			      channel_t channel, 
+			      jack_default_audio_sample_t *buf, 
+			      jack_nframes_t nsamples)
 {
-
-    driver->channel_copy (driver->playback_addr[output_channel],
-                          driver->capture_addr[input_channel],
-                          nsamples * driver->playback_sample_bytes,
-                          driver->playback_interleave_skip[output_channel],
-                          driver->capture_interleave_skip[input_channel]);
-    alsa_driver_mark_channel_done (driver, output_channel);
+	driver->write_via_copy (driver->playback_addr[channel],
+				buf, 
+				nsamples, 
+				driver->playback_interleave_skip[channel],
+				driver->dither_state+channel);
+	alsa_driver_mark_channel_done (driver, channel);
 }
 
 void  alsa_driver_silence_untouched_channels (alsa_driver_t *driver,
-        jack_nframes_t nframes);
+					      jack_nframes_t nframes);
 void  alsa_driver_set_clock_sync_status (alsa_driver_t *driver, channel_t chn,
-        ClockSyncStatus status);
+					 ClockSyncStatus status);
 int   alsa_driver_listen_for_clock_sync_status (alsa_driver_t *,
-        ClockSyncListenerFunction,
-        void *arg);
+						ClockSyncListenerFunction,
+						void *arg);
 int   alsa_driver_stop_listen_for_clock_sync_status (alsa_driver_t *,
-        unsigned int);
+						     unsigned int);
 void  alsa_driver_clock_sync_notify (alsa_driver_t *, channel_t chn,
-                                     ClockSyncStatus);
+				     ClockSyncStatus);
 
 #endif /* __jack_alsa_driver_h__ */

linux/wscript

@@ -2,7 +2,7 @@
 # encoding: utf-8
 
 def configure(conf):
-    conf.check_cfg(package='alsa', atleast_version='1.0.18', args='--cflags --libs')
+    conf.check_cfg(package='alsa', atleast_version='1.0.0', args='--cflags --libs')
     conf.env['BUILD_DRIVER_ALSA'] = conf.is_defined('HAVE_ALSA')
 
     conf. check_cfg(package='libfreebob', atleast_version='1.0.0', args='--cflags --libs')
@@ -44,13 +44,15 @@ def build(bld):
   	
     create_jack_driver_obj(bld, 'dummy', '../common/JackDummyDriver.cpp')
     
-    alsa_driver_src = ['alsa/JackAlsaDriver.cpp',
+    alsa_driver_src = [
+                       'alsa/JackAlsaDriver.cpp',
                        'alsa/alsa_rawmidi.c',
                        'alsa/alsa_seqmidi.c',
                        'alsa/alsa_midi_jackmp.cpp',
                        '../common/memops.c',
                        'alsa/generic_hw.c',
                        'alsa/hdsp.c',
+		       'alsa/alsa_driver.c',
                        'alsa/hammerfall.c',
                        'alsa/ice1712.c'
                        ]