@@ -58,13 +58,19 @@ typedef struct _alsa_driver {
5858
5959 JACK_DRIVER_NT_DECL
6060
61+ snd_pcm_format_t playback_sample_format ;
62+ snd_pcm_format_t capture_sample_format ;
63+ const snd_pcm_channel_area_t * capture_areas ;
64+ const snd_pcm_channel_area_t * playback_areas ;
65+ snd_pcm_hw_params_t * playback_hw_params ;
66+ snd_pcm_sw_params_t * playback_sw_params ;
67+ snd_pcm_hw_params_t * capture_hw_params ;
68+ snd_pcm_sw_params_t * capture_sw_params ;
6169 int poll_timeout ;
6270 jack_time_t poll_last ;
6371 jack_time_t poll_next ;
6472 char * * playback_addr ;
6573 char * * capture_addr ;
66- const snd_pcm_channel_area_t * capture_areas ;
67- const snd_pcm_channel_area_t * playback_areas ;
6874 struct pollfd * pfd ;
6975 unsigned int playback_nfds ;
7076 unsigned int capture_nfds ;
@@ -88,8 +94,6 @@ typedef struct _alsa_driver {
8894 char * alsa_driver ;
8995 bitset_t channels_not_done ;
9096 bitset_t channels_done ;
91- snd_pcm_format_t playback_sample_format ;
92- snd_pcm_format_t capture_sample_format ;
9397 float max_sample_val ;
9498 unsigned long user_nperiods ;
9599 unsigned int playback_nperiods ;
@@ -98,10 +102,6 @@ typedef struct _alsa_driver {
98102 snd_ctl_t * ctl_handle ;
99103 snd_pcm_t * playback_handle ;
100104 snd_pcm_t * capture_handle ;
101- snd_pcm_hw_params_t * playback_hw_params ;
102- snd_pcm_sw_params_t * playback_sw_params ;
103- snd_pcm_hw_params_t * capture_hw_params ;
104- snd_pcm_sw_params_t * capture_sw_params ;
105105 jack_hardware_t * hw ;
106106 ClockSyncStatus * clock_sync_data ;
107107 jack_client_t * client ;
0 commit comments