Mercurial > mplayer.hg
changeset 10659:7c404c64a2bc
100l
| author | alex |
|---|---|
| date | Mon, 18 Aug 2003 13:39:07 +0000 |
| parents | c5e7b34bfc19 |
| children | 8f168a4128c5 |
| files | libao2/ao_alsa1x.c libao2/ao_alsa9.c |
| diffstat | 2 files changed, 6 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/libao2/ao_alsa1x.c Mon Aug 18 13:13:41 2003 +0000 +++ b/libao2/ao_alsa1x.c Mon Aug 18 13:39:07 2003 +0000 @@ -85,10 +85,9 @@ switch(cmd) { case AOCONTROL_QUERY_FORMAT: return CONTROL_TRUE; +#ifndef WORDS_BIGENDIAN case AOCONTROL_GET_VOLUME: case AOCONTROL_SET_VOLUME: -#ifndef WORDS_BIGENDIAN -{ //seems to be a problem on macs? { ao_control_vol_t *vol = (ao_control_vol_t *)arg; @@ -181,17 +180,9 @@ snd_mixer_close(handle); return CONTROL_OK; } -}// end big-endian -#endif -#ifdef WORDS_BIGENDIAN -{ - { - return (CONTROL_UNKNOWN); - } -} #endif - } //end witch + } //end switch return(CONTROL_UNKNOWN); } @@ -393,7 +384,7 @@ default: fprintf(stderr, "%d channels are not supported\n", channels); - exit (0); + return(0); } alsa_device = devstr;
--- a/libao2/ao_alsa9.c Mon Aug 18 13:13:41 2003 +0000 +++ b/libao2/ao_alsa9.c Mon Aug 18 13:39:07 2003 +0000 @@ -85,10 +85,9 @@ switch(cmd) { case AOCONTROL_QUERY_FORMAT: return CONTROL_TRUE; +#ifndef WORDS_BIGENDIAN case AOCONTROL_GET_VOLUME: case AOCONTROL_SET_VOLUME: -#ifndef WORDS_BIGENDIAN -{ //seems to be a problem on macs? { ao_control_vol_t *vol = (ao_control_vol_t *)arg; @@ -181,17 +180,9 @@ snd_mixer_close(handle); return CONTROL_OK; } -}// end big-endian -#endif -#ifdef WORDS_BIGENDIAN -{ - { - return (CONTROL_UNKNOWN); - } -} #endif - } //end witch + } //end switch return(CONTROL_UNKNOWN); } @@ -393,7 +384,7 @@ default: fprintf(stderr, "%d channels are not supported\n", channels); - exit (0); + return(0); } alsa_device = devstr;