···

       
2
       
2
       
 
       


     

       
3
       
3
       
 
       
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";

     

       
4
       
4
       
 
       


     

       
5
       
5
       
-
       
let version = "0.6.2.291"; in

     

       
5
       
5
       
+
       
let version = "0.6.6.10"; in

     

       
6
       
6
       
 
       


     

       
7
       
7
       
 
       
stdenv.mkDerivation {

     

       
8
       
8
       
 
       
  name = "spotify-${version}";

     
···

       
10
       
10
       
 
       
  src =

     

       
11
       
11
       
 
       
    if stdenv.system == "i686-linux" then 

     

       
12
       
12
       
 
       
      fetchurl {

     

       
13
       
13
       
-
       
        url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.gcccc1f5.116-1_i386.deb";

     

       
14
       
14
       
-
       
        sha256 = "164ka9xry9nbnv77w71kzi7bjidlmccw8wnn4fyzavi8pbrpmj08";

     

       
13
       
13
       
+
       
        url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.gbd39032.58-1_i386.deb";

     

       
14
       
14
       
+
       
        sha256 = "184wvw2jqihw7bbmd7pgz51nkzvk777imz9pvknv52mggai61523";

     

       
15
       
15
       
 
       
      }

     

       
16
       
16
       
 
       
    else if stdenv.system == "x86_64-linux" then 

     

       
17
       
17
       
 
       
      fetchurl {

     

       
18
       
18
       
-
       
        url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.gcccc1f5.116-1_amd64.deb";

     

       
19
       
19
       
-
       
        sha256 = "08snnpqd5ldiqv98pwx3fjrhdlwp4arbgda9xnsy92wfk0s85lv8";

     

       
18
       
18
       
+
       
        url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.gbd39032.58-1_amd64.deb";

     

       
19
       
19
       
+
       
        sha256 = "0qy4dgcl4y8ymqk8i9vgabik7mq0niqpbkwl3sk8z66znax4am4c";

     

       
20
       
20
       
 
       
      }

     

       
21
       
21
       
 
       
    else throw "Spotify not supported on this platform.";

     

       
22
       
22
       
 
       


     

···

       
1
       
1
       
-
       
diff -rc xmms-1.2.10-orig/Output/alsa/alsa.h xmms-1.2.10/Output/alsa/alsa.h

     

       
2
       
2
       
-
       
*** xmms-1.2.10-orig/Output/alsa/alsa.h	2004-01-11 17:27:26.000000000 +0100

     

       
3
       
3
       
-
       
--- xmms-1.2.10/Output/alsa/alsa.h	2006-01-27 00:28:49.000000000 +0100

     

       
4
       
4
       
-
       
***************

     

       
5
       
5
       
-
       
*** 50,57 ****

     

       
6
       
6
       
-
       
  	char *mixer_device;

     

       
7
       
7
       
-
       
  	int buffer_time;

     

       
8
       
8
       
-
       
  	int period_time;

     

       
9
       
9
       
-
       
  	gboolean debug;

     

       
10
       
10
       
-
       
- 	gboolean mmap;

     

       
11
       
11
       
-
       
  	struct

     

       
12
       
12
       
-
       
  	{

     

       
13
       
13
       
-
       
  		int left, right;

     

       
14
       
14
       
-
       
--- 50,57 ----

     

       
15
       
15
       
-
       
  	char *mixer_device;

     

       
16
       
16
       
-
       
  	int buffer_time;

     

       
17
       
17
       
-
       
  	int period_time;

     

       
18
       
18
       
-
       
+ 	int thread_buffer_time;

     

       
19
       
19
       
-
       
  	gboolean debug;

     

       
20
       
20
       
-
       
  	struct

     

       
21
       
21
       
-
       
  	{

     

       
22
       
22
       
-
       
  		int left, right;

     

       
23
       
23
       
-
       
***************

     

       
24
       
24
       
-
       
*** 65,72 ****

     

       
25
       
25
       
-
       
  void alsa_about(void);

     

       
26
       
26
       
-
       
  void alsa_configure(void);

     

       
27
       
27
       
-
       
  int alsa_get_mixer(snd_mixer_t **mixer, int card);

     

       
28
       
28
       
-
       
- snd_mixer_elem_t* alsa_get_mixer_elem(snd_mixer_t *mixer, char *name, int index);

     

       
29
       
29
       
-
       
- int alsa_setup_mixer(void);

     

       
30
       
30
       
-
       
  void alsa_save_config(void);

     

       
31
       
31
       
-
       
  

     

       
32
       
32
       
-
       
  void alsa_get_volume(int *l, int *r);

     

       
33
       
33
       
-
       
--- 65,70 ----

     

       
34
       
34
       
-
       
diff -rc xmms-1.2.10-orig/Output/alsa/audio.c xmms-1.2.10/Output/alsa/audio.c

     

       
35
       
35
       
-
       
*** xmms-1.2.10-orig/Output/alsa/audio.c	2004-01-28 00:09:39.000000000 +0100

     

       
36
       
36
       
-
       
--- xmms-1.2.10/Output/alsa/audio.c	2006-01-27 00:28:49.000000000 +0100

     

       
37
       
37
       
-
       
***************

     

       
38
       
38
       
-
       
*** 17,52 ****

     

       
39
       
39
       
-
       
   *  You should have received a copy of the GNU General Public License

     

       
40
       
40
       
-
       
   *  along with this program; if not, write to the Free Software

     

       
41
       
41
       
-
       
   *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

     

       
42
       
42
       
-
       
   */

     

       
43
       
43
       
-
       
  

     

       
44
       
44
       
-
       
  #include "alsa.h"

     

       
45
       
45
       
-
       
  #include <ctype.h>

     

       
46
       
46
       
-
       
  #include <libxmms/xconvert.h>

     

       
47
       
47
       
-
       
  

     

       
48
       
48
       
-
       
  static snd_pcm_t		*alsa_pcm 	    = NULL;

     

       
49
       
49
       
-
       
- static snd_pcm_status_t		*alsa_status 	    = NULL;

     

       
50
       
50
       
-
       
- static snd_pcm_channel_area_t   *areas              = NULL;

     

       
51
       
51
       
-
       
  

     

       
52
       
52
       
-
       
  static snd_output_t		*logs 		    = NULL;

     

       
53
       
53
       
-
       
  

     

       
54
       
54
       
-
       
! static int 			 alsa_bps 	    = 0;

     

       
55
       
55
       
-
       
! static guint64			 alsa_total_written = 0;

     

       
56
       
56
       
-
       
  

     

       
57
       
57
       
-
       
  /* Set/Get volume */

     

       
58
       
58
       
-
       
  static snd_mixer_elem_t 	*pcm_element 	    = NULL;

     

       
59
       
59
       
-
       
  static snd_mixer_t 		*mixer 		    = NULL;

     

       
60
       
60
       
-
       
  

     

       
61
       
61
       
-
       
! static gboolean mmap, force_start, going, paused;

     

       
62
       
62
       
-
       
  

     

       
63
       
63
       
-
       
! static gpointer buffer;

     

       
64
       
64
       
-
       
  

     

       
65
       
65
       
-
       
- static int alsa_can_pause;

     

       
66
       
66
       
-
       
  

     

       
67
       
67
       
-
       
  struct snd_format {

     

       
68
       
68
       
-
       
  	unsigned int rate;

     

       
69
       
69
       
-
       
  	unsigned int channels;

     

       
70
       
70
       
-
       
  	snd_pcm_format_t format;

     

       
71
       
71
       
-
       
  	AFormat xmms_format;

     

       
72
       
72
       
-
       
  };

     

       
73
       
73
       
-
       
  

     

       
74
       
74
       
-
       
  static struct snd_format *inputf = NULL;

     

       
75
       
75
       
-
       
--- 17,72 ----

     

       
76
       
76
       
-
       
   *  You should have received a copy of the GNU General Public License

     

       
77
       
77
       
-
       
   *  along with this program; if not, write to the Free Software

     

       
78
       
78
       
-
       
   *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

     

       
79
       
79
       
-
       
+  *

     

       
80
       
80
       
-
       
+  *

     

       
81
       
81
       
-
       
+  *  CHANGES

     

       
82
       
82
       
-
       
+  *

     

       
83
       
83
       
-
       
+  *  2005.01.05  Takashi Iwai <tiwai@suse.de>

     

       
84
       
84
       
-
       
+  *	Impelemented the multi-threaded mode with an audio-thread.

     

       
85
       
85
       
-
       
+  *	Many fixes and cleanups.

     

       
86
       
86
       
-
       
   */

     

       
87
       
87
       
-
       
  

     

       
88
       
88
       
-
       
  #include "alsa.h"

     

       
89
       
89
       
-
       
  #include <ctype.h>

     

       
90
       
90
       
-
       
+ #include <pthread.h>

     

       
91
       
91
       
-
       
  #include <libxmms/xconvert.h>

     

       
92
       
92
       
-
       
  

     

       
93
       
93
       
-
       
  static snd_pcm_t		*alsa_pcm 	    = NULL;

     

       
94
       
94
       
-
       
  

     

       
95
       
95
       
-
       
  static snd_output_t		*logs 		    = NULL;

     

       
96
       
96
       
-
       
  

     

       
97
       
97
       
-
       
! static guint64			 alsa_total_written = 0;	/* input bytes */

     

       
98
       
98
       
-
       
! static guint64			 alsa_hw_written    = 0;	/* output bytes */

     

       
99
       
99
       
-
       
! static gint			 output_time_offset = 0;

     

       
100
       
100
       
-
       
! 

     

       
101
       
101
       
-
       
! /* device buffer/period sizes in bytes */

     

       
102
       
102
       
-
       
! static int hw_buffer_size, hw_period_size;		/* in output bytes */

     

       
103
       
103
       
-
       
! static int hw_buffer_size_in, hw_period_size_in;	/* in input bytes */

     

       
104
       
104
       
-
       
  

     

       
105
       
105
       
-
       
  /* Set/Get volume */

     

       
106
       
106
       
-
       
  static snd_mixer_elem_t 	*pcm_element 	    = NULL;

     

       
107
       
107
       
-
       
  static snd_mixer_t 		*mixer 		    = NULL;

     

       
108
       
108
       
-
       
  

     

       
109
       
109
       
-
       
! static gboolean going, paused;

     

       
110
       
110
       
-
       
  

     

       
111
       
111
       
-
       
! static gboolean alsa_can_pause;

     

       
112
       
112
       
-
       
! 

     

       
113
       
113
       
-
       
! /* for audio thread */

     

       
114
       
114
       
-
       
! static pthread_t audio_thread;		/* audio loop thread */

     

       
115
       
115
       
-
       
! static int thread_buffer_size;		/* size of intermediate buffer in bytes */

     

       
116
       
116
       
-
       
! static char *thread_buffer;		/* audio intermediate buffer */

     

       
117
       
117
       
-
       
! static int rd_index, wr_index;		/* current read/write position in int-buffer */

     

       
118
       
118
       
-
       
! static gboolean pause_request;		/* pause status currently requested */

     

       
119
       
119
       
-
       
! static gint flush_request;		/* flush status (time) currently requested */

     

       
120
       
120
       
-
       
  

     

       
121
       
121
       
-
       
  

     

       
122
       
122
       
-
       
  struct snd_format {

     

       
123
       
123
       
-
       
  	unsigned int rate;

     

       
124
       
124
       
-
       
  	unsigned int channels;

     

       
125
       
125
       
-
       
  	snd_pcm_format_t format;

     

       
126
       
126
       
-
       
  	AFormat xmms_format;

     

       
127
       
127
       
-
       
+ 	int sample_bits;

     

       
128
       
128
       
-
       
+ 	int bps;

     

       
129
       
129
       
-
       
  };

     

       
130
       
130
       
-
       
  

     

       
131
       
131
       
-
       
  static struct snd_format *inputf = NULL;

     

       
132
       
132
       
-
       
***************

     

       
133
       
133
       
-
       
*** 54,61 ****

     

       
134
       
134
       
-
       
  static struct snd_format *outputf = NULL;

     

       
135
       
135
       
-
       
  

     

       
136
       
136
       
-
       
  static int alsa_setup(struct snd_format *f);

     

       
137
       
137
       
-
       
! static void alsa_mmap_audio(char *data, int length);

     

       
138
       
138
       
-
       
! static void alsa_write_audio(gpointer data, int length);

     

       
139
       
139
       
-
       
  

     

       
140
       
140
       
-
       
  static struct snd_format * snd_format_from_xmms(AFormat fmt, int rate, int channels);

     

       
141
       
141
       
-
       
  

     

       
142
       
142
       
-
       
--- 74,80 ----

     

       
143
       
143
       
-
       
  static struct snd_format *outputf = NULL;

     

       
144
       
144
       
-
       
  

     

       
145
       
145
       
-
       
  static int alsa_setup(struct snd_format *f);

     

       
146
       
146
       
-
       
! static void alsa_write_audio(char *data, int length);

     

       
147
       
147
       
-
       
  

     

       
148
       
148
       
-
       
  static struct snd_format * snd_format_from_xmms(AFormat fmt, int rate, int channels);

     

       
149
       
149
       
-
       
  

     

       
150
       
150
       
-
       
***************

     

       
151
       
151
       
-
       
*** 71,92 ****

     

       
152
       
152
       
-
       
  } format_table[] =

     

       
153
       
153
       
-
       
  {{FMT_S16_LE, SND_PCM_FORMAT_S16_LE},

     

       
154
       
154
       
-
       
   {FMT_S16_BE, SND_PCM_FORMAT_S16_BE},

     

       
155
       
155
       
-
       
!  {FMT_S16_NE,

     

       
156
       
156
       
-
       
! #ifdef WORDS_BIGENDIAN

     

       
157
       
157
       
-
       
!   SND_PCM_FORMAT_S16_BE

     

       
158
       
158
       
-
       
! #else

     

       
159
       
159
       
-
       
!   SND_PCM_FORMAT_S16_LE

     

       
160
       
160
       
-
       
! #endif

     

       
161
       
161
       
-
       
!  },

     

       
162
       
162
       
-
       
   {FMT_U16_LE, SND_PCM_FORMAT_U16_LE},

     

       
163
       
163
       
-
       
   {FMT_U16_BE, SND_PCM_FORMAT_U16_BE},

     

       
164
       
164
       
-
       
!  {FMT_U16_NE,

     

       
165
       
165
       
-
       
! #ifdef WORDS_BIGENDIAN

     

       
166
       
166
       
-
       
!   SND_PCM_FORMAT_U16_BE

     

       
167
       
167
       
-
       
! #else

     

       
168
       
168
       
-
       
!   SND_PCM_FORMAT_U16_LE

     

       
169
       
169
       
-
       
! #endif

     

       
170
       
170
       
-
       
!  },

     

       
171
       
171
       
-
       
   {FMT_U8, SND_PCM_FORMAT_U8},

     

       
172
       
172
       
-
       
   {FMT_S8, SND_PCM_FORMAT_S8},

     

       
173
       
173
       
-
       
  };

     

       
174
       
174
       
-
       
--- 90,99 ----

     

       
175
       
175
       
-
       
  } format_table[] =

     

       
176
       
176
       
-
       
  {{FMT_S16_LE, SND_PCM_FORMAT_S16_LE},

     

       
177
       
177
       
-
       
   {FMT_S16_BE, SND_PCM_FORMAT_S16_BE},

     

       
178
       
178
       
-
       
!  {FMT_S16_NE, SND_PCM_FORMAT_S16},

     

       
179
       
179
       
-
       
   {FMT_U16_LE, SND_PCM_FORMAT_U16_LE},

     

       
180
       
180
       
-
       
   {FMT_U16_BE, SND_PCM_FORMAT_U16_BE},

     

       
181
       
181
       
-
       
!  {FMT_U16_NE, SND_PCM_FORMAT_U16},

     

       
182
       
182
       
-
       
   {FMT_U8, SND_PCM_FORMAT_U8},

     

       
183
       
183
       
-
       
   {FMT_S8, SND_PCM_FORMAT_S8},

     

       
184
       
184
       
-
       
  };

     

       
185
       
185
       
-
       
***************

     

       
186
       
186
       
-
       
*** 106,281 ****

     

       
187
       
187
       
-
       
  	}

     

       
