FS#7971 - mpegplayer - start menu loads quicker - menu clean up - code clean up

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

1 files changed, 27 insertions, 3 deletions

diff --git a/apps/plugins/mpegplayer/mpeg_settings.h b/apps/plugins/mpegplayer/mpeg_settings.h
index 690667f632..340deb46fe 100644
--- a/apps/plugins/mpegplayer/mpeg_settings.h
+++ b/apps/plugins/mpegplayer/mpeg_settings.h
@@ -1,6 +1,31 @@
 
 #include "plugin.h"
 
+enum mpeg_option_id
+{
+#if defined(TOSHIBA_GIGABEAT_F) || defined(SANSA_E200)
+    MPEG_OPTION_DITHERING,
+#endif
+    MPEG_OPTION_DISPLAY_FPS,
+    MPEG_OPTION_LIMIT_FPS,
+    MPEG_OPTION_SKIP_FRAMES,
+};
+
+enum mpeg_start_id
+{
+    MPEG_START_RESTART,
+    MPEG_START_RESUME,
+    MPEG_START_SEEK,
+    MPEG_START_QUIT,
+};
+
+enum mpeg_menu_id
+{
+    MPEG_MENU_DISPLAY_SETTINGS,
+    MPEG_MENU_CLEAR_RESUMES,
+    MPEG_MENU_QUIT,
+};
+
 struct mpeg_settings {
     int showfps;               /* flag to display fps */
     int limitfps;              /* flag to limit fps */
@@ -8,7 +33,6 @@ struct mpeg_settings {
     int resume_count;          /* total # of resumes in config file */
     int resume_time;           /* resume time for current mpeg (in half minutes) */
     char resume_filename[128]; /* filename of current mpeg */
-
 #if defined(TOSHIBA_GIGABEAT_F) || defined(SANSA_E200)
     int displayoptions;
 #endif
@@ -17,8 +41,8 @@ struct mpeg_settings {
 extern struct mpeg_settings settings;
 
 int get_start_time(int play_time, int in_file);
-int mpeg_start_menu(int play_time, int in_file);
-bool mpeg_menu(void);
+enum mpeg_start_id mpeg_start_menu(int play_time, int in_file);
+enum mpeg_menu_id mpeg_menu(void);
 void init_settings(const char* filename);
 void save_settings(void);
 void clear_resume_count(void);