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

move miscsettings to sub menu

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@180 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: bf4f606651
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2010-01-18 (Mon, 18 Jan 2010)



------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2010-01-18 11:29:22 +00:00
parent bdeaa96cf2
commit 8786b75297
2 changed files with 908 additions and 883 deletions
Download Patch File Download Diff File Expand all files Collapse all files

305
src/neutrino.h
View File

@@ -68,188 +68,199 @@ typedef struct neutrino_font_descr
typedef struct font_sizes typedef struct font_sizes
{ {
const neutrino_locale_t name; const neutrino_locale_t name;
const unsigned int defaultsize; const unsigned int defaultsize;
const unsigned int style; const unsigned int style;
const unsigned int size_offset; const unsigned int size_offset;
} font_sizes_struct; } font_sizes_struct;
typedef struct font_sizes_groups typedef struct font_sizes_groups
{ {
const neutrino_locale_t groupname; const neutrino_locale_t groupname;
const unsigned int count; const unsigned int count;
const SNeutrinoSettings::FONT_TYPES * const content; const SNeutrinoSettings::FONT_TYPES * const content;
const char * const actionkey; const char * const actionkey;
} font_sizes_groups_struct; } font_sizes_groups_struct;
class CNeutrinoApp : public CMenuTarget, CChangeObserver class CNeutrinoApp : public CMenuTarget, CChangeObserver
{ {
public: public:
enum enum
{ {
RECORDING_OFF = 0, RECORDING_OFF = 0,
RECORDING_SERVER = 1, RECORDING_SERVER = 1,
RECORDING_VCR = 2, RECORDING_VCR = 2,
RECORDING_FILE = 3 RECORDING_FILE = 3
}; };
private: private:
CFrameBuffer * frameBuffer; CFrameBuffer * frameBuffer;
enum enum
{ {
mode_unknown = -1, mode_unknown = -1,
mode_tv = 1, mode_tv = 1,
mode_radio = 2, mode_radio = 2,
mode_scart = 3, mode_scart = 3,
mode_standby = 4, mode_standby = 4,
mode_audio = 5, mode_audio = 5,
mode_pic = 6, mode_pic = 6,
mode_ts = 7, mode_ts = 7,
mode_off = 8, mode_off = 8,
mode_mask = 0xFF, mode_mask = 0xFF,
norezap = 0x100 norezap = 0x100
}; };
CConfigFile configfile; CConfigFile configfile;
CScanSettings scanSettings; CScanSettings scanSettings;
int network_dhcp; int network_dhcp;
int network_automatic_start; int network_automatic_start;
neutrino_font_descr_struct font; neutrino_font_descr_struct font;
int mode; int mode;
int lastMode; int lastMode;
bool softupdate; bool softupdate;
bool fromflash; bool fromflash;
CTimerd::RecordingInfo* nextRecordingInfo; CTimerd::RecordingInfo* nextRecordingInfo;
//bool record_mode; //bool record_mode;
struct timeval standby_pressed_at; struct timeval standby_pressed_at;
CZapitClient::responseGetLastChannel firstchannel; CZapitClient::responseGetLastChannel firstchannel;
st_rmsg sendmessage; st_rmsg sendmessage;
int current_muted; int current_muted;
bool skipShutdownTimer; bool skipShutdownTimer;
CColorSetupNotifier *colorSetupNotifier; CColorSetupNotifier *colorSetupNotifier;
CKeySetupNotifier *keySetupNotifier; CKeySetupNotifier *keySetupNotifier;
CNVODChangeExec *NVODChanger; CNVODChangeExec *NVODChanger;
CStreamFeaturesChangeExec *StreamFeaturesChanger; CStreamFeaturesChangeExec *StreamFeaturesChanger;
CMoviePluginChangeExec *MoviePluginChanger; CMoviePluginChangeExec *MoviePluginChanger;
COnekeyPluginChangeExec *OnekeyPluginChanger; COnekeyPluginChangeExec *OnekeyPluginChanger;
CIPChangeNotifier *MyIPChanger; CIPChangeNotifier *MyIPChanger;
// CVCRControl *vcrControl; // CVCRControl *vcrControl;
CConsoleDestChangeNotifier *ConsoleDestinationChanger; CConsoleDestChangeNotifier *ConsoleDestinationChanger;
CRCLock *rcLock; CRCLock *rcLock;
// USERMENU // USERMENU
CTimerList *Timerlist; CTimerList *Timerlist;
bool showUserMenu(int button); bool showUserMenu(int button);
bool getNVODMenu(CMenuWidget* menu); bool getNVODMenu(CMenuWidget* menu);
void firstChannel(); void firstChannel();
void setupColors_red(); void setupColors_red();
void setupColors_ru(); void setupColors_ru();
void setupColors_dvb2000(); void setupColors_dvb2000();
void setupColors_classic(); void setupColors_classic();
void setupColors_neutrino(); void setupColors_neutrino();
void setupColors_dblue(); void setupColors_dblue();
void setupColors_dvb2k(); void setupColors_dvb2k();
void setupNetwork( bool force= false ); void setupNetwork( bool force= false );
void setupNFS(); void setupNFS();
void setupRecordingDevice(void); void setupRecordingDevice(void);
void startNextRecording();
void tvMode( bool rezap = true ); void startNextRecording();
void radioMode( bool rezap = true );
void scartMode( bool bOnOff );
void standbyMode( bool bOnOff );
void AudioMute( int newValue, bool isEvent= false );
void setvol(int vol, int avs);
void saveEpg();
void ExitRun(const bool write_si = true, int retcode = 0); void tvMode( bool rezap = true );
void RealRun(CMenuWidget &mainSettings); void radioMode( bool rezap = true );
void InitZapper(); void scartMode( bool bOnOff );
void InitKeySettings(CMenuWidget &); void standbyMode( bool bOnOff );
void InitServiceSettings(CMenuWidget &, CMenuWidget &); void AudioMute( int newValue, bool isEvent= false );
void InitColorSettingsMenuColors(CMenuWidget &); void setvol(int vol, int avs);
void InitAudioSettings(CMenuWidget &audioSettings, CAudioSetupNotifier* audioSetupNotifier); void saveEpg();
void InitColorSettings(CMenuWidget &, CMenuWidget &);
void InitLanguageSettings(CMenuWidget &);
void InitColorThemesSettings(CMenuWidget &);
void InitColorSettingsStatusBarColors(CMenuWidget &colorSettings_menuColors);
void InitColorSettingsTiming(CMenuWidget &colorSettings_timing);
void InitLcdSettings(CMenuWidget &lcdSettings);
void InitNetworkSettings(CMenuWidget &networkSettings);
void AddFontSettingItem(CMenuWidget &fontSettings, const SNeutrinoSettings::FONT_TYPES number_of_fontsize_entry);
void InitFontSettings(CMenuWidget &fontSettings);
void InitRecordingSettings(CMenuWidget &recordingSettings);
void InitStreamingSettings(CMenuWidget &streamingSettings);
void InitScreenSettings(CMenuWidget &);
void InitAudioplPicSettings(CMenuWidget &);
void InitMiscSettings(CMenuWidget &);
void InitScanSettings(CMenuWidget &);
void InitParentalLockSettings(CMenuWidget &);
void InitMainMenu(CMenuWidget &mainMenu, CMenuWidget &mainSettings, CMenuWidget &audioSettings,
CMenuWidget &parentallockSettings, CMenuWidget &networkSettings1, CMenuWidget &networkSettings2,
CMenuWidget &colorSettings, CMenuWidget &lcdSettings, CMenuWidget &keySettings,
CMenuWidget &languageSettings, CMenuWidget &miscSettings, CMenuWidget &service, CMenuWidget &fontSettings,
CMenuWidget &audioplPicSettings, CMenuWidget &streamingSettings, CMenuWidget &moviePlayer);
void SetupFrameBuffer();
void SelectAPID();
void SelectNVOD();
void CmdParser(int argc, char **argv);
void ShowStreamFeatures();
void InitSCSettings(CMenuWidget &);
bool doGuiRecord(char * preselectedDir, bool addTimer = false);
void saveColors(const char * fname);
void loadKeys(const char * fname);
void saveKeys(const char * fname);
CNeutrinoApp();
public: void ExitRun(const bool write_si = true, int retcode = 0);
void saveSetup(const char * fname); void RealRun(CMenuWidget &mainSettings);
int loadSetup(const char * fname); void InitZapper();
void loadColors(const char * fname); void InitKeySettings(CMenuWidget &);
void SetupTiming(); void InitServiceSettings(CMenuWidget &, CMenuWidget &);
void SetupFonts(); void InitColorSettingsMenuColors(CMenuWidget &);
void InitAudioSettings(CMenuWidget &audioSettings, CAudioSetupNotifier* audioSetupNotifier);
void InitColorSettings(CMenuWidget &, CMenuWidget &);
void InitLanguageSettings(CMenuWidget &);
void InitColorThemesSettings(CMenuWidget &);
void InitColorSettingsStatusBarColors(CMenuWidget &colorSettings_menuColors);
void InitColorSettingsTiming(CMenuWidget &colorSettings_timing);
void InitLcdSettings(CMenuWidget &lcdSettings);
void InitNetworkSettings(CMenuWidget &networkSettings);
void AddFontSettingItem(CMenuWidget &fontSettings, const SNeutrinoSettings::FONT_TYPES number_of_fontsize_entry);
void InitFontSettings(CMenuWidget &fontSettings);
void InitRecordingSettings(CMenuWidget &recordingSettings);
void InitStreamingSettings(CMenuWidget &streamingSettings);
void InitScreenSettings(CMenuWidget &);
void InitAudioplPicSettings(CMenuWidget &);
void InitMiscSettings(CMenuWidget &);
void InitScanSettings(CMenuWidget &);
void InitParentalLockSettings(CMenuWidget &);
void InitMainMenu(CMenuWidget &mainMenu, CMenuWidget &mainSettings, CMenuWidget &audioSettings,
CMenuWidget &parentallockSettings, CMenuWidget &networkSettings1, CMenuWidget &networkSettings2,
CMenuWidget &colorSettings, CMenuWidget &lcdSettings, CMenuWidget &keySettings,
CMenuWidget &languageSettings, CMenuWidget &miscSettings, CMenuWidget &service, CMenuWidget &fontSettings,
CMenuWidget &audioplPicSettings, CMenuWidget &streamingSettings, CMenuWidget &moviePlayer);
void addMenueIntroItems(CMenuWidget &item);
void SetupFrameBuffer();
void SelectAPID();
void SelectNVOD();
void CmdParser(int argc, char **argv);
void ShowStreamFeatures();
void InitSCSettings(CMenuWidget &);
bool doGuiRecord(char * preselectedDir, bool addTimer = false);
void saveColors(const char * fname);
void loadKeys(const char * fname);
void saveKeys(const char * fname);
CNeutrinoApp();
void setVolume(const neutrino_msg_t key, const bool bDoPaint = true, bool nowait = false); public:
~CNeutrinoApp(); void saveSetup(const char * fname);
CScanSettings& getScanSettings(){ return scanSettings;}; int loadSetup(const char * fname);
void loadColors(const char * fname);
void SetupTiming();
void SetupFonts();
CChannelList *TVchannelList; void setVolume(const neutrino_msg_t key, const bool bDoPaint = true, bool nowait = false);
CChannelList *RADIOchannelList; ~CNeutrinoApp();
CChannelList *channelList; CScanSettings& getScanSettings() {
CNetworkConfig networkConfig; return scanSettings;
};
static CNeutrinoApp* getInstance(); CChannelList *TVchannelList;
CChannelList *RADIOchannelList;
CChannelList *channelList;
CNetworkConfig networkConfig;
void channelsInit(bool bOnly = false); static CNeutrinoApp* getInstance();
int run(int argc, char **argv);
//callback stuff only.... void channelsInit(bool bOnly = false);
int exec(CMenuTarget* parent, const std::string & actionKey); int run(int argc, char **argv);
//onchange //callback stuff only....
bool changeNotify(const neutrino_locale_t OptionName, void *); int exec(CMenuTarget* parent, const std::string & actionKey);
int handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data); //onchange
bool changeNotify(const neutrino_locale_t OptionName, void *);
int getMode() { return mode; } int handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data);
int getLastMode() { return lastMode; }
bool isMuted() { return current_muted; } int getMode() {
int recordingstatus; return mode;
int recording_id; }
void SendSectionsdConfig(void); int getLastMode() {
int GetChannelMode(void) { return g_settings.channel_mode; }; return lastMode;
void SetChannelMode(int mode); }
void quickZap(int msg); bool isMuted() {
return current_muted;
}
int recordingstatus;
int recording_id;
void SendSectionsdConfig(void);
int GetChannelMode(void) {
return g_settings.channel_mode;
};
void SetChannelMode(int mode);
void quickZap(int msg);
}; };
#endif #endif

1486
src/neutrino_menue.cpp
View File

File diff suppressed because it is too large Load Diff