188
       
188
       
-
       
  }

     

       
189
       
189
       
-
       
  

     

       
190
       
190
       
-
       
! int alsa_playing(void)

     

       
191
       
191
       
-
       
! {

     

       
192
       
192
       
-
       
! 	if (!going || paused)

     

       
193
       
193
       
-
       
! 		return FALSE;

     

       
194
       
194
       
-
       
! 

     

       
195
       
195
       
-
       
! 	return(snd_pcm_state(alsa_pcm) == SND_PCM_STATE_RUNNING);

     

       
196
       
196
       
-
       
! }

     

       
197
       
197
       
-
       
! 

     

       
198
       
198
       
-
       
! static void xrun_recover(void)

     

       
199
       
199
       
-
       
! {

     

       
200
       
200
       
-
       
! 	int err;

     

       
201
       
201
       
-
       
! 

     

       
202
       
202
       
-
       
! 	if (alsa_cfg.debug)

     

       
203
       
203
       
-
       
! 	{

     

       
204
       
204
       
-
       
! 		snd_pcm_status_alloca(&alsa_status);

     

       
205
       
205
       
-
       
! 		if ((err = snd_pcm_status(alsa_pcm, alsa_status)) < 0)

     

       
206
       
206
       
-
       
! 			g_warning("xrun_recover(): snd_pcm_status() failed");

     

       
207
       
207
       
-
       
! 		else

     

       
208
       
208
       
-
       
! 		{

     

       
209
       
209
       
-
       
! 			printf("Status:\n");

     

       
210
       
210
       
-
       
! 			snd_pcm_status_dump(alsa_status, logs);

     

       
211
       
211
       
-
       
! 		}

     

       
212
       
212
       
-
       
! 	}

     

       
213
       
213
       
-
       
! 

     

       
214
       
214
       
-
       
! 	if (snd_pcm_state(alsa_pcm) == SND_PCM_STATE_XRUN)

     

       
215
       
215
       
-
       
! 	{

     

       
216
       
216
       
-
       
! 		if ((err = snd_pcm_prepare(alsa_pcm)) < 0)

     

       
217
       
217
       
-
       
! 			g_warning("xrun_recover(): snd_pcm_prepare() failed.");

     

       
218
       
218
       
-
       
! 	}

     

       
219
       
219
       
-
       
! }

     

       
220
       
220
       
-
       
! 

     

       
221
       
221
       
-
       
! static snd_pcm_sframes_t alsa_get_avail(void)

     

       
222
       
222
       
-
       
! {

     

       
223
       
223
       
-
       
! 	snd_pcm_sframes_t ret;

     

       
224
       
224
       
-
       
! 	if ((ret = snd_pcm_avail_update(alsa_pcm)) == -EPIPE)

     

       
225
       
225
       
-
       
! 		xrun_recover();

     

       
226
       
226
       
-
       
! 	else if (ret < 0)

     

       
227
       
227
       
-
       
! 	{

     

       
228
       
228
       
-
       
! 		g_warning("alsa_get_avail(): snd_pcm_avail_update() failed: %s",

     

       
229
       
229
       
-
       
! 			  snd_strerror(-ret));

     

       
230
       
230
       
-
       
! 		return 0;

     

       
231
       
231
       
-
       
! 	}

     

       
232
       
232
       
-
       
! 	else

     

       
233
       
233
       
-
       
! 		return ret;

     

       
234
       
234
       
-
       
! 	if ((ret = snd_pcm_avail_update(alsa_pcm)) < 0)

     

       
235
       
235
       
-
       
! 	{

     

       
236
       
236
       
-
       
! 		g_warning("alsa_get_avail(): snd_pcm_avail_update() failed: %s",

     

       
237
       
237
       
-
       
! 			  snd_strerror(-ret));

     

       
238
       
238
       
-
       
! 		return 0;

     

       
239
       
239
       
-
       
! 	}

     

       
240
       
240
       
-
       
! 	return ret;

     

       
241
       
241
       
-
       
! }

     

       
242
       
242
       
-
       
! 

     

       
243
       
243
       
-
       
! int alsa_free(void)

     

       
244
       
244
       
-
       
! {

     

       
245
       
245
       
-
       
! 	if (paused)

     

       
246
       
246
       
-
       
! 		return 0;

     

       
247
       
247
       
-
       
! 	else

     

       
248
       
248
       
-
       
! 	{

     

       
249
       
249
       
-
       
! 		int err;

     

       
250
       
250
       
-
       
! 		if (force_start &&

     

       
251
       
251
       
-
       
! 		    snd_pcm_state(alsa_pcm) == SND_PCM_STATE_PREPARED)

     

       
252
       
252
       
-
       
! 		{

     

       
253
       
253
       
-
       
! 			if ((err = snd_pcm_start(alsa_pcm)) < 0)

     

       
254
       
254
       
-
       
! 				g_warning("alsa_free(): snd_pcm_start() "

     

       
255
       
255
       
-
       
! 					  "failed: %s", snd_strerror(-err));

     

       
256
       
256
       
-
       
! 			else

     

       
257
       
257
       
-
       
! 				debug("Stream started");

     

       
258
       
258
       
-
       
! 		}

     

       
259
       
259
       
-
       
! 		force_start = TRUE;

     

       
260
       
260
       
-
       
! 

     

       
261
       
261
       
-
       
! 		return snd_pcm_frames_to_bytes(alsa_pcm, alsa_get_avail());

     

       
262
       
262
       
-
       
! 	}

     

       
263
       
263
       
-
       
! }

     

       
264
       
264
       
-
       
! 

     

       
265
       
265
       
-
       
! void alsa_pause(short p)

     

       
266
       
266
       
-
       
! {

     

       
267
       
267
       
-
       
! 	debug("alsa_pause");

     

       
268
       
268
       
-
       
! 	if (p)

     

       
269
       
269
       
-
       
! 		paused = TRUE;

     

       
270
       
270
       
-
       
! 

     

       
271
       
271
       
-
       
! 	if (alsa_can_pause)

     

       
272
       
272
       
-
       
! 		snd_pcm_pause(alsa_pcm, p);

     

       
273
       
273
       
-
       
! 	else if (p)

     

       
274
       
274
       
-
       
! 		snd_pcm_drop(alsa_pcm);

     

       
275
       
275
       
-
       
! 

     

       
276
       
276
       
-
       
! 	if (!p)

     

       
277
       
277
       
-
       
! 		paused = FALSE;

     

       
278
       
278
       
-
       
! }

     

       
279
       
279
       
-
       
! 

     

       
280
       
280
       
-
       
! void alsa_close(void)

     

       
281
       
281
       
-
       
! {

     

       
282
       
282
       
-
       
! 	int err, started;

     

       
283
       
283
       
-
       
! 

     

       
284
       
284
       
-
       
! 	debug("Closing device");

     

       
285
       
285
       
-
       
! 

     

       
286
       
286
       
-
       
! 	started = going;

     

       
287
       
287
       
-
       
! 	going = 0;

     

       
288
       
288
       
-
       
! 

     

       
289
       
289
       
-
       
! 	pcm_element = NULL;

     

       
290
       
290
       
-
       
! 

     

       
291
       
291
       
-
       
! 	if (mixer)

     

       
292
       
292
       
-
       
! 	{

     

       
293
       
293
       
-
       
! 		snd_mixer_close(mixer);

     

       
294
       
294
       
-
       
! 		mixer = NULL;

     

       
295
       
295
       
-
       
! 	}

     

       
296
       
296
       
-
       
! 

     

       
297
       
297
       
-
       
! 	if (alsa_pcm != NULL)

     

       
298
       
298
       
-
       
! 	{

     

       
299
       
299
       
-
       
! 		if (started)

     

       
300
       
300
       
-
       
! 			if ((err = snd_pcm_drop(alsa_pcm)) < 0)

     

       
301
       
301
       
-
       
! 				g_warning("alsa_pcm_drop() failed: %s",

     

       
302
       
302
       
-
       
! 					  snd_strerror(-err));

     

       
303
       
303
       
-
       
! 

     

       
304
       
304
       
-
       
! 		if ((err = snd_pcm_close(alsa_pcm)) < 0)

     

       
305
       
305
       
-
       
! 			g_warning("alsa_pcm_close() failed: %s",

     

       
306
       
306
       
-
       
! 				  snd_strerror(-err));

     

       
307
       
307
       
-
       
! 		alsa_pcm = NULL;

     

       
308
       
308
       
-
       
! 	}

     

       
309
       
309
       
-
       
! 

     

       
310
       
310
       
-
       
! 	if (mmap) {

     

       
311
       
311
       
-
       
! 		g_free(buffer);

     

       
312
       
312
       
-
       
! 		buffer = NULL;

     

       
313
       
313
       
-
       
! 

     

       
314
       
314
       
-
       
! 		g_free(areas);

     

       
315
       
315
       
-
       
! 		areas = NULL;

     

       
316
       
316
       
-
       
! 	}

     

       
317
       
317
       
-
       
! 

     

       
318
       
318
       
-
       
! 	xmms_convert_buffers_destroy(convertb);

     

       
319
       
319
       
-
       
! 	convertb = NULL;

     

       
320
       
320
       
-
       
! 	g_free(inputf);

     

       
321
       
321
       
-
       
! 	inputf = NULL;

     

       
322
       
322
       
-
       
! 	g_free(effectf);

     

       
323
       
323
       
-
       
! 	effectf = NULL;

     

       
324
       
324
       
-
       
! 

     

       
325
       
325
       
-
       
! 	alsa_save_config();

     

       
326
       
326
       
-
       
! 

     

       
327
       
327
       
-
       
! 	debug("Device closed");

     

       
328
       
328
       
-
       
! }

     

       
329
       
329
       
-
       
! 

     

       
330
       
330
       
-
       
! static void alsa_reopen(struct snd_format *f)

     

       
331
       
331
       
-
       
! {

     

       
332
       
332
       
-
       
! 	unsigned int tmp = alsa_get_written_time();

     

       
333
       
333
       
-
       
! 

     

       
334
       
334
       
-
       
! 	if (alsa_pcm != NULL)

     

       
335
       
335
       
-
       
! 	{

     

       
336
       
336
       
-
       
! 		snd_pcm_close(alsa_pcm);

     

       
337
       
337
       
-
       
! 		alsa_pcm = NULL;

     

       
338
       
338
       
-
       
! 	}

     

       
339
       
339
       
-
       
! 

     

       
340
       
340
       
-
       
! 	if (mmap) {

     

       
341
       
341
       
-
       
! 		g_free(buffer);

     

       
342
       
342
       
-
       
! 		buffer = NULL;

     

       
343
       
343
       
-
       
! 		

     

       
344
       
344
       
-
       
! 		g_free(areas);

     

       
345
       
345
       
-
       
! 		areas = NULL;

     

       
346
       
346
       
-
       
! 	}

     

       
347
       
347
       
-
       
! 

     

       
348
       
348
       
-
       
! 	if (alsa_setup(f) < 0)

     

       
349
       
349
       
-
       
! 		g_warning("Failed to reopen the audio device");

     

       
350
       
350
       
-
       
! 

     

       
351
       
351
       
-
       
! 	alsa_total_written = tmp;

     

       
352
       
352
       
-
       
! 	snd_pcm_prepare(alsa_pcm);

     

       
353
       
353
       
-
       
! }

     

       
354
       
354
       
-
       
! 

     

       
355
       
355
       
-
       
! void alsa_flush(int time)

     

       
356
       
356
       
-
       
! {

     

       
357
       
357
       
-
       
! 	alsa_total_written = (guint64) time * alsa_bps / 1000;

     

       
358
       
358
       
-
       
! }

     

       
359
       
359
       
-
       
! 

     

       
360
       
360
       
-
       
  static void parse_mixer_name(char *str, char **name, int *index)

     

       
361
       
361
       
-
       
  {

     

       
362
       
362
       
-
       
  	char *end;

     

       
363
       
363
       
-
       
--- 113,121 ----

     

       
364
       
364
       
-
       
  	}

     

       
365
       
365
       
-
       
  }

     

       
366
       
366
       
-
       
  

     

       
367
       
367
       
-
       
! /*

     

       
368
       
368
       
-
       
!  * mixer stuff

     

       
369
       
369
       
-
       
!  */

     

       
370
       
370
       
-
       
  static void parse_mixer_name(char *str, char **name, int *index)

     

       
371
       
371
       
-
       
  {

     

       
372
       
372
       
-
       
  	char *end;

     

       
373
       
373
       
-
       
***************

     

       
374
       
374
       
-
       
*** 337,343 ****

     

       
375
       
375
       
-
       
  }

     

       
376
       
376
       
-
       
  	

     

       
377
       
377
       
-
       
  

     

       
378
       
378
       
-
       
