mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 15:32:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

*neutrino: cleanup unused members and includes

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1182 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
thilo
2011-02-21 09:08:32 +00:00
parent 26a64e57c4
commit 026a27a521
37 changed files with 28 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/audio_setup.cpp
View File

@@ -50,17 +50,10 @@ extern CAudioSetupNotifier * audioSetupNotifier;
CAudioSetup::CAudioSetup(bool wizard_mode)
{
frameBuffer = CFrameBuffer::getInstance();
is_wizard = wizard_mode;
width = w_max (40, 10);
hheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight();
mheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight();
height = hheight+13*mheight+ 10;
selected = -1;
x = getScreenStartX (width);
y = getScreenStartY (height);
}
CAudioSetup::~CAudioSetup()
@@ -83,11 +76,6 @@ int CAudioSetup::exec(CMenuTarget* parent, const std::string &/*actionKey*/)
return res;
}
void CAudioSetup::hide()
{
frameBuffer->paintBackgroundBoxRel(x,y, width,height);
}
#define AUDIOMENU_ANALOGOUT_OPTION_COUNT 3
const CMenuOptionChooser::keyval AUDIOMENU_ANALOGOUT_OPTIONS[AUDIOMENU_ANALOGOUT_OPTION_COUNT] =

12
src/gui/audio_setup.h
View File

