diff options
| -rw-r--r-- | src/audio_out/audio_alsa_out.c | 4 | ||||
| -rw-r--r-- | src/post/audio/upmix.c | 4 | ||||
| -rw-r--r-- | src/xine-engine/audio_out.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/audio_out/audio_alsa_out.c b/src/audio_out/audio_alsa_out.c index 2cd145f63..bea7b8d27 100644 --- a/src/audio_out/audio_alsa_out.c +++ b/src/audio_out/audio_alsa_out.c @@ -26,7 +26,7 @@ * (c) 2001 James Courtier-Dutton <James@superbug.demon.co.uk> * * - * $Id: audio_alsa_out.c,v 1.141 2004/05/15 23:44:25 jcdutton Exp $ + * $Id: audio_alsa_out.c,v 1.142 2004/05/23 16:20:57 mroi Exp $ */ #ifdef HAVE_CONFIG_H @@ -1480,7 +1480,7 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da xprintf(class->xine, XINE_VERBOSITY_LOG, _("24bit ")); } if (!(snd_pcm_hw_params_test_format(this->audio_fd, params, SND_PCM_FORMAT_FLOAT))) { - this->capabilities |= AO_CAP_32BITS; + this->capabilities |= AO_CAP_FLOAT32; xprintf(class->xine, XINE_VERBOSITY_LOG, _("32bit ")); } if (!(snd_pcm_hw_params_test_channels(this->audio_fd, params, 1))) { diff --git a/src/post/audio/upmix.c b/src/post/audio/upmix.c index 129e63f9e..091a39b0c 100644 --- a/src/post/audio/upmix.c +++ b/src/post/audio/upmix.c @@ -23,7 +23,7 @@ * It simply creates output channels to match the speaker arrangement. * E.g. Converts Stereo into Surround 5.1 * - * $Id: upmix.c,v 1.12 2004/05/18 03:17:02 miguelfreitas Exp $ + * $Id: upmix.c,v 1.13 2004/05/23 16:20:56 mroi Exp $ * */ @@ -190,7 +190,7 @@ static int upmix_port_open(xine_audio_port_t *port_gen, xine_stream_t *stream, this->ratio = (double)FOO_WIDTH/(double)FOO_HEIGHT; this->channels = _x_ao_mode2channels(mode); /* FIXME: Handle all desired output formats */ - if ((capabilities & AO_CAP_MODE_5_1CHANNEL) && (capabilities & AO_CAP_32BITS)) { + if ((capabilities & AO_CAP_MODE_5_1CHANNEL) && (capabilities & AO_CAP_FLOAT32)) { this->channels_out=6; mode = AO_CAP_MODE_5_1CHANNEL; bits = 32; /* Upmix to Floats */ diff --git a/src/xine-engine/audio_out.h b/src/xine-engine/audio_out.h index 25bb9955c..810b37c9f 100644 --- a/src/xine-engine/audio_out.h +++ b/src/xine-engine/audio_out.h @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: audio_out.h,v 1.68 2004/05/15 20:27:51 jcdutton Exp $ + * $Id: audio_out.h,v 1.69 2004/05/23 16:20:56 mroi Exp $ */ #ifndef HAVE_AUDIO_OUT_H #define HAVE_AUDIO_OUT_H @@ -300,7 +300,7 @@ int _x_ao_mode2channels( int mode ); #define AO_CAP_8BITS 0x00000800 /* driver support 8-bit samples */ #define AO_CAP_16BITS 0x00001000 /* driver support 16-bit samples */ #define AO_CAP_24BITS 0x00002000 /* driver support 24-bit samples */ -#define AO_CAP_32BITS 0x00004000 /* driver support 32-bit samples. i.e. Floats */ +#define AO_CAP_FLOAT32 0x00004000 /* driver support 32-bit samples. i.e. Floats */ /* properties supported by get/set_property() */ #define AO_PROP_MIXER_VOL 0 |