! snd_mixer_elem_t* alsa_get_mixer_elem(snd_mixer_t *mixer, char *name, int index)

     

       
379
       
379
       
-
       
  {

     

       
380
       
380
       
-
       
  	snd_mixer_selem_id_t *selem_id;

     

       
381
       
381
       
-
       
  	snd_mixer_elem_t* elem;

     

       
382
       
382
       
-
       
--- 177,183 ----

     

       
383
       
383
       
-
       
  }

     

       
384
       
384
       
-
       
  	

     

       
385
       
385
       
-
       
  

     

       
386
       
386
       
-
       
! static snd_mixer_elem_t* alsa_get_mixer_elem(snd_mixer_t *mixer, char *name, int index)

     

       
387
       
387
       
-
       
  {

     

       
388
       
388
       
-
       
  	snd_mixer_selem_id_t *selem_id;

     

       
389
       
389
       
-
       
  	snd_mixer_elem_t* elem;

     

       
390
       
390
       
-
       
***************

     

       
391
       
391
       
-
       
*** 353,359 ****

     

       
392
       
392
       
-
       
  	return elem;

     

       
393
       
393
       
-
       
  }

     

       
394
       
394
       
-
       
  

     

       
395
       
395
       
-
       
! int alsa_setup_mixer(void)

     

       
396
       
396
       
-
       
  {

     

       
397
       
397
       
-
       
  	char *name;

     

       
398
       
398
       
-
       
  	long int a, b;

     

       
399
       
399
       
-
       
--- 193,199 ----

     

       
400
       
400
       
-
       
  	return elem;

     

       
401
       
401
       
-
       
  }

     

       
402
       
402
       
-
       
  

     

       
403
       
403
       
-
       
! static int alsa_setup_mixer(void)

     

       
404
       
404
       
-
       
  {

     

       
405
       
405
       
-
       
  	char *name;

     

       
406
       
406
       
-
       
  	long int a, b;

     

       
407
       
407
       
-
       
***************

     

       
408
       
408
       
-
       
*** 406,411 ****

     

       
409
       
409
       
-
       
--- 246,260 ----

     

       
410
       
410
       
-
       
  	return 0;

     

       
411
       
411
       
-
       
  }

     

       
412
       
412
       
-
       
  

     

       
413
       
413
       
-
       
+ static void alsa_cleanup_mixer(void)

     

       
414
       
414
       
-
       
+ {

     

       
415
       
415
       
-
       
+ 	pcm_element = NULL;

     

       
416
       
416
       
-
       
+ 	if (mixer) {

     

       
417
       
417
       
-
       
+ 		snd_mixer_close(mixer);

     

       
418
       
418
       
-
       
+ 		mixer = NULL;

     

       
419
       
419
       
-
       
+ 	}

     

       
420
       
420
       
-
       
+ }

     

       
421
       
421
       
-
       
+ 

     

       
422
       
422
       
-
       
  void alsa_get_volume(int *l, int *r)

     

       
423
       
423
       
-
       
  {

     

       
424
       
424
       
-
       
  	static gboolean first = TRUE;

     

       
425
       
425
       
-
       
***************

     

       
426
       
426
       
-
       
*** 461,485 ****

     

       
427
       
427
       
-
       
  }

     

       
428
       
428
       
-
       
  

     

       
429
       
429
       
-
       
  

     

       
430
       
430
       
-
       
  int alsa_get_output_time(void)

     

       
431
       
431
       
-
       
  {

     

       
432
       
432
       
-
       
  	snd_pcm_sframes_t delay;

     

       
433
       
433
       
-
       
! 	ssize_t db = 0;

     

       
434
       
434
       
-
       
  

     

       
435
       
435
       
-
       
! 	if (!going)

     

       
436
       
436
       
-
       
  		return 0;

     

       
437
       
437
       
-
       
  

     

       
438
       
438
       
-
       
! 	if (!snd_pcm_delay(alsa_pcm, &delay))

     

       
439
       
439
       
-
       
! 		db = snd_pcm_frames_to_bytes(alsa_pcm, delay);

     

       
440
       
440
       
-
       
! 	

     

       
441
       
441
       
-
       
! 	if (db < alsa_total_written)

     

       
442
       
442
       
-
       
! 		return ((alsa_total_written - db) * 1000 / alsa_bps);

     

       
443
       
443
       
-
       
! 	return 0;

     

       
444
       
444
       
-
       
  }

     

       
445
       
445
       
-
       
  

     

       
446
       
446
       
-
       
  int alsa_get_written_time(void)

     

       
447
       
447
       
-
       
  {

     

       
448
       
448
       
-
       
! 	return (alsa_total_written * 1000 / alsa_bps);

     

       
449
       
449
       
-
       
  }

     

       
450
       
450
       
-
       
  

     

       
451
       
451
       
-
       
  #define STEREO_ADJUST(type, type2, endian)					\

     

       
452
       
452
       
-
       
--- 310,512 ----

     

       
453
       
453
       
-
       
  }

     

       
454
       
454
       
-
       
  

     

       
455
       
455
       
-
       
  

     

       
456
       
456
       
-
       
+ /*

     

       
457
       
457
       
-
       
+  * audio stuff

     

       
458
       
458
       
-
       
+  */

     

       
459
       
459
       
-
       
+ 

     

       
460
       
460
       
-
       
+ int alsa_playing(void)

     

       
461
       
461
       
-
       
+ {

     

       
462
       
462
       
-
       
+ 	if (!going || paused || alsa_pcm == NULL)

     

       
463
       
463
       
-
       
+ 		return FALSE;

     

       
464
       
464
       
-
       
+ 

     

       
465
       
465
       
-
       
+ 	return(snd_pcm_state(alsa_pcm) == SND_PCM_STATE_RUNNING);

     

       
466
       
466
       
-
       
+ }

     

       
467
       
467
       
-
       
+ 

     

       
468
       
468
       
-
       
+ 

     

       
469
       
469
       
-
       
+ /* handle generic errors */

     

       
470
       
470
       
-
       
+ static int alsa_handle_error(int err)

     

       
471
       
471
       
-
       
+ {

     

       
472
       
472
       
-
       
+ 	switch (err) {

     

       
473
       
473
       
-
       
+ 	case -EPIPE: /* XRUN */

     

       
474
       
474
       
-
       
+ 		if (alsa_cfg.debug) {

     

       
475
       
475
       
-
       
+ 			snd_pcm_status_t *alsa_status;

     

       
476
       
476
       
-
       
+ 			snd_pcm_status_alloca(&alsa_status);

     

       
477
       
477
       
-
       
+ 			if (snd_pcm_status(alsa_pcm, alsa_status) < 0)

     

       
478
       
478
       
-
       
+ 				g_warning("xrun_recover(): snd_pcm_status() failed");

     

       
479
       
479
       
-
       
+ 			else {

     

       
480
       
480
       
-
       
+ 				printf("Status:\n");

     

       
481
       
481
       
-
       
+ 				snd_pcm_status_dump(alsa_status, logs);

     

       
482
       
482
       
-
       
+ 			}

     

       
483
       
483
       
-
       
+ 		}

     

       
484
       
484
       
-
       
+ 		return snd_pcm_prepare(alsa_pcm);

     

       
485
       
485
       
-
       
+ 

     

       
486
       
486
       
-
       
+ 	case -ESTRPIPE: /* suspend */

     

       
487
       
487
       
-
       
+ 		while ((err = snd_pcm_resume(alsa_pcm)) == -EAGAIN)

     

       
488
       
488
       
-
       
+ 			sleep(1);	/* wait until suspend flag is released */

     

       
489
       
489
       
-
       
+ 		if (err < 0) {

     

       
490
       
490
       
-
       
+ 			g_warning("suspend_recover(): snd_pcm_resume() failed.");

     

       
491
       
491
       
-
       
+ 			return snd_pcm_prepare(alsa_pcm);

     

       
492
       
492
       
-
       
+ 		}

     

       
493
       
493
       
-
       
+ 		break;

     

       
494
       
494
       
-
       
+ 	}

     

       
495
       
495
       
-
       
+ 

     

       
496
       
496
       
-
       
+ 	return err;

     

       
497
       
497
       
-
       
+ }

     

       
498
       
498
       
-
       
+ 

     

       
499
       
499
       
-
       
+ /* update and get the available space on h/w buffer (in frames) */

     

       
500
       
500
       
-
       
+ static snd_pcm_sframes_t alsa_get_avail(void)

     

       
501
       
501
       
-
       
+ {

     

       
502
       
502
       
-
       
+ 	snd_pcm_sframes_t ret;

     

       
503
       
503
       
-
       
+ 

     

       
504
       
504
       
-
       
+ 	if (alsa_pcm == NULL)

     

       
505
       
505
       
-
       
+ 		return 0;

     

       
506
       
506
       
-
       
+ 

     

       
507
       
507
       
-
       
+ 	while ((ret = snd_pcm_avail_update(alsa_pcm)) < 0) {

     

       
508
       
508
       
-
       
+ 		ret = alsa_handle_error(ret);

     

       
509
       
509
       
-
       
+ 		if (ret < 0) {

     

       
510
       
510
       
-
       
+ 			g_warning("alsa_get_avail(): snd_pcm_avail_update() failed: %s",

     

       
511
       
511
       
-
       
+ 				  snd_strerror(-ret));

     

       
512
       
512
       
-
       
+ 			return 0;

     

       
513
       
513
       
-
       
+ 		}

     

       
514
       
514
       
-
       
+ 	}

     

       
515
       
515
       
-
       
+ 	return ret;

     

       
516
       
516
       
-
       
+ }

     

       
517
       
517
       
-
       
+ 

     

       
518
       
518
       
-
       
+ /* do pause operation */

     

       
519
       
519
       
-
       
+ static void alsa_do_pause(gboolean p)

     

       
520
       
520
       
-
       
+ {

     

       
521
       
521
       
-
       
+ 	if (paused == p)

     

       
522
       
522
       
-
       
+ 		return;

     

       
523
       
523
       
-
       
+ 

     

       
524
       
524
       
-
       
+ 	if (alsa_pcm) {

     

       
525
       
525
       
-
       
+ 		if (alsa_can_pause) {

     

       
526
       
526
       
-
       
+ 			snd_pcm_pause(alsa_pcm, p);

     

       
527
       
527
       
-
       
+ 		} else if (p) {

     

       
528
       
528
       
-
       
+ 			snd_pcm_drop(alsa_pcm);

     

       
529
       
529
       
-
       
+ 			snd_pcm_prepare(alsa_pcm);

     

       
530
       
530
       
-
       
+ 		}

     

       
531
       
531
       
-
       
+ 	}

     

       
532
       
532
       
-
       
+ 	paused = p;

     

       
533
       
533
       
-
       
+ }

     

       
534
       
534
       
-
       
+ 

     

       
535
       
535
       
-
       
+ void alsa_pause(short p)

     

       
536
       
536
       
-
       
+ {

     

       
537
       
537
       
-
       
+ 	debug("alsa_pause");

     

       
538
       
538
       
-
       
+ 	pause_request = p;

     

       
539
       
539
       
-
       
+ }

     

       
540
       
540
       
-
       
+ 

     

       
541
       
541
       
-
       
+ /* close PCM and release associated resources */

     

       
542
       
542
       
-
       
+ static void alsa_close_pcm(void)

     

       
543
       
543
       
-
       
+ {

     

       
544
       
544
       
-
       
+ 	if (alsa_pcm) {

     

       
545
       
545
       
-
       
+ 		int err;

     

       
546
       
546
       
-
       
+ 		snd_pcm_drop(alsa_pcm);

     

       
547
       
547
       
-
       
+ 		if ((err = snd_pcm_close(alsa_pcm)) < 0)

     

       
548
       
548
       
-
       
+ 			g_warning("alsa_pcm_close() failed: %s",

     

       
549
       
549
       
-
       
+ 				  snd_strerror(-err));

     

       
550
       
550
       
-
       
+ 		alsa_pcm = NULL;

     

       
551
       
551
       
-
       
+ 	}

     

       
552
       
552
       
-
       
+ }

     

       
553
       
553
       
-
       
+ 

     

       
554
       
554
       
-
       
+ /* reopen ALSA PCM */

     

       
555
       
555
       
-
       
+ static int alsa_reopen(struct snd_format *f)

     

       
556
       
556
       
-
       
+ {

     

       
557
       
557
       
-
       
+ 	/* remember the current position */

     

       
558
       
558
       
-
       
+ 	output_time_offset += (alsa_hw_written * 1000) / outputf->bps;

     

       
559
       
559
       
-
       
+ 	alsa_hw_written = 0;

     

       
560
       
560
       
-
       
+ 

     

       
561
       
561
       
-
       
+ 	alsa_close_pcm();

     

       
562
       
562
       
-
       
+ 

     

       
563
       
563
       
-
       
+ 	return alsa_setup(f);

     

       
564
       
564
       
-
       
+ }

     

       
565
       
565
       
-
       
+ 

     

       
566
       
566
       
-
       
+ /* do flush (drop) operation */

     

       
567
       
567
       
-
       
+ static void alsa_do_flush(int time)

     

       
568
       
568
       
-
       
+ {

     

       
569
       
569
       
-
       
+ 	if (alsa_pcm) {

     

       
570
       
570
       
-
       
+ 		snd_pcm_drop(alsa_pcm);

     

       
571
       
571
       
-
       
+ 		snd_pcm_prepare(alsa_pcm);

     

       
572
       
572
       
-
       
+ 	}

     

       
573
       
573
       
-
       
+ 	/* correct the offset */

     

       
574
       
574
       
-
       
+ 	output_time_offset = time;

     

       
575
       
575
       
-
       
+ 	alsa_total_written = (guint64) time * inputf->bps / 1000;

     

       
576
       
576
       
-
       
+ 	rd_index = wr_index = alsa_hw_written = 0;

     

       
577
       
577
       
-
       
+ }

     

       
578
       
578
       
-
       
+ 

     

       
579
       
579
       
-
       
+ void alsa_flush(int time)

     

       
580
       
580
       
-
       
+ {

     

       
581
       
581
       
-
       
+ 	flush_request = time;

     

       
582
       
582
       
-
       
+ 	while (flush_request != -1)

     

       
583
       
583
       
-
       
+ 		xmms_usleep(10000);

     

       
584
       
584
       
-
       
+ }

     

       
585
       
585
       
-
       
+ 

     

       
586
       
586
       
-
       
+ void alsa_close(void)

     

       
587
       
587
       
-
       
