1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
|
Index: main/libao2/ao_jack.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/ao_jack.c,v
retrieving revision 1.2
diff -u -r1.2 ao_jack.c
--- main/libao2/ao_jack.c 27 Jun 2004 13:18:06 -0000 1.2
+++ main/libao2/ao_jack.c 10 Aug 2004 17:48:48 -0000
@@ -34,8 +34,8 @@
long JACK_Write(int deviceID, char *data, unsigned long bytes); /* returns the number of bytes written */
long JACK_GetJackLatency(int deviceID); /* return the latency in milliseconds of jack */
int JACK_SetState(int deviceID, enum status_enum state); /* playing, paused, stopped */
-int JACK_SetVolume(int deviceID, int left, int right); /* returns 0 on success */
-void JACK_GetVolume(int deviceID, int *left, int *right);
+int JACK_SetVolumeForChannel(int deviceID, unsigned int channel, unsigned int volume); /* return 0 on success */
+void JACK_GetVolumeForChannel(int deviceID, unsigned int channel, unsigned int *volume);
//
@@ -57,9 +57,10 @@
case AOCONTROL_GET_VOLUME:
{
ao_control_vol_t *vol = (ao_control_vol_t *)arg;
- int l, r;
+ unsigned int l, r;
- JACK_GetVolume(driver, &l, &r);
+ JACK_GetVolumeForChannel(driver, 0, &l);
+ JACK_GetVolumeForChannel(driver, 1, &r);
vol->left = (float )l;
vol->right = (float )r;
@@ -68,16 +69,21 @@
case AOCONTROL_SET_VOLUME:
{
ao_control_vol_t *vol = (ao_control_vol_t *)arg;
- int l = (int )vol->left,
+ unsigned int l = (int )vol->left,
r = (int )vol->right,
err = 0;
- if((err = JACK_SetVolume(driver, l, r))) {
+ if((err = JACK_SetVolumeForChannel(driver, 0, l))) {
mp_msg(MSGT_AO, MSGL_ERR,
- "AO: [Jack] Setting volume failed, error %d\n",err);
+ "AO: [Jack] Setting left volume failed, error %d\n",err);
return CONTROL_ERROR;
}
-
+ if((err = JACK_SetVolumeForChannel(driver, 1, r))) {
+ mp_msg(MSGT_AO, MSGL_ERR,
+ "AO: [Jack] Setting right volume failed, error %d\n",err);
+ return CONTROL_ERROR;
+ }
+
return CONTROL_OK;
}
}
--- main/configure.~1.893.~ 2004-08-09 15:51:44.000000000 +0300
+++ main/configure 2004-08-10 20:41:00.000000000 +0300
@@ -4187,7 +4187,9 @@
#include <jack/jack.h>
int main(void) { JACK_Init(); return 0; }
EOF
- if test -z "$_bio2jackdir" ; then
+ if ( ( test ! `bio2jack-config --version|cut -d"." -f2` -ge "2" ) ) ; then
+ _jack=no;
+ elif test -z "$_bio2jackdir" ; then
cc_check -lbio2jack `pkg-config --libs --cflags jack` && ( "$TMPO" >> "$TMPLOG" 2>&1 ) && _jack=yes
else
cc_check -L "$_bio2jackdir" -lbio2jack `pkg-config --libs --cflags jack` && ( "$TMPO" >> "$TMPLOG" 2>&1 ) && _jack=yes
|
GitWeb
