diff --git a/linux/alsa/alsa_driver.h b/linux/alsa/alsa_driver.h index 123b48589..b62015bb8 100644 --- a/linux/alsa/alsa_driver.h +++ b/linux/alsa/alsa_driver.h @@ -58,13 +58,19 @@ typedef struct _alsa_driver { JACK_DRIVER_NT_DECL + snd_pcm_format_t playback_sample_format; + snd_pcm_format_t capture_sample_format; + const snd_pcm_channel_area_t *capture_areas; + const snd_pcm_channel_area_t *playback_areas; + snd_pcm_hw_params_t *playback_hw_params; + snd_pcm_sw_params_t *playback_sw_params; + snd_pcm_hw_params_t *capture_hw_params; + snd_pcm_sw_params_t *capture_sw_params; int poll_timeout; jack_time_t poll_last; jack_time_t poll_next; char **playback_addr; char **capture_addr; - const snd_pcm_channel_area_t *capture_areas; - const snd_pcm_channel_area_t *playback_areas; struct pollfd *pfd; unsigned int playback_nfds; unsigned int capture_nfds; @@ -88,8 +94,6 @@ typedef struct _alsa_driver { char *alsa_driver; bitset_t channels_not_done; bitset_t channels_done; - snd_pcm_format_t playback_sample_format; - snd_pcm_format_t capture_sample_format; float max_sample_val; unsigned long user_nperiods; unsigned int playback_nperiods; @@ -98,10 +102,6 @@ typedef struct _alsa_driver { snd_ctl_t *ctl_handle; snd_pcm_t *playback_handle; snd_pcm_t *capture_handle; - snd_pcm_hw_params_t *playback_hw_params; - 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; ClockSyncStatus *clock_sync_data; jack_client_t *client;