+ {

     

       
588
       
588
       
-
       
+ 	if (! going)

     

       
589
       
589
       
-
       
+ 		return;

     

       
590
       
590
       
-
       
+ 

     

       
591
       
591
       
-
       
+ 	debug("Closing device");

     

       
592
       
592
       
-
       
+ 

     

       
593
       
593
       
-
       
+ 	going = 0;

     

       
594
       
594
       
-
       
+ 

     

       
595
       
595
       
-
       
+ 	pthread_join(audio_thread, NULL);

     

       
596
       
596
       
-
       
+ 

     

       
597
       
597
       
-
       
+ 	alsa_cleanup_mixer();

     

       
598
       
598
       
-
       
+ 

     

       
599
       
599
       
-
       
+ 	xmms_convert_buffers_destroy(convertb);

     

       
600
       
600
       
-
       
+ 	convertb = NULL;

     

       
601
       
601
       
-
       
+ 	g_free(inputf);

     

       
602
       
602
       
-
       
+ 	inputf = NULL;

     

       
603
       
603
       
-
       
+ 	g_free(effectf);

     

       
604
       
604
       
-
       
+ 	effectf = NULL;

     

       
605
       
605
       
-
       
+ 	g_free(outputf);

     

       
606
       
606
       
-
       
+ 	outputf = NULL;

     

       
607
       
607
       
-
       
+ 

     

       
608
       
608
       
-
       
+ 	alsa_save_config();

     

       
609
       
609
       
-
       
+ 

     

       
610
       
610
       
-
       
+ 	if (alsa_cfg.debug)

     

       
611
       
611
       
-
       
+ 		snd_output_close(logs);

     

       
612
       
612
       
-
       
+ 	debug("Device closed");

     

       
613
       
613
       
-
       
+ }

     

       
614
       
614
       
-
       
+ 

     

       
615
       
615
       
-
       
+ /* return the size of audio data filled in the audio thread buffer */

     

       
616
       
616
       
-
       
+ static int get_thread_buffer_filled(void)

     

       
617
       
617
       
-
       
+ {

     

       
618
       
618
       
-
       
+ 	int filled = wr_index - rd_index;

     

       
619
       
619
       
-
       
+ 	if (filled >= 0)

     

       
620
       
620
       
-
       
+ 		return filled;

     

       
621
       
621
       
-
       
+ 	return thread_buffer_size + filled;

     

       
622
       
622
       
-
       
+ }

     

       
623
       
623
       
-
       
+ 

     

       
624
       
624
       
-
       
+ /* get the free space on buffer */

     

       
625
       
625
       
-
       
+ int alsa_free(void)

     

       
626
       
626
       
-
       
+ {

     

       
627
       
627
       
-
       
+ 	return thread_buffer_size - get_thread_buffer_filled() - 1;

     

       
628
       
628
       
-
       
+ }

     

       
629
       
629
       
-
       
+ 

     

       
630
       
630
       
-
       
  int alsa_get_output_time(void)

     

       
631
       
631
       
-
       
  {

     

       
632
       
632
       
-
       
  	snd_pcm_sframes_t delay;

     

       
633
       
633
       
-
       
! 	guint64 bytes = 0;

     

       
634
       
634
       
-
       
  

     

       
635
       
635
       
-
       
! 	if (!going || alsa_pcm == NULL)

     

       
636
       
636
       
-
       
  		return 0;

     

       
637
       
637
       
-
       
  

     

       
638
       
638
       
-
       
! 	if (!snd_pcm_delay(alsa_pcm, &delay)) {

     

       
639
       
639
       
-
       
! 		bytes = snd_pcm_frames_to_bytes(alsa_pcm, delay);

     

       
640
       
640
       
-
       
! 		if (alsa_hw_written < bytes)

     

       
641
       
641
       
-
       
! 			bytes = 0;

     

       
642
       
642
       
-
       
! 		else

     

       
643
       
643
       
-
       
! 			bytes = alsa_hw_written - bytes;

     

       
644
       
644
       
-
       
! 	}

     

       
645
       
645
       
-
       
! 	return output_time_offset + (bytes * 1000) / outputf->bps;

     

       
646
       
646
       
-
       
  }

     

       
647
       
647
       
-
       
  

     

       
648
       
648
       
-
       
  int alsa_get_written_time(void)

     

       
649
       
649
       
-
       
  {

     

       
650
       
650
       
-
       
! 	if (!going)

     

       
651
       
651
       
-
       
! 		return 0;

     

       
652
       
652
       
-
       
! 	return (alsa_total_written * 1000) / inputf->bps;

     

       
653
       
653
       
-
       
  }

     

       
654
       
654
       
-
       
  

     

       
655
       
655
       
-
       
  #define STEREO_ADJUST(type, type2, endian)					\

     

       
656
       
656
       
-
       
***************

     

       
657
       
657
       
-
       
*** 584,636 ****

     

       
658
       
658
       
-
       
  }

     

       
659
       
659
       
-
       
  

     

       
660
       
660
       
-
       
  

     

       
661
       
661
       
-
       
! void alsa_write(gpointer data, int length)

     

       
662
       
662
       
-
       
  {

     

       
663
       
663
       
-
       
! 	EffectPlugin *ep;

     

       
664
       
664
       
-
       
  

     

       
665
       
665
       
-
       
  	if (paused)

     

       
666
       
666
       
-
       
  		return;

     

       
667
       
667
       
-
       
  

     

       
668
       
668
       
-
       
! 	force_start = FALSE;

     

       
669
       
669
       
-
       
! 

     

       
670
       
670
       
-
       
! 	if (effects_enabled() && (ep = get_current_effect_plugin()))

     

       
671
       
671
       
-
       
! 	{

     

       
672
       
672
       
-
       
! 		int new_freq = inputf->rate;

     

       
673
       
673
       
-
       
! 		int new_chn = inputf->channels;

     

       
674
       
674
       
-
       
! 		AFormat f = inputf->xmms_format;

     

       
675
       
675
       
-
       
  		

     

       
676
       
676
       
-
       
! 		if (ep->query_format)

     

       
677
       
677
       
-
       
! 		{

     

       
678
       
678
       
-
       
! 			ep->query_format(&f, &new_freq, &new_chn);

     

       
679
       
679
       
-
       
! 			

     

       
680
       
680
       
-
       
! 			if (f != effectf->xmms_format ||

     

       
681
       
681
       
-
       
! 			    new_freq != effectf->rate ||

     

       
682
       
682
       
-
       
! 			    new_chn != effectf->channels)

     

       
683
       
683
       
-
       
! 			{

     

       
684
       
684
       
-
       
! 				debug("Changing audio format for effect plugin");

     

       
685
       
685
       
-
       
! 

     

       
686
       
686
       
-
       
! 				g_free(effectf);

     

       
687
       
687
       
-
       
! 				effectf = snd_format_from_xmms(f, new_freq,

     

       
688
       
688
       
-
       
! 							       new_chn);

     

       
689
       
689
       
-
       
! 				alsa_reopen(effectf);

     

       
690
       
690
       
-
       
! 			}

     

       
691
       
691
       
-
       
! 			

     

       
692
       
692
       
-
       
! 		}

     

       
693
       
693
       
-
       
  	

     

       
694
       
694
       
-
       
  		length = ep->mod_samples(&data, length,

     

       
695
       
695
       
-
       
  					 inputf->xmms_format,

     

       
696
       
696
       
-
       
  					 inputf->rate,

     

       
697
       
697
       
-
       
  					 inputf->channels);

     

       
698
       
698
       
-
       
  	}

     

       
699
       
699
       
-
       
- 	else if (effectf)

     

       
700
       
700
       
-
       
- 	{

     

       
701
       
701
       
-
       
- 		g_free(effectf);

     

       
702
       
702
       
-
       
- 		effectf = NULL;

     

       
703
       
703
       
-
       
- 		effectf = snd_format_from_xmms(inputf->xmms_format,

     

       
704
       
704
       
-
       
- 					       inputf->rate,

     

       
705
       
705
       
-
       
- 					       inputf->channels);

     

       
706
       
706
       
-
       
- 		alsa_reopen(inputf);

     

       
707
       
707
       
-
       
- 	}

     

       
708
       
708
       
-
       
  

     

       
709
       
709
       
-
       
  	if (alsa_convert_func != NULL)

     

       
710
       
710
       
-
       
  		length = alsa_convert_func(convertb, &data, length);

     

       
711
       
711
       
-
       
--- 611,657 ----

     

       
712
       
712
       
-
       
  }

     

       
713
       
713
       
-
       
  

     

       
714
       
714
       
-
       
  

     

       
715
       
715
       
-
       
! /* transfer data to audio h/w; length is given in bytes

     

       
716
       
716
       
-
       
!  *

     

       
717
       
717
       
-
       
!  * data can be modified via effect plugin, rate conversion or

     

       
718
       
718
       
-
       
!  * software volume before passed to audio h/w

     

       
719
       
719
       
-
       
!  */

     

       
720
       
720
       
-
       
! static void alsa_do_write(gpointer data, int length)

     

       
721
       
721
       
-
       
  {

     

       
722
       
722
       
-
       
! 	EffectPlugin *ep = NULL;

     

       
723
       
723
       
-
       
! 	int new_freq;

     

       
724
       
724
       
-
       
! 	int new_chn;

     

       
725
       
725
       
-
       
! 	AFormat f;

     

       
726
       
726
       
-
       
  

     

       
727
       
727
       
-
       
  	if (paused)

     

       
728
       
728
       
-
       
  		return;

     

       
729
       
729
       
-
       
  

     

       
730
       
730
       
-
       
! 	new_freq = inputf->rate;

     

       
731
       
731
       
-
       
! 	new_chn = inputf->channels;

     

       
732
       
732
       
-
       
! 	f = inputf->xmms_format;

     

       
733
       
733
       
-
       
  		

     

       
734
       
734
       
-
       
! 	if (effects_enabled() && (ep = get_current_effect_plugin()) &&

     

       
735
       
735
       
-
       
! 	    ep->query_format)

     

       
736
       
736
       
-
       
! 		ep->query_format(&f, &new_freq, &new_chn);

     

       
737
       
737
       
-
       
  	

     

       
738
       
738
       
-
       
+ 	if (f != effectf->xmms_format || new_freq != effectf->rate ||

     

       
739
       
739
       
-
       
+ 	    new_chn != effectf->channels) {

     

       
740
       
740
       
-
       
+ 		debug("Changing audio format for effect plugin");

     

       
741
       
741
       
-
       
+ 		g_free(effectf);

     

       
742
       
742
       
-
       
+ 		effectf = snd_format_from_xmms(f, new_freq, new_chn);

     

       
743
       
743
       
-
       
+ 		if (alsa_reopen(effectf) < 0) {

     

       
744
       
744
       
-
       
+ 			/* fatal error... */

     

       
745
       
745
       
-
       
+ 			alsa_close();

     

       
746
       
746
       
-
       
+ 			return;

     

       
747
       
747
       
-
       
+ 		}

     

       
748
       
748
       
-
       
+ 	}

     

       
749
       
749
       
-
       
+ 

     

       
750
       
750
       
-
       
+ 	if (ep) {

     

       
751
       
751
       
-
       
  		length = ep->mod_samples(&data, length,

     

       
752
       
752
       
-
       
  					 inputf->xmms_format,

     

       
753
       
753
       
-
       
  					 inputf->rate,

     

       
754
       
754
       
-
       
  					 inputf->channels);

     

       
755
       
755
       
-
       
  	}

     

       
756
       
756
       
-
       
  

     

       
757
       
757
       
-
       
  	if (alsa_convert_func != NULL)

     

       
758
       
758
       
-
       
  		length = alsa_convert_func(convertb, &data, length);

     

       
759
       
759
       
-
       
***************

     

       
760
       
760
       
-
       
*** 644,656 ****

     

       
761
       
761
       
-
       
  	if (alsa_cfg.soft_volume)

     

       
762
       
762
       
-
       
  		volume_adjust(data, length, outputf->xmms_format, outputf->channels);

     

       
763
       
763
       
-
       
  

     

       
764
       
764
       
-
       
! 	if (mmap)

     

       
765
       
765
       
-
       
! 		alsa_mmap_audio(data, length);

     

       
766
       
766
       
-
       
! 	else

     

       
767
       
767
       
-
       
! 		alsa_write_audio(data, length);

     

       
768
       
768
       
-
       
  }

     

       
769
       
769
       
-
       
  

     

       
770
       
770
       
-
       
! static void alsa_write_audio(gpointer data, int length)

     

       
771
       
771
       
-
       
  {

     

       
772
       
772
       
-
       
  	snd_pcm_sframes_t written_frames;

     

       
773
       
773
       
-
       
  

     

       
774
       
774
       
-
       
--- 665,693 ----

     

       
775
       
775
       
-
       
  	if (alsa_cfg.soft_volume)

     

       
776
       
776
       
-
       
  		volume_adjust(data, length, outputf->xmms_format, outputf->channels);

     

       
777
       
777
       
-
       
  

     

       
778
       
778
       
-
       
! 	alsa_write_audio(data, length);

     

       
779
       
779
       
-
       
  }

     

       
780
       
780
       
-
       
  

     

       
781
       
781
       
-
       
! /* write callback */

     

       
782
       
782
       
-
       
! void alsa_write(gpointer data, int length)

     

       
783
       
783
       
-
       
! {

     

       
784
       
784
       
-
       
! 	int cnt;

     

       
785
       
785
       
-
       
! 	char *src = (char *)data;

     

       
786
       
786
       
-
       
! 

     

       
787
       
787
       
-
       
! 	alsa_total_written += length;

     

       
788
       
788
       
-
       
! 	while (length > 0) {

     

       
789
       
789
       
-
       
! 		int wr;

     

       
790
       
790
       
-
       
! 		cnt = MIN(length, thread_buffer_size - wr_index);

     

       
791
       
791
       
-
       
! 		memcpy(thread_buffer + wr_index, src, cnt);

     

       
792
       
792
       
-
       
! 		wr = (wr_index + cnt) % thread_buffer_size;

     

       
793
       
793
       
-
       
! 		wr_index = wr;

     

       
794
       
794
       
-
       
! 		length -= cnt;

     

       
795
       
795
       
-
       
! 		src += cnt;

     

       
796
       
796
       
-
       
! 	}

     

       
797
       
797
       
-
       
! }

     

       
798
       
798
       
-
       
! 

     

       
799
       
799
       
-
       
! /* transfer data to audio h/w via normal write */

     

       
800
       
