Remove some left-overs from removed settings

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

3 files changed, 8 insertions, 16 deletions

diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index 40d0737ce1..cb8537742b 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -1467,16 +1467,16 @@
 </phrase>
 <phrase>
   id: LANG_RESUME
-  desc: in settings_menu
+  desc: DEPRECATED
   user:
   <source>
-    *: "Resume on Startup"
+    *: ""
   </source>
   <dest>
-    *: "Resume on Startup"
+    *: deprecated
   </dest>
   <voice>
-    *: "Resume on Startup"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -2772,16 +2772,16 @@
 </phrase>
 <phrase>
   id: LANG_RECORD_STARTUP
-  desc: Start Rockbox in Recording Screen
+  desc: DEPRECATED
   user:
   <source>
-    *: "Show Recording Screen on Startup"
+    *: ""
   </source>
   <dest>
-    *: "Show Recording Screen on Startup"
+    *: deprecated
   </dest>
   <voice>
-    *: "Show Recording Screen on Startup"
+    *: ""
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/settings.h b/apps/settings.h
index b83b120a37..6e2db093d9 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -342,7 +342,6 @@ struct user_settings
 
     int rec_prerecord_time; /* In seconds, 0-30, 0 means OFF */
     int rec_directory; /* 0=base dir, 1=current dir */
-    bool rec_startup; /* true means start Rockbox in recording screen */
     int cliplight; /* 0 = off
                       1 = main lcd
                       2 = main and remote lcd
@@ -401,10 +400,6 @@ struct user_settings
     bool spdif_enable; /* S/PDIF power on/off */
 #endif
 
-    /* resume settings */
-
-    bool resume;        /* resume option: 0=off, 1=on */
-
 #if CONFIG_TUNER
     unsigned char fmr_file[MAX_FILENAME+1]; /* last fmr preset */
 #endif
diff --git a/apps/settings_list.c b/apps/settings_list.c
index 07779011f3..81ac664806 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -374,7 +374,6 @@ const struct settings_list settings[] = {
     SOUND_SETTING(0,stereo_width, LANG_STEREO_WIDTH,
             "stereo_width", SOUND_STEREO_WIDTH),
     /* playback */
-    OFFON_SETTING(0, resume, LANG_RESUME, false, "resume", NULL),
     OFFON_SETTING(0, playlist_shuffle, LANG_SHUFFLE, false, "shuffle", NULL),
     SYSTEM_SETTING(NVRAM(4),resume_index,-1),
     SYSTEM_SETTING(NVRAM(4),resume_first_index,0),
@@ -716,8 +715,6 @@ const struct settings_list settings[] = {
 
 #ifdef HAVE_RECORDING
     /* recording */
-    OFFON_SETTING(0,rec_startup,LANG_RECORD_STARTUP,false,
-        "rec screen on startup",NULL),
     {F_T_INT,&global_settings.rec_timesplit, LANG_SPLIT_TIME, INT(0),"rec timesplit",
         "off,00:05,00:10,00:15,00:30,01:00,01:14,01:20,02:00,"
         "04:00,06:00,08:00,10:00,12:00,18:00,24:00",UNUSED},