Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move iPod Video hardware equalizer init to audio_init() after the hardware is enabled. Should fix the issue where the hardware equalizer settings would not be reapplied after a restart.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13106 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dan Everton 2007-04-11 09:13:13 +00:00
parent b368f4158a
commit fc47f14242
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/playback.c
View file

@ -82,6 +82,10 @@
#include "talk.h" #include "talk.h"
#endif #endif
#ifdef HAVE_WM8758
#include "menus/eq_menu.h"
#endif
#define PLAYBACK_VOICE #define PLAYBACK_VOICE
@ -3842,5 +3846,8 @@ void audio_init(void)
audio_is_initialized = true; audio_is_initialized = true;
sound_settings_apply(); sound_settings_apply();
#ifdef HAVE_WM8758
eq_hw_enable(global_settings.eq_hw_enabled);
#endif
audio_set_buffer_margin(global_settings.buffer_margin); audio_set_buffer_margin(global_settings.buffer_margin);
} /* audio_init */ } /* audio_init */

10
apps/settings.c
View file

@ -88,10 +88,6 @@ const char rec_base_directory[] = REC_BASE_DIR;
#endif #endif
#endif /* CONFIG_CODEC == SWCODEC */ #endif /* CONFIG_CODEC == SWCODEC */
#ifdef HAVE_WM8758
#include "menus/eq_menu.h"
#endif
#define NVRAM_BLOCK_SIZE 44 #define NVRAM_BLOCK_SIZE 44
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
@ -827,9 +823,9 @@ void settings_apply(void)
global_settings.crossfeed_hf_attenuation, global_settings.crossfeed_hf_attenuation,
global_settings.crossfeed_hf_cutoff); global_settings.crossfeed_hf_cutoff);
/* Configure software equalizer, hardware eq is handled in audio_init() */
dsp_set_eq(global_settings.eq_enabled); dsp_set_eq(global_settings.eq_enabled);
dsp_set_eq_precut(global_settings.eq_precut); dsp_set_eq_precut(global_settings.eq_precut);
/* Update all EQ bands */
for(i = 0; i < 5; i++) { for(i = 0; i < 5; i++) {
dsp_set_eq_coefs(i); dsp_set_eq_coefs(i);
} }
@ -837,10 +833,6 @@ void settings_apply(void)
dsp_dither_enable(global_settings.dithering_enabled); dsp_dither_enable(global_settings.dithering_enabled);
#endif #endif
#ifdef HAVE_WM8758
eq_hw_enable(global_settings.eq_hw_enabled);
#endif
#ifdef HAVE_SPDIF_POWER #ifdef HAVE_SPDIF_POWER
spdif_power_enable(global_settings.spdif_enable); spdif_power_enable(global_settings.spdif_enable);
#endif #endif