commit caea20e75fd665216804eec3feb4f666c105624e
author Jonathan Gordon <rockbox@jdgordon.info> Sun Apr 29 13:26:56 2007 +0000
committer Jonathan Gordon <rockbox@jdgordon.info> Sun Apr 29 13:26:56 2007 +0000
tree 48ddb83f1184fae655f6899325ce62c780d94bfe
parent 1e51477ffed558e650be50c14e1281e19d5c3b55

show a splash instead of a menu when the chosen encoder format has no options


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

apps/enc_config.c

diff --git a/apps/enc_config.c b/apps/enc_config.c
index 2fc9fb7..009c70c 100644
--- a/apps/enc_config.c
+++ b/apps/enc_config.c
@@ -32,6 +32,7 @@
 #include "audio.h"
 #include "pcm_record.h"
 #include "enc_config.h"
+#include "splash.h"
 
 #define MENU_ITEM_FN(fn) \
     ((bool (*)(void))fn)
@@ -44,7 +45,6 @@
 
 static bool enc_run_menu(int m, const struct menu_item items[],
                          struct encoder_config *cfg, bool global);
-static bool enc_no_config_menu(struct encoder_config *cfg, bool global);
 static void enc_rec_settings_changed(struct encoder_config *cfg);
 
 /** Function definitions for each codec - add these to enc_data
@@ -217,7 +217,7 @@
         NULL,
         NULL,
         NULL,
-        enc_no_config_menu,
+        NULL,
     },
     /* mp3_enc.codec */
     [REC_FORMAT_MPA_L3] = {
@@ -231,14 +231,14 @@
         NULL,
         NULL,
         NULL,
-        enc_no_config_menu,
+        NULL,
     },
     /* wavpack_enc.codec */
     [REC_FORMAT_WAVPACK] = {
         NULL,
         NULL,
         NULL,
-        enc_no_config_menu,
+        NULL,
     },
 };
 
@@ -286,25 +286,6 @@
     }
 } /* enc_run_menu */
 
-/* menu created when encoder has no configuration options */
-static bool enc_no_config_menu(struct encoder_config *cfg, bool global)
-{
-    static const struct menu_item items[] =
-    {
-        { ID2P(LANG_NO_SETTINGS), NULL }
-    };
-    int m;
-    bool result;
-
-    m = menu_init(items, ARRAYLEN(items), NULL, NULL, NULL, NULL);
-    result = enc_run_menu(m, items, NULL, false);
-    menu_exit(m);
-
-    return result;
-    (void)cfg;
-    (void)global;
-} /* enc_no_config_menu */
-
 /* update settings dependent upon encoder settings */
 static void enc_rec_settings_changed(struct encoder_config *cfg)
 {
@@ -446,5 +427,13 @@
 
     cfg.rec_format = global_settings.rec_format;
 
-    return enc_data[cfg.rec_format].menu(&cfg, true);
+    if (enc_data[cfg.rec_format].menu)
+    {
+        return enc_data[cfg.rec_format].menu(&cfg, true);
+    }
+    else
+    {
+        gui_syncsplash(HZ, str(LANG_NO_SETTINGS));
+        return false;
+    }
 } /* enc_global_config_menu */