mpegplayer: Use the core DSP to process audio. Removes the sample rate restriction on audio and any mpeg audio samplerate may be used. Use the global sound settings for audio output with the option to force any one of the processing stages off. All are forced off by default. I didn't personally care to fully duplicate the Sound Settings menu which would have been needed since using the core one would affect settings globally and exactly the same configuration probably isn't desired since the CPU load for video playback is much greater. Rebalance the threading to compensate with some expense to buffering speed.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16194 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 17 insertions, 1 deletions

diff --git a/apps/plugins/mpegplayer/mpeg_settings.h b/apps/plugins/mpegplayer/mpeg_settings.h
index 4d6da478ea..1557ff433e 100644
--- a/apps/plugins/mpegplayer/mpeg_settings.h
+++ b/apps/plugins/mpegplayer/mpeg_settings.h
@@ -1,7 +1,7 @@
 
 #include "plugin.h"
 
-#define SETTINGS_VERSION 3
+#define SETTINGS_VERSION 4
 #define SETTINGS_MIN_VERSION 1
 #define SETTINGS_FILENAME "mpegplayer.cfg"
 
@@ -24,6 +24,15 @@ enum mpeg_option_id
     MPEG_OPTION_SKIP_FRAMES,
 };
 
+enum mpeg_audio_option_id
+{
+    MPEG_AUDIO_TONE_CONTROLS,
+    MPEG_AUDIO_CHANNEL_MODES,
+    MPEG_AUDIO_CROSSFEED,
+    MPEG_AUDIO_EQUALIZER,
+    MPEG_AUDIO_DITHERING,
+};
+
 enum mpeg_resume_id
 {
     MPEG_RESUME_MENU_ALWAYS = 0,
@@ -46,6 +55,7 @@ enum mpeg_start_id
 enum mpeg_menu_id
 {
     MPEG_MENU_DISPLAY_SETTINGS,
+    MPEG_MENU_AUDIO_SETTINGS,
     MPEG_MENU_ENABLE_START_MENU,
     MPEG_MENU_CLEAR_RESUMES,
     MPEG_MENU_QUIT,
@@ -62,6 +72,12 @@ struct mpeg_settings {
 #if MPEG_OPTION_DITHERING_ENABLED
     int displayoptions;
 #endif
+    /* Audio options - simple on/off specification */
+    int tone_controls;
+    int channel_modes;
+    int crossfeed;
+    int equalizer;
+    int dithering;
 };
 
 extern struct mpeg_settings settings;