vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Thu Mar 8 21:25:57 2012 +0200| [b57a003fafe3fb9cdf355fc2a1c4a150c9674377] | committer: Rémi Denis-Courmont
Unduplicate WG4 channels order > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b57a003fafe3fb9cdf355fc2a1c4a150c9674377 --- modules/audio_filter/channel_mixer/dolby.c | 8 +------- modules/audio_filter/channel_mixer/mono.c | 9 --------- 2 files changed, 1 insertions(+), 16 deletions(-) diff --git a/modules/audio_filter/channel_mixer/dolby.c b/modules/audio_filter/channel_mixer/dolby.c index 0319f03..9904c17 100644 --- a/modules/audio_filter/channel_mixer/dolby.c +++ b/modules/audio_filter/channel_mixer/dolby.c @@ -67,12 +67,6 @@ struct filter_sys_t int i_rear_right; }; -/* our internal channel order (WG-4 order) */ -static const uint32_t pi_channels[] = -{ AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT, AOUT_CHAN_MIDDLELEFT, AOUT_CHAN_MIDDLERIGHT, - AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT, AOUT_CHAN_REARCENTER, - AOUT_CHAN_CENTER, AOUT_CHAN_LFE, 0 }; - /***************************************************************************** * Create: allocate headphone downmixer *****************************************************************************/ @@ -117,7 +111,7 @@ static int Create( vlc_object_t *p_this ) while ( pi_channels[i] ) { - if ( p_filter->fmt_out.audio.i_physical_channels & pi_channels[i] ) + if ( p_filter->fmt_out.audio.i_physical_channels & pi_vlc_chan_order_wg4[i] ) { switch ( pi_channels[i] ) { diff --git a/modules/audio_filter/channel_mixer/mono.c b/modules/audio_filter/channel_mixer/mono.c index 9610ba3..5e01479 100644 --- a/modules/audio_filter/channel_mixer/mono.c +++ b/modules/audio_filter/channel_mixer/mono.c @@ -96,15 +96,6 @@ static const char *const ppsz_pos_descriptions[] = N_("Center"), N_("Low-frequency effects"), N_("Side left"), N_("Side right"), N_("Rear center") }; -/* our internal channel order (WG-4 order) -static const uint32_t pi_vlc_chan_order_wg4[] = -{ - AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT, - AOUT_CHAN_MIDDLELEFT, AOUT_CHAN_MIDDLERIGHT, - AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT, AOUT_CHAN_REARCENTER, - AOUT_CHAN_CENTER, AOUT_CHAN_LFE, 0 -}; */ - #define MONO_CFG "sout-mono-" /***************************************************************************** * Module descriptor _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
