diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-08-13 00:33:14 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-08-13 00:33:14 +0000 |
| commit | b233aff173bd31644ca16e19cbdf6b8075458185 (patch) | |
| tree | cbbeda43660624129dbd6a96756a057739b7c500 /libao2 | |
| parent | 77e529d9f7499b54a9ce236fe633e29e35a12b76 (diff) | |
| download | mpv-b233aff173bd31644ca16e19cbdf6b8075458185.tar.bz2 mpv-b233aff173bd31644ca16e19cbdf6b8075458185.tar.xz | |
Update ao_jack for new bio2jack API, improve check in configure.
Patches by Andre Kuehne and Ismail Dönmez.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13013 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libao2')
| -rw-r--r-- | libao2/ao_jack.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/libao2/ao_jack.c b/libao2/ao_jack.c index 96321e84ef..9f062d48a0 100644 --- a/libao2/ao_jack.c +++ b/libao2/ao_jack.c @@ -34,8 +34,8 @@ void JACK_Reset(int deviceID); /* free all buffered data and reset several value 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); +void JACK_GetVolumeForChannel(int deviceID, unsigned int channel, unsigned int *volume); // @@ -57,9 +57,10 @@ static int control(int cmd, void *arg) 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 @@ static int control(int cmd, void *arg) 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; } } |