800
       
-
       
! static void alsa_write_audio(char *data, int length)

     

       
801
       
801
       
-
       
  {

     

       
802
       
802
       
-
       
  	snd_pcm_sframes_t written_frames;

     

       
803
       
803
       
-
       
  

     

       
804
       
804
       
-
       
***************

     

       
805
       
805
       
-
       
*** 663,735 ****

     

       
806
       
806
       
-
       
  		{

     

       
807
       
807
       
-
       
  			int written = snd_pcm_frames_to_bytes(alsa_pcm,

     

       
808
       
808
       
-
       
  							      written_frames);

     

       
809
       
809
       
-
       
- 			alsa_total_written += written;

     

       
810
       
810
       
-
       
  			length -= written;

     

       
811
       
811
       
-
       
! 			data = (char*) data + written;

     

       
812
       
812
       
-
       
  		}

     

       
813
       
813
       
-
       
! 		else if (written_frames == -EPIPE)

     

       
814
       
814
       
-
       
! 			xrun_recover();

     

       
815
       
815
       
-
       
! 		else

     

       
816
       
816
       
-
       
! 		{

     

       
817
       
817
       
-
       
! 			g_warning("alsa_write_audio(): write error: %s",

     

       
818
       
818
       
-
       
! 				  snd_strerror(-written_frames));

     

       
819
       
819
       
-
       
! 			break;

     

       
820
       
820
       
-
       
  		}

     

       
821
       
821
       
-
       
  	}

     

       
822
       
822
       
-
       
  }

     

       
823
       
823
       
-
       
  

     

       
824
       
824
       
-
       
! static void alsa_mmap_audio(char *data, int length)

     

       
825
       
825
       
-
       
  {

     

       
826
       
826
       
-
       
! 	int cnt = 0, err;

     

       
827
       
827
       
-
       
! 	snd_pcm_uframes_t offset, frames, frame;

     

       
828
       
828
       
-
       
! 	const snd_pcm_channel_area_t *chan_areas = areas;

     

       
829
       
829
       
-
       
! 	int channel_offset = 0, channel;

     

       
830
       
830
       
-
       
! 	ssize_t sample_size, offset_bytes, step;

     

       
831
       
831
       
-
       
! 

     

       
832
       
832
       
-
       
! 	alsa_get_avail();

     

       
833
       
833
       
-
       
  

     

       
834
       
834
       
-
       
! 	while (length > 0)

     

       
835
       
835
       
-
       
! 	{

     

       
836
       
836
       
-
       
! 		frames = snd_pcm_bytes_to_frames(alsa_pcm, length);

     

       
837
       
837
       
-
       
! 		if ((err = snd_pcm_mmap_begin(alsa_pcm, &chan_areas, &offset, &frames) < 0))

     

       
838
       
838
       
-
       
! 			g_warning("alsa_mmap_audio(): snd_pcm_mmap_begin() "

     

       
839
       
839
       
-
       
! 				  "failed: %s", snd_strerror(-err));

     

       
840
       
840
       
-
       
! 

     

       
841
       
841
       
-
       
! 		cnt = snd_pcm_frames_to_bytes(alsa_pcm, frames);

     

       
842
       
842
       
-
       
! 

     

       
843
       
843
       
-
       
! 		sample_size = snd_pcm_samples_to_bytes(alsa_pcm, 1);

     

       
844
       
844
       
-
       
! 		step = chan_areas[0].step / 8;

     

       
845
       
845
       
-
       
! 		offset_bytes = offset * step;

     

       
846
       
846
       
-
       
  

     

       
847
       
847
       
-
       
! 		for (frame = 0; frame < frames; frame++)

     

       
848
       
848
       
-
       
! 		{

     

       
849
       
849
       
-
       
! 			for (channel = 0; channel < outputf->channels; channel++)

     

       
850
       
850
       
-
       
! 			{

     

       
851
       
851
       
-
       
! 				char *ptr = chan_areas[channel].addr;

     

       
852
       
852
       
-
       
! 				memcpy(ptr + chan_areas[channel].first / 8 +

     

       
853
       
853
       
-
       
! 				       offset_bytes,

     

       
854
       
854
       
-
       
! 				       data + channel_offset, sample_size);

     

       
855
       
855
       
-
       
! 				channel_offset += sample_size;

     

       
856
       
856
       
-
       
  			}

     

       
857
       
857
       
-
       
! 			offset_bytes += step;

     

       
858
       
858
       
-
       
  		}

     

       
859
       
859
       
-
       
- 			

     

       
860
       
860
       
-
       
- 		err = snd_pcm_mmap_commit(alsa_pcm, offset, frames);

     

       
861
       
861
       
-
       
- 		if (err == -EPIPE)

     

       
862
       
862
       
-
       
- 			xrun_recover();

     

       
863
       
863
       
-
       
- 		else if (err < 0)

     

       
864
       
864
       
-
       
- 			g_warning("alsa_mmap_audio(): snd_pcm_mmap_commit() "

     

       
865
       
865
       
-
       
- 				  "failed: %s", snd_strerror(-err));

     

       
866
       
866
       
-
       
- 		else if (err != frames)

     

       
867
       
867
       
-
       
- 			g_warning("alsa_mmap_audio(): snd_pcm_mmap_commit "

     

       
868
       
868
       
-
       
- 				  "returned %d, expected %d", err, (int)frames);

     

       
869
       
869
       
-
       
- 		

     

       
870
       
870
       
-
       
- 		alsa_total_written += cnt;

     

       
871
       
871
       
-
       
- 		

     

       
872
       
872
       
-
       
- 		length -= cnt;

     

       
873
       
873
       
-
       
  	}

     

       
874
       
874
       
-
       
  }

     

       
875
       
875
       
-
       
  

     

       
876
       
876
       
-
       
  int alsa_open(AFormat fmt, int rate, int nch)

     

       
877
       
877
       
-
       
  {

     

       
878
       
878
       
-
       
  	debug("Opening device");

     

       
879
       
879
       
-
       
--- 700,785 ----

     

       
880
       
880
       
-
       
  		{

     

       
881
       
881
       
-
       
  			int written = snd_pcm_frames_to_bytes(alsa_pcm,

     

       
882
       
882
       
-
       
  							      written_frames);

     

       
883
       
883
       
-
       
  			length -= written;

     

       
884
       
884
       
-
       
! 			data += written;

     

       
885
       
885
       
-
       
! 			alsa_hw_written += written;

     

       
886
       
886
       
-
       
  		}

     

       
887
       
887
       
-
       
! 		else {

     

       
888
       
888
       
-
       
! 			int err = alsa_handle_error((int)written_frames);

     

       
889
       
889
       
-
       
! 			if (err < 0) {

     

       
890
       
890
       
-
       
! 				g_warning("alsa_write_audio(): write error: %s",

     

       
891
       
891
       
-
       
! 					  snd_strerror(-err));

     

       
892
       
892
       
-
       
! 				break;

     

       
893
       
893
       
-
       
! 			}

     

       
894
       
894
       
-
       
  		}

     

       
895
       
895
       
-
       
  	}

     

       
896
       
896
       
-
       
  }

     

       
897
       
897
       
-
       
  

     

       
898
       
898
       
-
       
! /* transfer audio data from thread buffer to h/w */

     

       
899
       
899
       
-
       
! static void alsa_write_out_thread_data(void)

     

       
900
       
900
       
-
       
  {

     

       
901
       
901
       
-
       
! 	gint length, cnt, avail;

     

       
902
       
902
       
-
       
  

     

       
903
       
903
       
-
       
! 	length = MIN(hw_period_size_in, get_thread_buffer_filled());

     

       
904
       
904
       
-
       
! 	avail = snd_pcm_frames_to_bytes(alsa_pcm, alsa_get_avail());

     

       
905
       
905
       
-
       
! 	length = MIN(length, avail);

     

       
906
       
906
       
-
       
! 	while (length > 0) {

     

       
907
       
907
       
-
       
! 		int rd;

     

       
908
       
908
       
-
       
! 		cnt = MIN(length, thread_buffer_size - rd_index);

     

       
909
       
909
       
-
       
! 		alsa_do_write(thread_buffer + rd_index, cnt);

     

       
910
       
910
       
-
       
! 		rd = (rd_index + cnt) % thread_buffer_size;

     

       
911
       
911
       
-
       
! 		rd_index = rd;

     

       
912
       
912
       
-
       
! 		length -= cnt;

     

       
913
       
913
       
-
       
! 	}

     

       
914
       
914
       
-
       
! }

     

       
915
       
915
       
-
       
  

     

       
916
       
916
       
-
       
! /* audio thread loop */

     

       
917
       
917
       
-
       
! /* FIXME: proper lock? */

     

       
918
       
918
       
-
       
! static void *alsa_loop(void *arg)

     

       
919
       
919
       
-
       
! {

     

       
920
       
920
       
-
       
! 	int npfds = snd_pcm_poll_descriptors_count(alsa_pcm);

     

       
921
       
921
       
-
       
! 	struct pollfd *pfds;

     

       
922
       
922
       
-
       
! 	unsigned short *revents;

     

       
923
       
923
       
-
       
! 

     

       
924
       
924
       
-
       
! 	if (npfds <= 0)

     

       
925
       
925
       
-
       
! 		goto _error;

     

       
926
       
926
       
-
       
! 	pfds = alloca(sizeof(*pfds) * npfds);

     

       
927
       
927
       
-
       
! 	revents = alloca(sizeof(*revents) * npfds);

     

       
928
       
928
       
-
       
! 	while (going && alsa_pcm) {

     

       
929
       
929
       
-
       
! 		if (! paused && get_thread_buffer_filled() > hw_period_size_in) {

     

       
930
       
930
       
-
       
! 			snd_pcm_poll_descriptors(alsa_pcm, pfds, npfds);

     

       
931
       
931
       
-
       
! 			if (poll(pfds, npfds, 10) > 0) { 

     

       
932
       
932
       
-
       
! 				/* need to check revents.  poll() with dmix returns

     

       
933
       
933
       
-
       
! 				 * a postive value even if no data is available

     

       
934
       
934
       
-
       
! 				 */

     

       
935
       
935
       
-
       
! 				int i;

     

       
936
       
936
       
-
       
! 				snd_pcm_poll_descriptors_revents(alsa_pcm, pfds, npfds, revents);

     

       
937
       
937
       
-
       
! 				for (i = 0; i < npfds; i++)

     

       
938
       
938
       
-
       
! 					if (revents[i] & POLLOUT) {

     

       
939
       
939
       
-
       
! 						alsa_write_out_thread_data();

     

       
940
       
940
       
-
       
! 						break;

     

       
941
       
941
       
-
       
! 					}

     

       
942
       
942
       
-
       
  			}

     

       
943
       
943
       
-
       
! 		} else

     

       
944
       
944
       
-
       
! 			xmms_usleep(10000);

     

       
945
       
945
       
-
       
! 

     

       
946
       
946
       
-
       
! 		if (pause_request != paused)

     

       
947
       
947
       
-
       
! 			alsa_do_pause(pause_request);

     

       
948
       
948
       
-
       
! 

     

       
949
       
949
       
-
       
! 		if (flush_request != -1) {

     

       
950
       
950
       
-
       
! 			alsa_do_flush(flush_request);

     

       
951
       
951
       
-
       
! 			flush_request = -1;

     

       
952
       
952
       
-
       
  		}

     

       
953
       
953
       
-
       
  	}

     

       
954
       
954
       
-
       
+ 

     

       
955
       
955
       
-
       
+  _error:

     

       
956
       
956
       
-
       
+ 	alsa_close_pcm();

     

       
957
       
957
       
-
       
+ 	g_free(thread_buffer);

     

       
958
       
958
       
-
       
+ 	thread_buffer = NULL;

     

       
959
       
959
       
-
       
+ 	pthread_exit(NULL);

     

       
960
       
960
       
-
       
  }

     

       
961
       
961
       
-
       
  

     

       
962
       
962
       
-
       
+ /* open callback */

     

       
963
       
963
       
-
       
  int alsa_open(AFormat fmt, int rate, int nch)

     

       
964
       
964
       
-
       
  {

     

       
965
       
965
       
-
       
  	debug("Opening device");

     

       
966
       
966
       
-
       
***************

     

       
967
       
967
       
-
       
*** 739,746 ****

     

       
968
       
968
       
-
       
  	if (alsa_cfg.debug)

     

       
969
       
969
       
-
       
  		snd_output_stdio_attach(&logs, stdout, 0);

     

       
970
       
970
       
-
       
  

     

       
971
       
971
       
-
       
- 	mmap = alsa_cfg.mmap;

     

       
972
       
972
       
-
       
- 

     

       
973
       
973
       
-
       
  	if (alsa_setup(inputf) < 0)

     

       
974
       
974
       
-
       
  	{

     

       
975
       
975
       
-
       
  		alsa_close();

     

       
976
       
976
       
-
       
--- 789,794 ----

     

       
977
       
977
       
-
       
***************

     

       
978
       
978
       
-
       
*** 751,763 ****

     

       
979
       
979
       
-
       
  

     

       
980
       
980
       
-
       
  	convertb = xmms_convert_buffers_new();

     

       
981
       
981
       
-
       
  	

     

       
982
       
982
       
-
       
! 	alsa_total_written = 0;

     

       
983
       
983
       
-
       
  	going = TRUE;

     

       
984
       
984
       
-
       
  	paused = FALSE;

     

       
985
       
985
       
-
       
- 	force_start = FALSE;

     

       
986
       
986
       
-
       
- 	

     

       
987
       
987
       
-
       
- 	snd_pcm_prepare(alsa_pcm);

     

       
988
       
988
       
-
       
  	

     

       
989
       
989
       
-
       
  	return 1;

     

       
990
       
990
       
-
       
  }

     

       
991
       
991
       
-
       
  

     

       
992
       
992
       
-
       
--- 799,823 ----

     

       
993
       
993
       
-
       
  

     

       
994
       
994
       
-
       
  	convertb = xmms_convert_buffers_new();

     

       
995
       
995
       
-
       
  	

     

       
996
       
996
       
-
       
! 	output_time_offset = 0;

     

       
997
       
997
       
-
       
! 	alsa_total_written = alsa_hw_written = 0;

     

       
998
       
998
       
-
       
  	going = TRUE;

     

       
999
       
999
       
-
       
  	paused = FALSE;

     

       
1000
       
1000
       
-
       
  	

     

       
1001
       
1001
       
-
       
+ 	thread_buffer_size = (guint64)alsa_cfg.thread_buffer_time * inputf->bps / 1000;

     

       
1002
       
1002
       
-
       
+ 	if (thread_buffer_size < hw_buffer_size)

     

       
1003
       
1003
       
-
       
+ 		thread_buffer_size = hw_buffer_size * 2;

     

       
1004
       
1004
       
-
       
+ 	if (thread_buffer_size < 8192)

     

       
1005
       
1005
       
-
       
+ 		thread_buffer_size = 8192;

     

       
1006
       
1006
       
-
       
+ 	thread_buffer_size += hw_buffer_size;

     

       
1007
       
1007
       
-
       
+ 	thread_buffer_size -= thread_buffer_size % hw_period_size;

     

       
1008
       
1008
       
-
       
+ 	thread_buffer = g_malloc0(thread_buffer_size);

     

       
1009
       
1009
       
-
       
+ 	wr_index = rd_index = 0;

     

       
1010
       
1010
       
-
       
+ 	pause_request = FALSE;

     

       
1011
       
1011
       
-
       
+ 	flush_request = -1;

     

       
1012
       
1012
       
-
       
+ 

     

       
1013
       
1013
       
-
       
+ 	pthread_create(&audio_thread, NULL, alsa_loop, NULL);

     

       
1014
       
1014
       
-
       
+ 

     

       
1015
       
1015
       
-
       
  	return 1;

     

       
1016
       
1016
       
-
       
  }

     

       
