From 03f31b80e9232eb3a3e6e3cb17e46ddab3d5935b Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Wed, 6 Jun 2012 14:28:18 +0400
Subject: [PATCH] mymenu.h: move non-common options to corresponding files

---
 src/gui/hdd_menu.cpp   | 27 +++++++++++++++++
 src/gui/scan_setup.cpp | 15 +++++++++-
 src/mymenu.h           | 68 ------------------------------------------
 3 files changed, 41 insertions(+), 69 deletions(-)

diff --git a/src/gui/hdd_menu.cpp b/src/gui/hdd_menu.cpp
index ca99576de..b88bcda6a 100644
--- a/src/gui/hdd_menu.cpp
+++ b/src/gui/hdd_menu.cpp
@@ -63,6 +63,33 @@
 #include <mymenu.h>
 #include <driver/screen_max.h>
 
+#define HDD_NOISE_OPTION_COUNT 4
+const CMenuOptionChooser::keyval HDD_NOISE_OPTIONS[HDD_NOISE_OPTION_COUNT] =
+{
+	{ 0,   LOCALE_OPTIONS_OFF },
+	{ 128, LOCALE_HDD_SLOW },
+	{ 190, LOCALE_HDD_MIDDLE },
+	{ 254, LOCALE_HDD_FAST }
+};
+
+#define HDD_FILESYS_OPTION_COUNT 3
+const CMenuOptionChooser::keyval HDD_FILESYS_OPTIONS[HDD_FILESYS_OPTION_COUNT] =
+{
+	{ 0, LOCALE_HDD_EXT3 },
+	{ 1, LOCALE_HDD_REISER },
+	{ 2, LOCALE_OPTIONS_OFF }
+};
+#define HDD_SLEEP_OPTION_COUNT 7
+const CMenuOptionChooser::keyval HDD_SLEEP_OPTIONS[HDD_SLEEP_OPTION_COUNT] =
+{
+	{ 0,   LOCALE_OPTIONS_OFF },
+	{ 12,  LOCALE_HDD_1MIN },
+	{ 60,  LOCALE_HDD_5MIN },
+	{ 120, LOCALE_HDD_10MIN },
+	{ 240, LOCALE_HDD_20MIN },
+	{ 241, LOCALE_HDD_30MIN },
+	{ 242, LOCALE_HDD_60MIN }
+};
 
 static int my_filter(const struct dirent * dent)
 {
diff --git a/src/gui/scan_setup.cpp b/src/gui/scan_setup.cpp
index d3ee08afb..7b7df4e27 100644
--- a/src/gui/scan_setup.cpp
+++ b/src/gui/scan_setup.cpp
@@ -38,7 +38,6 @@
 #include <mymenu.h>
 #include <neutrino_menue.h>
 
-
 #include "gui/scan.h"
 #include "gui/scan_setup.h"
 #include "gui/motorcontrol.h"
@@ -155,6 +154,20 @@ const CMenuOptionChooser::keyval SATSETUP_SCANTP_POL[SATSETUP_SCANTP_POL_COUNT]
 	{ 3, LOCALE_EXTRA_TP_POL_R }
 };
 
+#define OPTIONS_SOUTH0_NORTH1_OPTION_COUNT 2
+const CMenuOptionChooser::keyval OPTIONS_SOUTH0_NORTH1_OPTIONS[OPTIONS_SOUTH0_NORTH1_OPTION_COUNT] =
+{
+	{ 0, LOCALE_EXTRA_SOUTH },
+	{ 1, LOCALE_EXTRA_NORTH }
+};
+
+#define OPTIONS_EAST0_WEST1_OPTION_COUNT 2
+const CMenuOptionChooser::keyval OPTIONS_EAST0_WEST1_OPTIONS[OPTIONS_EAST0_WEST1_OPTION_COUNT] =
+{
+	{ 0, LOCALE_EXTRA_EAST },
+	{ 1, LOCALE_EXTRA_WEST }
+};
+
 #if 0
 /*Cable*/
 #define CABLESETUP_SCANTP_MOD_COUNT 7