@@ -33,22 +33,16 @@
#include <gui/widget/menue.h>
#include <driver/framebuffer.h>
#include <string>
class CAudioSetup : public CMenuTarget
{
private:
CFrameBuffer *frameBuffer;
int x, y, width, height, hheight, mheight, selected;
void hide();
void showAudioSetup();
int width, selected;
bool is_wizard;
void showAudioSetup();
public:
enum AUDIO_SETUP_MODE
{

2
src/gui/audioplayer_setup.cpp
View File

@@ -54,8 +54,6 @@
CAudioPlayerSetup::CAudioPlayerSetup()
{
frameBuffer = CFrameBuffer::getInstance();
width = w_max (40, 10);
selected = -1;
}

4
src/gui/audioplayer_setup.h
View File

@@ -33,16 +33,12 @@
#include <gui/widget/menue.h>
#include <driver/framebuffer.h>
#include <string>
class CAudioPlayerSetup : public CMenuTarget
{
private:
CFrameBuffer *frameBuffer;
int width, selected;
void showAudioPlayerSetup();

1
src/gui/cam_menu.h
View File

@@ -25,6 +25,7 @@
#include "widget/menue.h"
#include "widget/hintbox.h"
#include <mmi.h>
#include <ca_cs.h>

12
src/gui/cec_setup.cpp
View File

@@ -50,15 +50,8 @@ extern cVideo *videoDecoder;
CCECSetup::CCECSetup()
{
frameBuffer = CFrameBuffer::getInstance();
width = w_max (40, 10); //%
hheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight();
mheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight();
height = hheight+13*mheight+ 10;
selected = -1;
x = getScreenStartX (width);
y = getScreenStartY (height);
}
CCECSetup::~CCECSetup()
@@ -79,11 +72,6 @@ int CCECSetup::exec(CMenuTarget* parent, const std::string &/*actionKey*/)
return res;
}
void CCECSetup::hide()
{
frameBuffer->paintBackgroundBoxRel(x,y, width, height);
}
#define VIDEOMENU_HDMI_CEC_MODE_OPTION_COUNT 3
const CMenuOptionChooser::keyval VIDEOMENU_HDMI_CEC_MODE_OPTIONS[VIDEOMENU_HDMI_CEC_MODE_OPTION_COUNT] =

4
src/gui/cec_setup.h
View File

@@ -38,12 +38,10 @@
class CCECSetup : public CMenuTarget, CChangeObserver
{
private:
CFrameBuffer *frameBuffer;
CMenuOptionChooser *cec1, *cec2;
int x, y, width, height, hheight, mheight, selected;
int width, selected;
void hide();
void showMenu();

11
src/gui/keybind_setup.cpp
View File

@@ -53,18 +53,11 @@
CKeybindSetup::CKeybindSetup()
{
frameBuffer = CFrameBuffer::getInstance();
keySetupNotifier = new CKeySetupNotifier;
keySetupNotifier->changeNotify(NONEXISTANT_LOCALE, NULL);
width = w_max (40, 10);
hheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight();
mheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight();
height = hheight+13*mheight+ 10;
selected = -1;
x = getScreenStartX (width);
y = getScreenStartY (height);
}
CKeybindSetup::~CKeybindSetup()
@@ -113,10 +106,6 @@ int CKeybindSetup::exec(CMenuTarget* parent, const std::string &actionKey)
return res;
}
void CKeybindSetup::hide()
{
frameBuffer->paintBackgroundBoxRel(x,y, width,height);
}
#define KEYBINDINGMENU_BOUQUETHANDLING_OPTION_COUNT 3
const CMenuOptionChooser::keyval KEYBINDINGMENU_BOUQUETHANDLING_OPTIONS[KEYBINDINGMENU_BOUQUETHANDLING_OPTION_COUNT] =

5
src/gui/keybind_setup.h
View File

@@ -35,8 +35,6 @@
#include <gui/widget/icons.h>
#include <gui/widget/keychooser.h>
#include <driver/framebuffer.h>
#include <system/setting_helpers.h>
#include <string>
@@ -85,9 +83,8 @@ class CKeybindSetup : public CMenuTarget
CKeySetupNotifier *keySetupNotifier;
CKeyChooser * keychooser[KEYBINDS_COUNT];
int x, y, width, height, hheight, mheight, selected;
int width, selected;
void hide();
void showKeySetup();
void showKeyBindSetup(CMenuWidget *bindSettings);
void showKeyBindModeSetup(CMenuWidget *bindSettings_modes);

13
src/gui/mediaplayer.cpp
View File

@@ -50,20 +50,12 @@
CMediaPlayerMenu::CMediaPlayerMenu()
{
frameBuffer = CFrameBuffer::getInstance();
setMenuTitel();
setUsageMode();
width = w_max (40, 10); //%
hheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight();
mheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight();
height = hheight+13*mheight+ 10;
selected = -1;
x = getScreenStartX (width);
y = getScreenStartY (height);
audioPlayer = NULL;
inetPlayer = NULL;
}
@@ -115,11 +107,6 @@ int CMediaPlayerMenu::exec(CMenuTarget* parent, const std::string &actionKey)
return res;
}
void CMediaPlayerMenu::hide()
{
frameBuffer->paintBackgroundBoxRel(x,y, width, height);
}
//show selectable mediaplayer items
void CMediaPlayerMenu::showMenu()
{

5
src/gui/mediaplayer.h
View File

@@ -31,21 +31,18 @@
#include <gui/widget/menue.h>
#include "gui/audioplayer.h"
#include <driver/framebuffer.h>
#include <string>
class CMediaPlayerMenu : public CMenuTarget
{
private:
CFrameBuffer *frameBuffer;
CAudioPlayerGui *audioPlayer;
CAudioPlayerGui *inetPlayer;
int x, y, width, height, hheight, mheight, selected, usage_mode;
int width, selected, usage_mode;
neutrino_locale_t menu_title;
void hide();
void showMenu();
void showMoviePlayer(CMenuWidget *menu_movieplayer);

2
src/gui/mediaplayer_setup.cpp
View File

@@ -56,8 +56,6 @@
CMediaPlayerSetup::CMediaPlayerSetup()
{
frameBuffer = CFrameBuffer::getInstance();
width = w_max (40, 10);
selected = -1;
}

5
src/gui/mediaplayer_setup.h
View File

@@ -35,16 +35,11 @@
#include <gui/widget/menue.h>
#include <driver/framebuffer.h>
#include <string>
class CMediaPlayerSetup : public CMenuTarget
{
private:
CFrameBuffer *frameBuffer;
int width, selected;
void showMediaPlayerSetup();

11
src/gui/network_setup.cpp
View File

@@ -53,18 +53,12 @@
CNetworkSetup::CNetworkSetup(bool wizard_mode)
{
frameBuffer = CFrameBuffer::getInstance();
networkConfig = CNetworkConfig::getInstance();
is_wizard = wizard_mode;
width = w_max (40, 10);
hheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight();
mheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight();
height = hheight+13*mheight+ 10;
selected = -1;
x = getScreenStartX (width);
y = getScreenStartY (height);
readNetworkSettings();
}
@@ -128,11 +122,6 @@ int CNetworkSetup::exec(CMenuTarget* parent, const std::string &actionKey)
return res;
}
void CNetworkSetup::hide()
{
frameBuffer->paintBackgroundBoxRel(x,y, width, height);
}
void CNetworkSetup::readNetworkSettings()
{

6
src/gui/network_setup.h
View File

@@ -34,8 +34,6 @@
#include <gui/widget/menue.h>
#include <gui/widget/messagebox.h>
#include <driver/framebuffer.h>
#include <system/setting_helpers.h>
#include <system/configure_network.h>
@@ -45,10 +43,9 @@
class CNetworkSetup : public CMenuTarget, CChangeObserver
{
private:
CFrameBuffer *frameBuffer;
CNetworkConfig *networkConfig;
int x, y, width, height, hheight, mheight, selected;
int width, selected;
bool is_wizard;
@@ -70,7 +67,6 @@ class CNetworkSetup : public CMenuTarget, CChangeObserver
std::string old_network_gateway;
std::string old_network_hostname;
void hide();
void restoreNetworkSettings();
void prepareSettings();
void readNetworkSettings();

13
src/gui/osd_setup.cpp
View File

@@ -61,8 +61,6 @@ extern std::string ttx_font_file;
COsdSetup::COsdSetup(bool wizard_mode)
{
frameBuffer = CFrameBuffer::getInstance();
colorSetupNotifier = new CColorSetupNotifier();
colorSetupNotifier->changeNotify(NONEXISTANT_LOCALE, NULL);
@@ -71,12 +69,6 @@ COsdSetup::COsdSetup(bool wizard_mode)
is_wizard = wizard_mode;
width = w_max (40, 10); //%
hheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight();
mheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight();
height = hheight+13*mheight+ 10;
x = getScreenStartX (width);
y = getScreenStartY (height);
}
COsdSetup::~COsdSetup()
@@ -85,11 +77,6 @@ COsdSetup::~COsdSetup()
delete fontsizenotifier;
}
void COsdSetup::hide()
{
frameBuffer->paintBackgroundBoxRel(x,y, width,height);
}
int COsdSetup::exec(CMenuTarget* parent, const std::string &actionKey)
{

5
src/gui/osd_setup.h
View File

@@ -43,16 +43,13 @@
class COsdSetup : public CMenuTarget
{
private:
CFrameBuffer *frameBuffer;
CColorSetupNotifier *colorSetupNotifier;
CFontSizeNotifier *fontsizenotifier;
int x, y, width, height, hheight, mheight, selected;
int width, selected;
bool is_wizard;
void hide();
void showOsdSetup();
void showOsdMenueColorSetup(CMenuWidget *menu_colors);
void showOsdFontSizeSetup(CMenuWidget *menu_fonts);

13
src/gui/osdlang_setup.cpp
View File

@@ -54,17 +54,10 @@
COsdLangSetup::COsdLangSetup(bool wizard_mode)
{
frameBuffer = CFrameBuffer::getInstance();
is_wizard = wizard_mode;
width = w_max (45, 10);
hheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight();
mheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight();
height = hheight+13*mheight+ 10;
selected = -1;
x = getScreenStartX (width);
y = getScreenStartY (height);
}
COsdLangSetup::~COsdLangSetup()
@@ -72,12 +65,6 @@ COsdLangSetup::~COsdLangSetup()
}
void COsdLangSetup::hide()
{
frameBuffer->paintBackgroundBoxRel(x,y, width,height);
}
int COsdLangSetup::exec(CMenuTarget* parent, const std::string &/*actionKey*/)
{
dprintf(DEBUG_DEBUG, "init international setup\n");

8
src/gui/osdlang_setup.h
View File

@@ -36,8 +36,6 @@
#include <gui/widget/menue.h>
#include <driver/framebuffer.h>
#include <system/setting_helpers.h>
#include <string>
@@ -53,14 +51,10 @@ class CLangSelectNotifier : public CChangeObserver
class COsdLangSetup : public CMenuTarget, CChangeObserver
{
private:
CFrameBuffer *frameBuffer;
int x, y, width, height, menue_width, hheight, mheight, selected;
int width, selected;
bool is_wizard;
void hide();
void showLocalSetup();
void showLanguageSetup(CMenuWidget *osdl_setup);
void showPrefMenu(CMenuWidget *prefMenu, CLangSelectNotifier *langNotifier);

12
src/gui/parentallock_setup.cpp
View File

@@ -49,15 +49,8 @@
CParentalSetup::CParentalSetup()
{
frameBuffer = CFrameBuffer::getInstance();
width = w_max (40, 10); //%
hheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight();
mheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight();
height = hheight+13*mheight+ 10;
selected = -1;
x = getScreenStartX (width);
y = getScreenStartY (height);
}
CParentalSetup::~CParentalSetup()
@@ -80,11 +73,6 @@ int CParentalSetup::exec(CMenuTarget* parent, const std::string &/*actionKey*/)
return res;
}
void CParentalSetup::hide()
{
frameBuffer->paintBackgroundBoxRel(x,y, width, height);
}
#if 1
#define PARENTALLOCK_PROMPT_OPTION_COUNT 3

8
src/gui/parentallock_setup.h
View File

@@ -33,21 +33,15 @@
#include <gui/widget/menue.h>
#include <driver/framebuffer.h>
#include <string>
class CParentalSetup : public CMenuTarget
{
private:
CFrameBuffer *frameBuffer;
int width, selected;
int x, y, width, height, hheight, mheight, selected;
void hide();
void showParentalSetup();
public:
CParentalSetup();
~CParentalSetup();

2
src/gui/pictureviewer_setup.cpp
View File

@@ -53,8 +53,6 @@
CPictureViewerSetup::CPictureViewerSetup()
{
frameBuffer = CFrameBuffer::getInstance();
width = w_max (40, 10);
selected = -1;
}

2
src/gui/pictureviewer_setup.h
View File

@@ -41,8 +41,6 @@
class CPictureViewerSetup : public CMenuTarget
{
private:
CFrameBuffer *frameBuffer;
int width, selected;
void showPictureViewerSetup();

13
src/gui/proxyserver_setup.cpp
View File

@@ -46,18 +46,10 @@
CProxySetup::CProxySetup(const neutrino_locale_t title, const char * const IconName )
{
frameBuffer = CFrameBuffer::getInstance();
menue_title = title;
menue_icon = IconName;
width = w_max (40, 10);
hheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight();
mheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight();
height = hheight+13*mheight+ 10;
x = getScreenStartX (width);
y = getScreenStartY (height);
}
CProxySetup::~CProxySetup()
@@ -80,11 +72,6 @@ int CProxySetup::exec(CMenuTarget* parent, const std::string &/*actionKey*/)
return res;
}
void CProxySetup::hide()
{
frameBuffer->paintBackgroundBoxRel(x,y, width,height);
}
/* shows entries for proxy settings */
void CProxySetup::showProxySetup()
{

8
src/gui/proxyserver_setup.h
View File

@@ -34,24 +34,18 @@
#include <gui/widget/menue.h>
#include <gui/widget/icons.h>
#include <driver/framebuffer.h>
#include <string>
class CProxySetup : public CMenuTarget
{
private:
CFrameBuffer *frameBuffer;
int x, y, width, height, hheight, mheight;
int width;
neutrino_locale_t menue_title;
std::string menue_icon;
void hide();
void showProxySetup();
public:
CProxySetup(const neutrino_locale_t title = LOCALE_FLASHUPDATE_PROXYSERVER_SEP, const char * const IconName = NEUTRINO_ICON_SETTINGS);
~CProxySetup();

14
src/gui/record_setup.cpp
View File

@@ -55,16 +55,7 @@
CRecordSetup::CRecordSetup()
{
frameBuffer = CFrameBuffer::getInstance();
width = w_max (50, 10); //%
hheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight();
mheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight();
height = hheight+13*mheight+ 10;
selected = -1;
x = getScreenStartX (width);
y = getScreenStartY (height);
selected = -1;
}
@@ -73,11 +64,6 @@ CRecordSetup::~CRecordSetup()
}
void CRecordSetup::hide()
{
frameBuffer->paintBackgroundBoxRel(x,y, width, height);
}
int CRecordSetup::exec(CMenuTarget* parent, const std::string &actionKey)
{
dprintf(DEBUG_DEBUG, "init record setup\n");

8
src/gui/record_setup.h
View File

@@ -34,19 +34,13 @@
#include <gui/widget/menue.h>
#include <driver/framebuffer.h>
#include <string>
class CRecordSetup : public CMenuTarget
{
private:
CFrameBuffer *frameBuffer;
int width, selected;
int x, y, width, height, hheight, mheight, selected;
void hide();
void showRecordSetup();
void showRecordTimerSetup(CMenuWidget *menu_timersettings);
void showRecordAudioSetup(CMenuWidget *menu_audiosettings);

13
src/gui/test_menu.cpp
View File

@@ -55,16 +55,8 @@ extern CFrontend * frontend;
CTestMenu::CTestMenu()
{
frameBuffer = CFrameBuffer::getInstance();
width = w_max (50, 10);
hheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight();
mheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight();
height = hheight+13*mheight+ 10;
selected = -1;
x = getScreenStartX (width);
y = getScreenStartY (height);
}
CTestMenu::~CTestMenu()
@@ -318,11 +310,6 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
return res;
}
void CTestMenu::hide()
{
frameBuffer->paintBackgroundBoxRel(x,y, width,height);
}
/* shows entries for proxy settings */
void CTestMenu::showTestMenu()
{

11
src/gui/themes.cpp
View File

@@ -54,13 +54,7 @@
CThemes::CThemes()
: themefile('\t')
{
frameBuffer = CFrameBuffer::getInstance();
width = w_max (40, 10);
hheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight();
mheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight();
height = hheight+13*mheight+ 10;
x = getScreenStartX (width);
y = getScreenStartY (height);
hasThemeChanged = false;
}
@@ -104,11 +98,6 @@ int CThemes::exec(CMenuTarget* parent, const std::string & actionKey)
return res;
}
void CThemes::hide()
{
frameBuffer->paintBackgroundBoxRel(x, y, width, height);
}
void CThemes::readThemes(CMenuWidget &themes)
{
struct dirent **themelist;

5
src/gui/themes.h
View File

@@ -26,17 +26,15 @@
#define __cthemes__
#include <string>
#include <configfile.h>
#include <driver/framebuffer.h>
#include <system/setting_helpers.h>
class CThemes : public CMenuTarget, CChangeObserver
{
private:
CFrameBuffer *frameBuffer;
CConfigFile themefile;
CColorSetupNotifier *notifier;
int x, y, width, height, hheight, mheight;
int width;
int oldThemeValues[40];
bool hasThemeChanged;
@@ -49,7 +47,6 @@ class CThemes : public CMenuTarget, CChangeObserver
public:
CThemes();
void hide();
void setupDefaultColors();
int exec(CMenuTarget* parent, const std::string & actionKey);
};

11
src/gui/user_menue_setup.cpp
View File

@@ -50,17 +50,10 @@
CUserMenuSetup::CUserMenuSetup(neutrino_locale_t menue_title, int menue_button)
{
frameBuffer = CFrameBuffer::getInstance();
local = menue_title;
button = menue_button;
width = w_max (40, 10);
hheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight();
mheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight();
height = hheight+13*mheight+ 10;
x = getScreenStartX (width);
y = getScreenStartY (height);
}
CUserMenuSetup::~CUserMenuSetup()
@@ -68,10 +61,6 @@ CUserMenuSetup::~CUserMenuSetup()
}
void CUserMenuSetup::hide()
{
frameBuffer->paintBackgroundBoxRel(x,y, width,height);
}
#define USERMENU_ITEM_OPTION_COUNT SNeutrinoSettings::ITEM_MAX
const CMenuOptionChooser::keyval USERMENU_ITEM_OPTIONS[USERMENU_ITEM_OPTION_COUNT] =

8
src/gui/user_menue_setup.h
View File

@@ -34,22 +34,16 @@
#include <gui/widget/menue.h>
#include <driver/framebuffer.h>
#include <string>
class CUserMenuSetup : public CMenuTarget
{
private:
CFrameBuffer *frameBuffer;
int x, y, width, height, menue_width, hheight, mheight;
int width;
int button;
neutrino_locale_t local;
void hide();
void showSetup();
public:

12
src/gui/vfd_setup.cpp
View File

@@ -51,15 +51,8 @@
CVfdSetup::CVfdSetup()
{
frameBuffer = CFrameBuffer::getInstance();
width = w_max (40, 10);
hheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight();
mheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight();
height = hheight+13*mheight+ 10;
selected = -1;
x = getScreenStartX (width);
y = getScreenStartY (height);
}
CVfdSetup::~CVfdSetup()
@@ -67,11 +60,6 @@ CVfdSetup::~CVfdSetup()
}
void CVfdSetup::hide()
{
frameBuffer->paintBackgroundBoxRel(x,y, width,height);
}
int CVfdSetup::exec(CMenuTarget* parent, const std::string &)
{

8
src/gui/vfd_setup.h
View File

@@ -33,19 +33,13 @@
#include <gui/widget/menue.h>
#include <driver/framebuffer.h>
#include <string>
class CVfdSetup : public CMenuTarget
{
private:
int width, selected;
CFrameBuffer *frameBuffer;
int x, y, width, height, hheight, mheight, selected;
void hide();
void showSetup();
public:

10
src/gui/videosettings.cpp
View File

@@ -67,12 +67,7 @@ CVideoSettings::CVideoSettings(bool wizard_mode)
VcrVideoOutSignalOptionChooser = NULL;
width = w_max (35, 20);
hheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight();
mheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight();
height = hheight+13*mheight+ 10;
selected = -1;
x = getScreenStartX (width);
y = getScreenStartY (height);
prev_video_mode = g_settings.video_Mode;
@@ -100,11 +95,6 @@ int CVideoSettings::exec(CMenuTarget* parent, const std::string &/*actionKey*/)
return res;
}
void CVideoSettings::hide()
{
frameBuffer->paintBackgroundBoxRel(x,y, width,height);
}
#define VIDEOMENU_43MODE_OPTION_COUNT 4
const CMenuOptionChooser::keyval VIDEOMENU_43MODE_OPTIONS[VIDEOMENU_43MODE_OPTION_COUNT] =
{

4
src/gui/videosettings.h
View File

@@ -47,7 +47,7 @@ class CVideoSettings : public CMenuWidget, CChangeObserver
bool is_wizard;
int x, y, width, height, hheight, mheight, selected;
int width, selected;
void showVideoSetup();
public:
@@ -72,8 +72,6 @@ public:
bool getWizardMode() {return is_wizard;};
void setWizardMode(bool mode);
void hide();
int exec(CMenuTarget* parent, const std::string & actionKey);
};
#endif

91
src/neutrino_menue.cpp
View File

@@ -36,119 +36,53 @@
//#define TEST_MENU
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
#include <sys/time.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <dirent.h>
#include <dlfcn.h>
#include <signal.h>
#include <sys/wait.h>
#include <sys/statvfs.h>
#include <sys/vfs.h>
#include <sys/socket.h>
#include <iostream>
#include <fstream>
#include <string>
#include "global.h"
#include "neutrino.h"
#include "mymenu.h"
#include <daemonc/remotecontrol.h>
#include <system/debug.h>
#include <driver/encoding.h>
#include <driver/framebuffer.h>
#include <driver/fontrenderer.h>
#include <driver/rcinput.h>
#include <driver/stream2file.h>
#include <driver/vcrcontrol.h>
#include <driver/shutdown_count.h>
#include <cs_api.h>
#include <gui/epgplus.h>
#include <gui/streaminfo2.h>
#include "gui/alphasetup.h"
#include "gui/audio_setup.h"
#include "gui/audioplayer.h"
#include "gui/audio_select.h"
#include "gui/bedit/bouqueteditor_bouquets.h"
#include "gui/bouquetlist.h"
#include "gui/channellist.h"
#include "gui/cam_menu.h"
#include "gui/cec_setup.h"
#include "gui/color.h"
#include "gui/customcolor.h"
#include "gui/dboxinfo.h"
#include "gui/epg_menu.h"
#include "gui/epgview.h"
#include "gui/eventlist.h"
#include <gui/epgplus.h>
#include "gui/favorites.h"
#include "gui/filebrowser.h"
#include "gui/hdd_menu.h"
#include "gui/imageinfo.h"
#include "gui/infoviewer.h"
#include "gui/keybind_setup.h"
#include "gui/mediaplayer.h"
#include "gui/mediaplayer_setup.h"
#include "gui/motorcontrol.h"
#include "gui/movieplayer.h"
#include "gui/network_setup.h"
#include "gui/osd_setup.h"
#include "gui/osdlang_setup.h"
#include "gui/parentallock_setup.h"
#include "gui/pictureviewer.h"
#include "gui/pluginlist.h"
#include "gui/plugins.h"
#include "gui/rc_lock.h"
#include "gui/record_setup.h"
#include "gui/scan.h"
#include "gui/sleeptimer.h"
#include <gui/streaminfo2.h>
#ifdef TEST_MENU
#include "gui/test_menu.h"
#endif /*TEST_MENU*/
#include "gui/timerlist.h"
#include "gui/update.h"
#include "gui/user_menue_setup.h"
#include "gui/user_menue_setup.h"
#include "gui/vfd_setup.h"
#include "gui/videosettings.h"
#include "gui/widget/colorchooser.h"
#include "gui/widget/hintbox.h"
#include "gui/widget/icons.h"
#include "gui/widget/keychooser.h"
#include "gui/widget/menue.h"
#include "gui/widget/messagebox.h"
#include "gui/widget/mountchooser.h"
#include "gui/widget/stringinput.h"
#include "gui/widget/stringinput_ext.h"
#include <system/setting_helpers.h>
#include <system/settings.h>
#include <system/debug.h>
#include <system/flashtool.h>
#include <system/fsmounter.h>
#include <timerdclient/timerdmsg.h>
#include <video.h>
#include <audio.h>
#include <zapit/fastscan.h>
#include <zapit/frontend_c.h>
#include <zapit/getservices.h>
#include <string.h>
#include "gui/infoclock.h"
#include "mymenu.h"
#include "gui/dboxinfo.h"
#include "gui/hdd_menu.h"
#include "gui/audio_select.h"
#include "gui/cam_menu.h"
#include <zapit/getservices.h>
#include <zapit/satconfig.h>
#include <zapit/fastscan.h>
#include <cs_api.h>
extern CFrontend * frontend;
@@ -160,11 +94,6 @@ extern Zapit_config zapitCfg;
extern char zapit_lat[20];
extern char zapit_long[20];
extern char current_timezone[50];
extern cVideo *videoDecoder;
extern cAudio *audioDecoder;
// extern bool parentallocked;
//extern const char * locale_real_names[];
//extern CFontSizeNotifier fontsizenotifier;
extern CFanControlNotifier * funNotifier;
extern CRemoteControl * g_RemoteControl;
extern CCAMMenuHandler * g_CamHandler;