1017
       
1017
       
-
       
  

     

       
1018
       
1018
       
-
       
***************

     

       
1019
       
1019
       
-
       
*** 787,792 ****

     

       
1020
       
1020
       
-
       
--- 847,854 ----

     

       
1021
       
1021
       
-
       
  

     

       
1022
       
1022
       
-
       
  	f->rate = rate;

     

       
1023
       
1023
       
-
       
  	f->channels = channels;

     

       
1024
       
1024
       
-
       
+ 	f->sample_bits = snd_pcm_format_physical_width(f->format);

     

       
1025
       
1025
       
-
       
+ 	f->bps = (rate * f->sample_bits * channels) >> 3;

     

       
1026
       
1026
       
-
       
  

     

       
1027
       
1027
       
-
       
  	return f;

     

       
1028
       
1028
       
-
       
  }

     

       
1029
       
1029
       
-
       
***************

     

       
1030
       
1030
       
-
       
*** 806,812 ****

     

       
1031
       
1031
       
-
       
  	int err;

     

       
1032
       
1032
       
-
       
  	snd_pcm_hw_params_t *hwparams;

     

       
1033
       
1033
       
-
       
  	snd_pcm_sw_params_t *swparams;

     

       
1034
       
1034
       
-
       
! 	int alsa_buffer_time, bits_per_sample;

     

       
1035
       
1035
       
-
       
  	unsigned int alsa_period_time;

     

       
1036
       
1036
       
-
       
  	snd_pcm_uframes_t alsa_buffer_size, alsa_period_size;

     

       
1037
       
1037
       
-
       
  

     

       
1038
       
1038
       
-
       
--- 868,874 ----

     

       
1039
       
1039
       
-
       
  	int err;

     

       
1040
       
1040
       
-
       
  	snd_pcm_hw_params_t *hwparams;

     

       
1041
       
1041
       
-
       
  	snd_pcm_sw_params_t *swparams;

     

       
1042
       
1042
       
-
       
! 	int alsa_buffer_time;

     

       
1043
       
1043
       
-
       
  	unsigned int alsa_period_time;

     

       
1044
       
1044
       
-
       
  	snd_pcm_uframes_t alsa_buffer_size, alsa_period_size;

     

       
1045
       
1045
       
-
       
  

     

       
1046
       
1046
       
-
       
***************

     

       
1047
       
1047
       
-
       
*** 816,824 ****

     

       
1048
       
1048
       
-
       
  	alsa_stereo_convert_func = NULL;

     

       
1049
       
1049
       
-
       
  	alsa_frequency_convert_func = NULL;

     

       
1050
       
1050
       
-
       
  

     

       
1051
       
1051
       
-
       
! 	outputf = snd_format_from_xmms(effectf->xmms_format,

     

       
1052
       
1052
       
-
       
! 				       effectf->rate,

     

       
1053
       
1053
       
-
       
! 				       effectf->channels);

     

       
1054
       
1054
       
-
       
  

     

       
1055
       
1055
       
-
       
  	debug("Opening device: %s", alsa_cfg.pcm_device);

     

       
1056
       
1056
       
-
       
  	/* FIXME: Can snd_pcm_open() return EAGAIN? */

     

       
1057
       
1057
       
-
       
--- 878,885 ----

     

       
1058
       
1058
       
-
       
  	alsa_stereo_convert_func = NULL;

     

       
1059
       
1059
       
-
       
  	alsa_frequency_convert_func = NULL;

     

       
1060
       
1060
       
-
       
  

     

       
1061
       
1061
       
-
       
! 	g_free(outputf);

     

       
1062
       
1062
       
-
       
! 	outputf = snd_format_from_xmms(f->xmms_format, f->rate, f->channels);

     

       
1063
       
1063
       
-
       
  

     

       
1064
       
1064
       
-
       
  	debug("Opening device: %s", alsa_cfg.pcm_device);

     

       
1065
       
1065
       
-
       
  	/* FIXME: Can snd_pcm_open() return EAGAIN? */

     

       
1066
       
1066
       
-
       
***************

     

       
1067
       
1067
       
-
       
*** 829,838 ****

     

       
1068
       
1068
       
-
       
  		g_warning("alsa_setup(): Failed to open pcm device (%s): %s",

     

       
1069
       
1069
       
-
       
  			  alsa_cfg.pcm_device, snd_strerror(-err));

     

       
1070
       
1070
       
-
       
  		alsa_pcm = NULL;

     

       
1071
       
1071
       
-
       
  		return -1;

     

       
1072
       
1072
       
-
       
  	}

     

       
1073
       
1073
       
-
       
- 	snd_pcm_nonblock(alsa_pcm, FALSE);

     

       
1074
       
1074
       
-
       
  

     

       
1075
       
1075
       
-
       
  	if (alsa_cfg.debug)

     

       
1076
       
1076
       
-
       
  	{

     

       
1077
       
1077
       
-
       
  		snd_pcm_info_t *info;

     

       
1078
       
1078
       
-
       
--- 890,903 ----

     

       
1079
       
1079
       
-
       
  		g_warning("alsa_setup(): Failed to open pcm device (%s): %s",

     

       
1080
       
1080
       
-
       
  			  alsa_cfg.pcm_device, snd_strerror(-err));

     

       
1081
       
1081
       
-
       
  		alsa_pcm = NULL;

     

       
1082
       
1082
       
-
       
+ 		g_free(outputf);

     

       
1083
       
1083
       
-
       
+ 		outputf = NULL;

     

       
1084
       
1084
       
-
       
  		return -1;

     

       
1085
       
1085
       
-
       
  	}

     

       
1086
       
1086
       
-
       
  

     

       
1087
       
1087
       
-
       
+ 	/* doesn't care about non-blocking */

     

       
1088
       
1088
       
-
       
+ 	/* snd_pcm_nonblock(alsa_pcm, 0); */

     

       
1089
       
1089
       
-
       
+ 	

     

       
1090
       
1090
       
-
       
  	if (alsa_cfg.debug)

     

       
1091
       
1091
       
-
       
  	{

     

       
1092
       
1092
       
-
       
  		snd_pcm_info_t *info;

     

       
1093
       
1093
       
-
       
***************

     

       
1094
       
1094
       
-
       
*** 856,872 ****

     

       
1095
       
1095
       
-
       
  		return -1;

     

       
1096
       
1096
       
-
       
  	}

     

       
1097
       
1097
       
-
       
  

     

       
1098
       
1098
       
-
       
! 	if (mmap &&

     

       
1099
       
1099
       
-
       
! 	    (err = snd_pcm_hw_params_set_access(alsa_pcm, hwparams,

     

       
1100
       
1100
       
-
       
! 						SND_PCM_ACCESS_MMAP_INTERLEAVED)) < 0)

     

       
1101
       
1101
       
-
       
! 	{

     

       
1102
       
1102
       
-
       
! 		g_message("alsa_setup(): Cannot set mmap'ed mode: %s. "

     

       
1103
       
1103
       
-
       
! 			  "falling back to direct write", snd_strerror(-err));

     

       
1104
       
1104
       
-
       
! 		mmap = 0;

     

       
1105
       
1105
       
-
       
! 	}

     

       
1106
       
1106
       
-
       
! 

     

       
1107
       
1107
       
-
       
! 	if (!mmap &&

     

       
1108
       
1108
       
-
       
! 	    (err = snd_pcm_hw_params_set_access(alsa_pcm, hwparams,

     

       
1109
       
1109
       
-
       
  						SND_PCM_ACCESS_RW_INTERLEAVED)) < 0)

     

       
1110
       
1110
       
-
       
  	{

     

       
1111
       
1111
       
-
       
  		g_warning("alsa_setup(): Cannot set direct write mode: %s",

     

       
1112
       
1112
       
-
       
--- 921,927 ----

     

       
1113
       
1113
       
-
       
  		return -1;

     

       
1114
       
1114
       
-
       
  	}

     

       
1115
       
1115
       
-
       
  

     

       
1116
       
1116
       
-
       
! 	if ((err = snd_pcm_hw_params_set_access(alsa_pcm, hwparams,

     

       
1117
       
1117
       
-
       
  						SND_PCM_ACCESS_RW_INTERLEAVED)) < 0)

     

       
1118
       
1118
       
-
       
  	{

     

       
1119
       
1119
       
-
       
  		g_warning("alsa_setup(): Cannot set direct write mode: %s",

     

       
1120
       
1120
       
-
       
***************

     

       
1121
       
1121
       
-
       
*** 894,910 ****

     

       
1122
       
1122
       
-
       
  				break;

     

       
1123
       
1123
       
-
       
  			}

     

       
1124
       
1124
       
-
       
  		}

     

       
1125
       
1125
       
-
       
! 		if (outputf->format != effectf->format)

     

       
1126
       
1126
       
-
       
  		{

     

       
1127
       
1127
       
-
       
  			outputf->xmms_format =

     

       
1128
       
1128
       
-
       
  				format_from_alsa(outputf->format);

     

       
1129
       
1129
       
-
       
  			debug("Converting format from %d to %d",

     

       
1130
       
1130
       
-
       
! 			      effectf->xmms_format, outputf->xmms_format);

     

       
1131
       
1131
       
-
       
  			if (outputf->xmms_format < 0)

     

       
1132
       
1132
       
-
       
  				return -1;

     

       
1133
       
1133
       
-
       
  			alsa_convert_func =

     

       
1134
       
1134
       
-
       
  				xmms_convert_get_func(outputf->xmms_format,

     

       
1135
       
1135
       
-
       
! 						      effectf->xmms_format);

     

       
1136
       
1136
       
-
       
  			if (alsa_convert_func == NULL)

     

       
1137
       
1137
       
-
       
  				return -1;

     

       
1138
       
1138
       
-
       
  		}

     

       
1139
       
1139
       
-
       
--- 949,965 ----

     

       
1140
       
1140
       
-
       
  				break;

     

       
1141
       
1141
       
-
       
  			}

     

       
1142
       
1142
       
-
       
  		}

     

       
1143
       
1143
       
-
       
! 		if (outputf->format != f->format)

     

       
1144
       
1144
       
-
       
  		{

     

       
1145
       
1145
       
-
       
  			outputf->xmms_format =

     

       
1146
       
1146
       
-
       
  				format_from_alsa(outputf->format);

     

       
1147
       
1147
       
-
       
  			debug("Converting format from %d to %d",

     

       
1148
       
1148
       
-
       
! 			      f->xmms_format, outputf->xmms_format);

     

       
1149
       
1149
       
-
       
  			if (outputf->xmms_format < 0)

     

       
1150
       
1150
       
-
       
  				return -1;

     

       
1151
       
1151
       
-
       
  			alsa_convert_func =

     

       
1152
       
1152
       
-
       
  				xmms_convert_get_func(outputf->xmms_format,

     

       
1153
       
1153
       
-
       
! 						      f->xmms_format);

     

       
1154
       
1154
       
-
       
  			if (alsa_convert_func == NULL)

     

       
1155
       
1155
       
-
       
  				return -1;

     

       
1156
       
1156
       
-
       
  		}

     

       
1157
       
1157
       
-
       
***************

     

       
1158
       
1158
       
-
       
*** 918,931 ****

     

       
1159
       
1159
       
-
       
  	}

     

       
1160
       
1160
       
-
       
  

     

       
1161
       
1161
       
-
       
  	snd_pcm_hw_params_set_channels_near(alsa_pcm, hwparams, &outputf->channels);

     

       
1162
       
1162
       
-
       
! 	if (outputf->channels != effectf->channels)

     

       
1163
       
1163
       
-
       
  	{

     

       
1164
       
1164
       
-
       
  		debug("Converting channels from %d to %d",

     

       
1165
       
1165
       
-
       
! 		      effectf->channels, outputf->channels);

     

       
1166
       
1166
       
-
       
  		alsa_stereo_convert_func =

     

       
1167
       
1167
       
-
       
  			xmms_convert_get_channel_func(outputf->xmms_format,

     

       
1168
       
1168
       
-
       
  						      outputf->channels,

     

       
1169
       
1169
       
-
       
! 						      effectf->channels);

     

       
1170
       
1170
       
-
       
  		if (alsa_stereo_convert_func == NULL)

     

       
1171
       
1171
       
-
       
  			return -1;

     

       
1172
       
1172
       
-
       
  	}

     

       
1173
       
1173
       
-
       
--- 973,986 ----

     

       
1174
       
1174
       
-
       
  	}

     

       
1175
       
1175
       
-
       
  

     

       
1176
       
1176
       
-
       
  	snd_pcm_hw_params_set_channels_near(alsa_pcm, hwparams, &outputf->channels);

     

       
1177
       
1177
       
-
       
! 	if (outputf->channels != f->channels)

     

       
1178
       
1178
       
-
       
  	{

     

       
1179
       
1179
       
-
       
  		debug("Converting channels from %d to %d",

     

       
1180
       
1180
       
-
       
! 		      f->channels, outputf->channels);

     

       
1181
       
1181
       
-
       
  		alsa_stereo_convert_func =

     

       
1182
       
1182
       
-
       
  			xmms_convert_get_channel_func(outputf->xmms_format,

     

       
1183
       
1183
       
-
       
  						      outputf->channels,

     

       
1184
       
1184
       
-
       
! 						      f->channels);

     

       
1185
       
1185
       
-
       
  		if (alsa_stereo_convert_func == NULL)

     

       
1186
       
1186
       
-
       
  			return -1;

     

       
1187
       
1187
       
-
       
  	}

     

       