diff --git a/src/mymenu.h b/src/mymenu.h
index 70063db9d..40aa3db36 100644
--- a/src/mymenu.h
+++ b/src/mymenu.h
@@ -11,75 +11,7 @@ const CMenuOptionChooser::keyval OPTIONS_OFF1_ON0_OPTIONS[OPTIONS_OFF1_ON0_OPTIO
 	{ 1, LOCALE_OPTIONS_OFF },
 	{ 0, LOCALE_OPTIONS_ON  }
 };
-#if 0
-#define SCANMODE_OPTION_COUNT 3
-const CMenuOptionChooser::keyval SCANMODE_OPTIONS[SCANMODE_OPTION_COUNT] =
-{
-	{ 0, LOCALE_EXTRA_SCAN_FULL },
-	{ 1, LOCALE_EXTRA_SCAN_FAST },
-	{ 2, LOCALE_EXTRA_TPSCAN }
-};
-#endif
 
-#define HDD_NOISE_OPTION_COUNT 4
-const CMenuOptionChooser::keyval HDD_NOISE_OPTIONS[HDD_NOISE_OPTION_COUNT] =
-{
-	{ 0,   LOCALE_OPTIONS_OFF },
-	{ 128, LOCALE_HDD_SLOW },
-	{ 190, LOCALE_HDD_MIDDLE },
-	{ 254, LOCALE_HDD_FAST }
-};
-#define HDD_FILESYS_OPTION_COUNT 3
-const CMenuOptionChooser::keyval HDD_FILESYS_OPTIONS[HDD_FILESYS_OPTION_COUNT] =
-{
-	{ 0, LOCALE_HDD_EXT3 },
-	{ 1, LOCALE_HDD_REISER },
-	{ 2, LOCALE_OPTIONS_OFF }
-};
-#define HDD_SLEEP_OPTION_COUNT 7
-const CMenuOptionChooser::keyval HDD_SLEEP_OPTIONS[HDD_SLEEP_OPTION_COUNT] =
-{
-	{ 0,   LOCALE_OPTIONS_OFF },
-	{ 12,  LOCALE_HDD_1MIN },
-	{ 60,  LOCALE_HDD_5MIN },
-	{ 120, LOCALE_HDD_10MIN },
-	{ 240, LOCALE_HDD_20MIN },
-	{ 241, LOCALE_HDD_30MIN },
-	{ 242, LOCALE_HDD_60MIN }
-};
-#if 0
-#define LOGO_OPTION_COUNT 3
-const CMenuOptionChooser::keyval LOGO_OPTIONS[LOGO_OPTION_COUNT] =
-{
-	{ 1, LOCALE_EXTRA_LOGO1 },
-	{ 2, LOCALE_EXTRA_LOGO2 },
-	{ 3, LOCALE_EXTRA_LOGO3 }
-};
-#endif
-
-#if 0
-#define RF_CARRIER_OPTION_COUNT 4
-const CMenuOptionChooser::keyval RF_CARRIER_OPTIONS[RF_CARRIER_OPTION_COUNT] =
-{
-	{ 0, LOCALE_RFMOD_CARRIER4500 },
-	{ 1, LOCALE_RFMOD_CARRIER5500 },
-	{ 2, LOCALE_RFMOD_CARRIER6000 },
-	{ 3, LOCALE_RFMOD_CARRIER6500 }
-};
-#endif
-
-#define OPTIONS_SOUTH0_NORTH1_OPTION_COUNT 2
-const CMenuOptionChooser::keyval OPTIONS_SOUTH0_NORTH1_OPTIONS[OPTIONS_SOUTH0_NORTH1_OPTION_COUNT] =
-{
-	{ 0, LOCALE_EXTRA_SOUTH },
-	{ 1, LOCALE_EXTRA_NORTH }
-};
-#define OPTIONS_EAST0_WEST1_OPTION_COUNT 2
-const CMenuOptionChooser::keyval OPTIONS_EAST0_WEST1_OPTIONS[OPTIONS_EAST0_WEST1_OPTION_COUNT] =
-{
-	{ 0, LOCALE_EXTRA_EAST },
-	{ 1, LOCALE_EXTRA_WEST }
-};
 #define MESSAGEBOX_NO_YES_OPTION_COUNT 2
 const CMenuOptionChooser::keyval MESSAGEBOX_NO_YES_OPTIONS[MESSAGEBOX_NO_YES_OPTION_COUNT] =
 {