mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-27 23:42:51 +02:00
clean up: moved on/off defines to mymenu.h, removed redefinition in cam_menue.cpp
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@859 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Branch: ni/coolstream
Commit: bf0498b25a
Author: Thilo Graf <dbt@novatux.de>
Date: 2010-10-24 (Sun, 24 Oct 2010)
------------------
This commit was generated by Migit
This commit is contained in:
@@ -96,13 +96,6 @@ printf("CCAMMenuHandler::exec: actionkey %s\n", actionkey.c_str());
|
||||
return doMainMenu ();
|
||||
}
|
||||
|
||||
#define OPTIONS_OFF0_ON1_OPTION_COUNT 2
|
||||
const CMenuOptionChooser::keyval OPTIONS_OFF0_ON1_OPTIONS[OPTIONS_OFF0_ON1_OPTION_COUNT] =
|
||||
{
|
||||
{ 0, LOCALE_OPTIONS_OFF },
|
||||
{ 1, LOCALE_OPTIONS_ON }
|
||||
};
|
||||
|
||||
int CCAMMenuHandler::doMainMenu ()
|
||||
{
|
||||
int ret;
|
||||
|
14
src/mymenu.h
14
src/mymenu.h
@@ -1,3 +1,17 @@
|
||||
#define OPTIONS_OFF0_ON1_OPTION_COUNT 2
|
||||
const CMenuOptionChooser::keyval OPTIONS_OFF0_ON1_OPTIONS[OPTIONS_OFF0_ON1_OPTION_COUNT] =
|
||||
{
|
||||
{ 0, LOCALE_OPTIONS_OFF },
|
||||
{ 1, LOCALE_OPTIONS_ON }
|
||||
};
|
||||
|
||||
#define OPTIONS_OFF1_ON0_OPTION_COUNT 2
|
||||
const CMenuOptionChooser::keyval OPTIONS_OFF1_ON0_OPTIONS[OPTIONS_OFF1_ON0_OPTION_COUNT] =
|
||||
{
|
||||
{ 1, LOCALE_OPTIONS_OFF },
|
||||
{ 0, LOCALE_OPTIONS_ON }
|
||||
};
|
||||
|
||||
#define SCANMODE_OPTION_COUNT 3
|
||||
const CMenuOptionChooser::keyval SCANMODE_OPTIONS[SCANMODE_OPTION_COUNT] =
|
||||
{
|
||||
|
@@ -165,20 +165,6 @@ static CTimingSettingsNotifier timingsettingsnotifier;
|
||||
|
||||
int safe_mkdir(char * path);
|
||||
|
||||
#define OPTIONS_OFF0_ON1_OPTION_COUNT 2
|
||||
const CMenuOptionChooser::keyval OPTIONS_OFF0_ON1_OPTIONS[OPTIONS_OFF0_ON1_OPTION_COUNT] =
|
||||
{
|
||||
{ 0, LOCALE_OPTIONS_OFF },
|
||||
{ 1, LOCALE_OPTIONS_ON }
|
||||
};
|
||||
|
||||
#define OPTIONS_OFF1_ON0_OPTION_COUNT 2
|
||||
const CMenuOptionChooser::keyval OPTIONS_OFF1_ON0_OPTIONS[OPTIONS_OFF1_ON0_OPTION_COUNT] =
|
||||
{
|
||||
{ 1, LOCALE_OPTIONS_OFF },
|
||||
{ 0, LOCALE_OPTIONS_ON }
|
||||
};
|
||||
|
||||
#define VIDEOMENU_VIDEOSIGNAL_HD1_OPTION_COUNT 8
|
||||
const CMenuOptionChooser::keyval VIDEOMENU_VIDEOSIGNAL_HD1_OPTIONS[VIDEOMENU_VIDEOSIGNAL_HD1_OPTION_COUNT] =
|
||||
{
|
||||
|
Reference in New Issue
Block a user