1188
       
1188
       
-
       
***************

     

       
1189
       
1189
       
-
       
*** 936,945 ****

     

       
1190
       
1190
       
-
       
  		g_warning("alsa_setup(): No usable samplerate available.");

     

       
1191
       
1191
       
-
       
  		return -1;

     

       
1192
       
1192
       
-
       
  	}

     

       
1193
       
1193
       
-
       
! 	if (outputf->rate != effectf->rate)

     

       
1194
       
1194
       
-
       
  	{

     

       
1195
       
1195
       
-
       
  		debug("Converting samplerate from %d to %d",

     

       
1196
       
1196
       
-
       
! 		      effectf->rate, outputf->rate);

     

       
1197
       
1197
       
-
       
  		alsa_frequency_convert_func =

     

       
1198
       
1198
       
-
       
  			xmms_convert_get_frequency_func(outputf->xmms_format,

     

       
1199
       
1199
       
-
       
  							outputf->channels);

     

       
1200
       
1200
       
-
       
--- 991,1000 ----

     

       
1201
       
1201
       
-
       
  		g_warning("alsa_setup(): No usable samplerate available.");

     

       
1202
       
1202
       
-
       
  		return -1;

     

       
1203
       
1203
       
-
       
  	}

     

       
1204
       
1204
       
-
       
! 	if (outputf->rate != f->rate)

     

       
1205
       
1205
       
-
       
  	{

     

       
1206
       
1206
       
-
       
  		debug("Converting samplerate from %d to %d",

     

       
1207
       
1207
       
-
       
! 		      f->rate, outputf->rate);

     

       
1208
       
1208
       
-
       
  		alsa_frequency_convert_func =

     

       
1209
       
1209
       
-
       
  			xmms_convert_get_frequency_func(outputf->xmms_format,

     

       
1210
       
1210
       
-
       
  							outputf->channels);

     

       
1211
       
1211
       
-
       
***************

     

       
1212
       
1212
       
-
       
*** 947,960 ****

     

       
1213
       
1213
       
-
       
  			return -1;

     

       
1214
       
1214
       
-
       
  	}

     

       
1215
       
1215
       
-
       
  

     

       
1216
       
1216
       
-
       
! 	alsa_buffer_time = alsa_cfg.buffer_time * 1000;

     

       
1217
       
1217
       
-
       
! 	if ((err = snd_pcm_hw_params_set_buffer_time_near(alsa_pcm, hwparams,

     

       
1218
       
1218
       
-
       
! 							  &alsa_buffer_time, 0)) < 0)

     

       
1219
       
1219
       
-
       
! 	{

     

       
1220
       
1220
       
-
       
! 		g_warning("alsa_setup(): Set buffer time failed: %s.",

     

       
1221
       
1221
       
-
       
! 			  snd_strerror(-err));

     

       
1222
       
1222
       
-
       
! 		return -1;

     

       
1223
       
1223
       
-
       
! 	}

     

       
1224
       
1224
       
-
       
  

     

       
1225
       
1225
       
-
       
  	alsa_period_time = alsa_cfg.period_time * 1000;

     

       
1226
       
1226
       
-
       
  	if ((err = snd_pcm_hw_params_set_period_time_near(alsa_pcm, hwparams,

     

       
1227
       
1227
       
-
       
--- 1002,1009 ----

     

       
1228
       
1228
       
-
       
  			return -1;

     

       
1229
       
1229
       
-
       
  	}

     

       
1230
       
1230
       
-
       
  

     

       
1231
       
1231
       
-
       
! 	outputf->sample_bits = snd_pcm_format_physical_width(outputf->format);

     

       
1232
       
1232
       
-
       
! 	outputf->bps = (outputf->rate * outputf->sample_bits * outputf->channels) >> 3;

     

       
1233
       
1233
       
-
       
  

     

       
1234
       
1234
       
-
       
  	alsa_period_time = alsa_cfg.period_time * 1000;

     

       
1235
       
1235
       
-
       
  	if ((err = snd_pcm_hw_params_set_period_time_near(alsa_pcm, hwparams,

     

       
1236
       
1236
       
-
       
***************

     

       
1237
       
1237
       
-
       
*** 965,970 ****

     

       
1238
       
1238
       
-
       
--- 1014,1028 ----

     

       
1239
       
1239
       
-
       
  		return -1;

     

       
1240
       
1240
       
-
       
  	}

     

       
1241
       
1241
       
-
       
  

     

       
1242
       
1242
       
-
       
+ 	alsa_buffer_time = alsa_cfg.buffer_time * 1000;

     

       
1243
       
1243
       
-
       
+ 	if ((err = snd_pcm_hw_params_set_buffer_time_near(alsa_pcm, hwparams,

     

       
1244
       
1244
       
-
       
+ 							  &alsa_buffer_time, 0)) < 0)

     

       
1245
       
1245
       
-
       
+ 	{

     

       
1246
       
1246
       
-
       
+ 		g_warning("alsa_setup(): Set buffer time failed: %s.",

     

       
1247
       
1247
       
-
       
+ 			  snd_strerror(-err));

     

       
1248
       
1248
       
-
       
+ 		return -1;

     

       
1249
       
1249
       
-
       
+ 	}

     

       
1250
       
1250
       
-
       
+ 

     

       
1251
       
1251
       
-
       
  	if (snd_pcm_hw_params(alsa_pcm, hwparams) < 0)

     

       
1252
       
1252
       
-
       
  	{

     

       
1253
       
1253
       
-
       
  		if (alsa_cfg.debug)

     

       
1254
       
1254
       
-
       
***************

     

       
1255
       
1255
       
-
       
*** 1011,1037 ****

     

       
1256
       
1256
       
-
       
  		snd_pcm_dump(alsa_pcm, logs);

     

       
1257
       
1257
       
-
       
  	}

     

       
1258
       
1258
       
-
       
  

     

       
1259
       
1259
       
-
       
! 	bits_per_sample = snd_pcm_format_physical_width(outputf->format);

     

       
1260
       
1260
       
-
       
! 	alsa_bps = (outputf->rate * bits_per_sample * outputf->channels) >> 3;

     

       
1261
       
1261
       
-
       
! 

     

       
1262
       
1262
       
-
       
! 	if (mmap)

     

       
1263
       
1263
       
-
       
! 	{

     

       
1264
       
1264
       
-
       
! 		int chn;

     

       
1265
       
1265
       
-
       
! 		buffer = g_malloc(alsa_period_size * bits_per_sample / 8 * outputf->channels);

     

       
1266
       
1266
       
-
       
! 		areas = g_malloc0(outputf->channels * sizeof(snd_pcm_channel_area_t));

     

       
1267
       
1267
       
-
       
! 		

     

       
1268
       
1268
       
-
       
! 		for (chn = 0; chn < outputf->channels; chn++)

     

       
1269
       
1269
       
-
       
! 		{

     

       
1270
       
1270
       
-
       
! 			areas[chn].addr = buffer;

     

       
1271
       
1271
       
-
       
! 			areas[chn].first = chn * bits_per_sample;

     

       
1272
       
1272
       
-
       
! 			areas[chn].step = outputf->channels * bits_per_sample;

     

       
1273
       
1273
       
-
       
! 		}

     

       
1274
       
1274
       
-
       
  	}

     

       
1275
       
1275
       
-
       
  

     

       
1276
       
1276
       
-
       
  	debug("Device setup: buffer time: %i, size: %i.", alsa_buffer_time,

     

       
1277
       
1277
       
-
       
! 	      snd_pcm_frames_to_bytes(alsa_pcm, alsa_buffer_size));

     

       
1278
       
1278
       
-
       
  	debug("bits per sample: %i; frame size: %i; Bps: %i",

     

       
1279
       
1279
       
-
       
! 	      bits_per_sample, snd_pcm_frames_to_bytes(alsa_pcm, 1), alsa_bps);

     

       
1280
       
1280
       
-
       
  

     

       
1281
       
1281
       
-
       
  	return 0;

     

       
1282
       
1282
       
-
       
  }

     

       
1283
       
1283
       
-
       
--- 1069,1096 ----

     

       
1284
       
1284
       
-
       
  		snd_pcm_dump(alsa_pcm, logs);

     

       
1285
       
1285
       
-
       
  	}

     

       
1286
       
1286
       
-
       
  

     

       
1287
       
1287
       
-
       
! 	hw_buffer_size = snd_pcm_frames_to_bytes(alsa_pcm, alsa_buffer_size);

     

       
1288
       
1288
       
-
       
! 	hw_period_size = snd_pcm_frames_to_bytes(alsa_pcm, alsa_period_size);

     

       
1289
       
1289
       
-
       
! 	if (inputf->bps != outputf->bps) {

     

       
1290
       
1290
       
-
       
! 		int align = (inputf->sample_bits * inputf->channels) / 8;

     

       
1291
       
1291
       
-
       
! 		hw_buffer_size_in = ((guint64)hw_buffer_size * inputf->bps +

     

       
1292
       
1292
       
-
       
! 				     outputf->bps/2) / outputf->bps;

     

       
1293
       
1293
       
-
       
! 		hw_period_size_in = ((guint64)hw_period_size * inputf->bps +

     

       
1294
       
1294
       
-
       
! 				     outputf->bps/2) / outputf->bps;

     

       
1295
       
1295
       
-
       
! 		hw_buffer_size_in -= hw_buffer_size_in % align;

     

       
1296
       
1296
       
-
       
! 		hw_period_size_in -= hw_period_size_in % align;

     

       
1297
       
1297
       
-
       
! 	} else {

     

       
1298
       
1298
       
-
       
! 		hw_buffer_size_in = hw_buffer_size;

     

       
1299
       
1299
       
-
       
! 		hw_period_size_in = hw_period_size;

     

       
1300
       
1300
       
-
       
  	}

     

       
1301
       
1301
       
-
       
  

     

       
1302
       
1302
       
-
       
  	debug("Device setup: buffer time: %i, size: %i.", alsa_buffer_time,

     

       
1303
       
1303
       
-
       
! 	      hw_buffer_size);

     

       
1304
       
1304
       
-
       
! 	debug("Device setup: period time: %i, size: %i.", alsa_period_time,

     

       
1305
       
1305
       
-
       
! 	      hw_period_size);

     

       
1306
       
1306
       
-
       
  	debug("bits per sample: %i; frame size: %i; Bps: %i",

     

       
1307
       
1307
       
-
       
! 	      snd_pcm_format_physical_width(outputf->format),

     

       
1308
       
1308
       
-
       
! 	      snd_pcm_frames_to_bytes(alsa_pcm, 1), outputf->bps);

     

       
1309
       
1309
       
-
       
  

     

       
1310
       
1310
       
-
       
  	return 0;

     

       
1311
       
1311
       
-
       
  }

     

       
1312
       
1312
       
-
       
diff -rc xmms-1.2.10-orig/Output/alsa/configure.c xmms-1.2.10/Output/alsa/configure.c

     

       
1313
       
1313
       
-
       
*** xmms-1.2.10-orig/Output/alsa/configure.c	2004-01-28 00:09:39.000000000 +0100

     

       
1314
       
1314
       
-
       
--- xmms-1.2.10/Output/alsa/configure.c	2006-01-27 00:28:49.000000000 +0100

     

       
1315
       
1315
       
-
       
***************

     

       
1316
       
1316
       
-
       
*** 20,27 ****

     

       
1317
       
1317
       
-
       
  #include <stdio.h>

     

       
1318
       
1318
       
-
       
  

     

       
1319
       
1319
       
-
       
  static GtkWidget *configure_win = NULL;

     

       
1320
       
1320
       
-
       
! static GtkWidget *buffer_time_spin, *period_time_spin;

     

       
1321
       
1321
       
-
       
! static GtkWidget *mmap_button, *mixer_card_spin, *softvolume_toggle_button;

     

       
1322
       
1322
       
-
       
  

     

       
1323
       
1323
       
-
       
  static GtkWidget *devices_combo, *mixer_devices_combo;

     

       
1324
       
1324
       
-
       
  

     

       
1325
       
1325
       
-
       
--- 20,27 ----

     

       
1326
       
1326
       
-
       
  #include <stdio.h>

     

       
1327
       
1327
       
-
       
  

     

       
1328
       
1328
       
-
       
  static GtkWidget *configure_win = NULL;

     

       
1329
       
1329
       
-
       
! static GtkWidget *buffer_time_spin, *period_time_spin, *thread_buffer_time_spin;

     

       
1330
       
1330
       
-
       
! static GtkWidget *mixer_card_spin, *softvolume_toggle_button;

     

       
1331
       
1331
       
-
       
  

     

       
1332
       
1332
       
-
       
  static GtkWidget *devices_combo, *mixer_devices_combo;

     

       
1333
       
1333
       
-
       
  

     

       
1334
       
1334
       
-
       
***************

     

       
1335
       
1335
       
-
       
*** 36,42 ****

     

       
1336
       
1336
       
-
       
  	alsa_cfg.pcm_device = GET_CHARS(GTK_COMBO(devices_combo)->entry);

     

       
1337
       
1337
       
-
       
  	alsa_cfg.buffer_time = GET_SPIN_INT(buffer_time_spin);

     

       
1338
       
1338
       
-
       
  	alsa_cfg.period_time = GET_SPIN_INT(period_time_spin);

     

       
1339
       
1339
       
-
       
! 	alsa_cfg.mmap = GET_TOGGLE(mmap_button);

     

       
1340
       
1340
       
-
       
  	alsa_cfg.soft_volume = GET_TOGGLE(softvolume_toggle_button);

     

       
1341
       
1341
       
-
       
  	alsa_cfg.mixer_card = GET_SPIN_INT(mixer_card_spin);

     

       
1342
       
1342
       
-
       
  	alsa_cfg.mixer_device = GET_CHARS(GTK_COMBO(mixer_devices_combo)->entry);

     

       
1343
       
1343
       
-
       
--- 36,42 ----

     

       
1344
       
1344
       
-
       
  	alsa_cfg.pcm_device = GET_CHARS(GTK_COMBO(devices_combo)->entry);

     

       
1345
       
1345
       
-
       
  	alsa_cfg.buffer_time = GET_SPIN_INT(buffer_time_spin);

     

       
1346
       
1346
       
-
       
  	alsa_cfg.period_time = GET_SPIN_INT(period_time_spin);

     

       
1347
       
1347
       
-
       
! 	alsa_cfg.thread_buffer_time = GET_SPIN_INT(thread_buffer_time_spin);

     

       
1348
       
1348
       
-
       
  	alsa_cfg.soft_volume = GET_TOGGLE(softvolume_toggle_button);

     

       
1349
       
1349
       
-
       
  	alsa_cfg.mixer_card = GET_SPIN_INT(mixer_card_spin);

     

       
1350
       
1350
       
-
       
  	alsa_cfg.mixer_device = GET_CHARS(GTK_COMBO(mixer_devices_combo)->entry);

     

       
1351
       
1351
       
-
       
***************

     

       
1352
       
1352
       
-
       
*** 51,57 ****

     

       
1353
       
1353
       
-
       
  	

     

       
1354
       
1354
       
-
       
  	xmms_cfg_write_int(cfgfile, "ALSA", "buffer_time", alsa_cfg.buffer_time);

     

       
1355
       
1355
       
-
       
  	xmms_cfg_write_int(cfgfile, "ALSA", "period_time", alsa_cfg.period_time);

     

       
1356
       
1356
       
-
       
! 	xmms_cfg_write_boolean(cfgfile,"ALSA","mmap",alsa_cfg.mmap);

     

       
1357
       
1357
       
-
       
  	xmms_cfg_write_string(cfgfile,"ALSA","pcm_device", alsa_cfg.pcm_device);

     

       
1358
       
1358
       
-
       
  	xmms_cfg_write_int(cfgfile, "ALSA", "mixer_card", alsa_cfg.mixer_card);

     

       
1359
       
1359
       
-
       
  	xmms_cfg_write_string(cfgfile,"ALSA","mixer_device", alsa_cfg.mixer_device);

     

       
1360
       
1360
       
-
       
--- 51,57 ----

     

       
1361
       
1361
       
-
       
  	

     

       
1362
       
1362
       
-
       
  	xmms_cfg_write_int(cfgfile, "ALSA", "buffer_time", alsa_cfg.buffer_time);

     

       
1363
       
1363
       
-
       
  	xmms_cfg_write_int(cfgfile, "ALSA", "period_time", alsa_cfg.period_time);

     

       
1364
       
1364
       
-
       
! 	xmms_cfg_write_int(cfgfile, "ALSA", "thread_buffer_time", alsa_cfg.thread_buffer_time);

     

       
1365
       
1365
       
-
       
  	xmms_cfg_write_string(cfgfile,"ALSA","pcm_device", alsa_cfg.pcm_device);

     

       
1366
       
1366
       
-
       
  	xmms_cfg_write_int(cfgfile, "ALSA", "mixer_card", alsa_cfg.mixer_card);

     

       
1367
       
1367
       
-
       
  	xmms_cfg_write_string(cfgfile,"ALSA","mixer_device", alsa_cfg.mixer_device);

     

       
1368
       
1368
       
-
       
***************

     

       
1369
       
1369
       
-
       
*** 212,219 ****

     

       
1370
       
1370
       
-
       
  	GtkWidget *dev_vbox, *adevice_frame, *adevice_box;

     

       
1371
       
1371
       
-
       
  	GtkWidget *mixer_frame, *mixer_box, *mixer_card_box;

     

       
1372
       
1372
       
-
       
  	GtkWidget *buffer_frame, *buffer_vbox, *buffer_table;

     

       
1373
       
1373
       
-
       
! 	GtkWidget *buffer_time_label, *period_time_label;

     

       
1374
       
1374
       
-
       
! 	GtkObject *buffer_time_adj, *period_time_adj, *mixer_card_adj;

     

       
1375
       
1375
       
-
       
  	GtkWidget *bbox, *ok, *cancel;

     

       
1376
       
1376
       
-
       
  	

     

       
1377
       
1377
       
-
       
  	if (configure_win)

     

       
1378
       
1378
       
-
       
--- 212,219 ----

     

       
1379
       
1379
       
-
       
  	GtkWidget *dev_vbox, *adevice_frame, *adevice_box;

     

       
1380
       
1380
       
-
       
  	GtkWidget *mixer_frame, *mixer_box, *mixer_card_box;

     

       
1381
       
1381
       
-
       
  	GtkWidget *buffer_frame, *buffer_vbox, *buffer_table;

     

       
1382
       
1382
       
-
       
! 	GtkWidget *buffer_time_label, *period_time_label, *thread_buffer_time_label;

     

       
1383
       
1383
       
-
       
! 	GtkObject *buffer_time_adj, *period_time_adj, *thread_buffer_time_adj, *mixer_card_adj;

     

       
1384
       
1384
       
-
       
  	GtkWidget *bbox, *ok, *cancel;

     

       
1385
       
1385
       
-
       
  	

     

       
1386
       
1386
       
-
       
  	if (configure_win)

     

       
1387
       
1387
       
-
       
***************

     

       
1388
       
1388
       
-
       
*** 312,318 ****

     

       
1389
       
1389
       
-
       
  	

     

       
1390
       
1390
       
-
       
  	gtk_container_set_border_width(GTK_CONTAINER(buffer_vbox), 5);

     

       
1391
       
1391
       
-
       
  

     

       
1392
       
1392
       
-
       
! 	buffer_table = gtk_table_new(2, 2, FALSE);

     

       
1393
       
1393
       
-
       
  	gtk_table_set_row_spacings(GTK_TABLE(buffer_table), 5);

     

       
1394
       
1394
       
-
       
  	gtk_table_set_col_spacings(GTK_TABLE(buffer_table), 5);

     

       
1395
       
1395
       
-
       
  	gtk_box_pack_start(GTK_BOX(buffer_vbox), buffer_table, FALSE, FALSE, 0);

     

       
1396
       
1396
       
-
       
--- 312,318 ----

     

       
1397
       
1397
       
-
       
  	

     

       
1398
       
1398
       
-
       
  	gtk_container_set_border_width(GTK_CONTAINER(buffer_vbox), 5);

     

       
1399
       
1399
       
-
       
  

     

       
1400
       
1400
       
-
       
! 	buffer_table = gtk_table_new(2, 3, FALSE);

     

       
1401
       
1401
       
-
       
  	gtk_table_set_row_spacings(GTK_TABLE(buffer_table), 5);

     

       
1402
       
1402
       
-
       
  	gtk_table_set_col_spacings(GTK_TABLE(buffer_table), 5);

     

       
1403
       
1403
       
-
       
  	gtk_box_pack_start(GTK_BOX(buffer_vbox), buffer_table, FALSE, FALSE, 0);

     

       
1404
       
1404
       
-
       
***************

     

       
1405
       
1405
       
-
       
*** 345,354 ****

     

       
1406
       
1406
       
-
       
  	gtk_table_attach(GTK_TABLE(buffer_table), period_time_spin,

     

       
1407
       
1407
       
-
       
  			 1, 2, 1, 2, 0, 0, 0, 0);

     

       
1408
       
1408
       
-
       
  	

     

       
1409
       
1409
       
-
       
! 	mmap_button = gtk_check_button_new_with_label(_("Mmap mode"));

     

       
1410
       
1410
       
-
       
! 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(mmap_button),

     

       
1411
       
1411
       
-
       
! 				     alsa_cfg.mmap);

     

       
1412
       
