From b25cd7d892f2277dde2fa4d8fa9b14bfb5f6df13 Mon Sep 17 00:00:00 2001 From: Michael Giacomelli Date: Wed, 26 Oct 2011 18:37:50 +0000 Subject: Revert swap channel feature as we're presently in a feature freeze. I'll recommit after the release is branched. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30841 a1c6a512-1295-4272-9138-f99709370657 --- apps/dsp.c | 13 ------------- apps/lang/english.lang | 17 ----------------- apps/settings_list.c | 7 +++---- 3 files changed, 3 insertions(+), 34 deletions(-) (limited to 'apps') diff --git a/apps/dsp.c b/apps/dsp.c index 4bf1ab92d6..2113d251a1 100644 --- a/apps/dsp.c +++ b/apps/dsp.c @@ -1175,18 +1175,6 @@ static void channels_process_sound_chan_karaoke(int count, int32_t *buf[]) } #endif /* DSP_HAVE_ASM_SOUND_CHAN_KARAOKE */ -static void channels_process_sound_chan_swap(int count, int32_t *buf[]) -{ - int32_t *sl = buf[0], *sr = buf[1]; - - while (count-- > 0) - { - int32_t ch = *sl; - *sl++ = *sr; - *sr++ = ch; - } -} - static void dsp_set_channel_config(int value) { static const channels_process_fn_type channels_process_functions[] = @@ -1198,7 +1186,6 @@ static void dsp_set_channel_config(int value) [SOUND_CHAN_MONO_LEFT] = channels_process_sound_chan_mono_left, [SOUND_CHAN_MONO_RIGHT] = channels_process_sound_chan_mono_right, [SOUND_CHAN_KARAOKE] = channels_process_sound_chan_karaoke, - [SOUND_CHAN_SWAP] = channels_process_sound_chan_swap, }; if ((unsigned)value >= ARRAYLEN(channels_process_functions) || diff --git a/apps/lang/english.lang b/apps/lang/english.lang index d3fac86448..5a59473681 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang @@ -12903,20 +12903,3 @@ *: "Cancel Sleep Timer" - - id: LANG_CHANNEL_SWAP - desc: in sound_settings - user: core - - *: none - swcodec: "Swap channels" - - - *: none - swcodec: "Swap channels" - - - *: none - swcodec: "Swap channels" - - diff --git a/apps/settings_list.c b/apps/settings_list.c index 6602ec206a..521d565f3b 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c @@ -678,12 +678,11 @@ const struct settings_list settings[] = { CHOICE_SETTING(F_SOUNDSETTING, channel_config, LANG_CHANNEL_CONFIGURATION, 0,"channels", - "stereo,mono,custom,mono left,mono right,karaoke,swap", - sound_set_channels, 7, + "stereo,mono,custom,mono left,mono right,karaoke", + sound_set_channels, 6, ID2P(LANG_CHANNEL_STEREO), ID2P(LANG_CHANNEL_MONO), ID2P(LANG_CHANNEL_CUSTOM), ID2P(LANG_CHANNEL_LEFT), - ID2P(LANG_CHANNEL_RIGHT), ID2P(LANG_CHANNEL_KARAOKE), - ID2P(LANG_CHANNEL_SWAP)), + ID2P(LANG_CHANNEL_RIGHT), ID2P(LANG_CHANNEL_KARAOKE)), SOUND_SETTING(F_SOUNDSETTING, stereo_width, LANG_STEREO_WIDTH, "stereo_width", SOUND_STEREO_WIDTH), #ifdef AUDIOHW_HAVE_DEPTH_3D -- cgit v1.2.3