1412
       
-
       
! 	gtk_box_pack_start(GTK_BOX(buffer_vbox), mmap_button, FALSE, FALSE, 0);

     

       
1413
       
1413
       
-
       
  	

     

       
1414
       
1414
       
-
       
  	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), buffer_frame,

     

       
1415
       
1415
       
-
       
  				 gtk_label_new(_("Advanced settings")));

     

       
1416
       
1416
       
-
       
--- 345,363 ----

     

       
1417
       
1417
       
-
       
  	gtk_table_attach(GTK_TABLE(buffer_table), period_time_spin,

     

       
1418
       
1418
       
-
       
  			 1, 2, 1, 2, 0, 0, 0, 0);

     

       
1419
       
1419
       
-
       
  	

     

       
1420
       
1420
       
-
       
! 	thread_buffer_time_label = gtk_label_new(_("Thread buffer time (ms):"));

     

       
1421
       
1421
       
-
       
! 	gtk_label_set_justify(GTK_LABEL(thread_buffer_time_label), GTK_JUSTIFY_LEFT);

     

       
1422
       
1422
       
-
       
! 	gtk_misc_set_alignment(GTK_MISC(thread_buffer_time_label), 0, 0.5);

     

       
1423
       
1423
       
-
       
! 	gtk_table_attach(GTK_TABLE(buffer_table), thread_buffer_time_label,

     

       
1424
       
1424
       
-
       
! 			 0, 1, 2, 3, GTK_FILL, 0, 0, 0);

     

       
1425
       
1425
       
-
       
! 	thread_buffer_time_adj = gtk_adjustment_new(alsa_cfg.thread_buffer_time,

     

       
1426
       
1426
       
-
       
! 						    1000, 1000000, 100, 100, 100);

     

       
1427
       
1427
       
-
       
! 	thread_buffer_time_spin = gtk_spin_button_new(GTK_ADJUSTMENT(thread_buffer_time_adj),

     

       
1428
       
1428
       
-
       
! 						      8, 0);

     

       
1429
       
1429
       
-
       
! 	

     

       
1430
       
1430
       
-
       
! 	gtk_widget_set_usize(thread_buffer_time_spin, 60, -1);

     

       
1431
       
1431
       
-
       
! 	gtk_table_attach(GTK_TABLE(buffer_table), thread_buffer_time_spin,

     

       
1432
       
1432
       
-
       
! 			 1, 2, 2, 3, 0, 0, 0, 0);

     

       
1433
       
1433
       
-
       
  	

     

       
1434
       
1434
       
-
       
  	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), buffer_frame,

     

       
1435
       
1435
       
-
       
  				 gtk_label_new(_("Advanced settings")));

     

       
1436
       
1436
       
-
       
diff -rc xmms-1.2.10-orig/Output/alsa/init.c xmms-1.2.10/Output/alsa/init.c

     

       
1437
       
1437
       
-
       
*** xmms-1.2.10-orig/Output/alsa/init.c	2004-01-11 17:27:26.000000000 +0100

     

       
1438
       
1438
       
-
       
--- xmms-1.2.10/Output/alsa/init.c	2006-01-27 00:28:49.000000000 +0100

     

       
1439
       
1439
       
-
       
***************

     

       
1440
       
1440
       
-
       
*** 29,36 ****

     

       
1441
       
1441
       
-
       
  	memset(&alsa_cfg, 0, sizeof (alsa_cfg));

     

       
1442
       
1442
       
-
       
  	alsa_cfg.buffer_time = 500;

     

       
1443
       
1443
       
-
       
  	alsa_cfg.period_time = 50;

     

       
1444
       
1444
       
-
       
  	alsa_cfg.debug = 0;

     

       
1445
       
1445
       
-
       
- 	alsa_cfg.mmap = 1;

     

       
1446
       
1446
       
-
       
  	alsa_cfg.vol.left = 100;

     

       
1447
       
1447
       
-
       
  	alsa_cfg.vol.right = 100;

     

       
1448
       
1448
       
-
       
  

     

       
1449
       
1449
       
-
       
--- 29,36 ----

     

       
1450
       
1450
       
-
       
  	memset(&alsa_cfg, 0, sizeof (alsa_cfg));

     

       
1451
       
1451
       
-
       
  	alsa_cfg.buffer_time = 500;

     

       
1452
       
1452
       
-
       
  	alsa_cfg.period_time = 50;

     

       
1453
       
1453
       
-
       
+ 	alsa_cfg.thread_buffer_time = 3000;

     

       
1454
       
1454
       
-
       
  	alsa_cfg.debug = 0;

     

       
1455
       
1455
       
-
       
  	alsa_cfg.vol.left = 100;

     

       
1456
       
1456
       
-
       
  	alsa_cfg.vol.right = 100;

     

       
1457
       
1457
       
-
       
  

     

       
1458
       
1458
       
-
       
***************

     

       
1459
       
1459
       
-
       
*** 44,51 ****

     

       
1460
       
1460
       
-
       
  	xmms_cfg_read_int(cfgfile, "ALSA", "mixer_card", &alsa_cfg.mixer_card);

     

       
1461
       
1461
       
-
       
  	xmms_cfg_read_int(cfgfile, "ALSA", "buffer_time", &alsa_cfg.buffer_time);

     

       
1462
       
1462
       
-
       
  	xmms_cfg_read_int(cfgfile, "ALSA", "period_time", &alsa_cfg.period_time);

     

       
1463
       
1463
       
-
       
! 	xmms_cfg_read_boolean(cfgfile, "ALSA", "mmap", &alsa_cfg.mmap);

     

       
1464
       
1464
       
-
       
! 	xmms_cfg_read_int(cfgfile, "ALSA", "period_time", &alsa_cfg.period_time);

     

       
1465
       
1465
       
-
       
  	xmms_cfg_read_boolean(cfgfile, "ALSA", "soft_volume",

     

       
1466
       
1466
       
-
       
  			      &alsa_cfg.soft_volume);

     

       
1467
       
1467
       
-
       
  	xmms_cfg_read_int(cfgfile, "ALSA", "volume_left", &alsa_cfg.vol.left);

     

       
1468
       
1468
       
-
       
--- 44,50 ----

     

       
1469
       
1469
       
-
       
  	xmms_cfg_read_int(cfgfile, "ALSA", "mixer_card", &alsa_cfg.mixer_card);

     

       
1470
       
1470
       
-
       
  	xmms_cfg_read_int(cfgfile, "ALSA", "buffer_time", &alsa_cfg.buffer_time);

     

       
1471
       
1471
       
-
       
  	xmms_cfg_read_int(cfgfile, "ALSA", "period_time", &alsa_cfg.period_time);

     

       
1472
       
1472
       
-
       
! 	xmms_cfg_read_int(cfgfile, "ALSA", "thread_buffer_time", &alsa_cfg.thread_buffer_time);

     

       
1473
       
1473
       
-
       
  	xmms_cfg_read_boolean(cfgfile, "ALSA", "soft_volume",

     

       
1474
       
1474
       
-
       
  			      &alsa_cfg.soft_volume);

     

       
1475
       
1475
       
-
       
  	xmms_cfg_read_int(cfgfile, "ALSA", "volume_left", &alsa_cfg.vol.left);