mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-12 16:03:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

More cec options for future, not ready

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@604 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
focus
2010-05-28 09:16:03 +00:00
parent 3a1bbc9630
commit 8ebd8cc69a
12 changed files with 99 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/system/locals.h
View File

@@ -1198,6 +1198,8 @@ typedef enum {
LOCALE_VIDEOMENU_HDMI_CEC_MODE_OFF,
LOCALE_VIDEOMENU_HDMI_CEC_MODE_TUNER,
LOCALE_VIDEOMENU_HDMI_CEC_MODE_RECORDER,
LOCALE_VIDEOMENU_HDMI_CEC_STANDBY,
LOCALE_VIDEOMENU_HDMI_CEC_VIEW_ON,
LOCALE_VIDEOMENU_DBDR,
LOCALE_VIDEOMENU_DBDR_NONE,
LOCALE_VIDEOMENU_DBDR_DEBLOCK,

2
src/system/locals_intern.h
View File

@@ -1198,6 +1198,8 @@ const char *locale_real_names[] = {
"videomenu.hdmi_cec_mode_off",
"videomenu.hdmi_cec_mode_tuner",
"videomenu.hdmi_cec_mode_recorder",
"videomenu.hdmi_cec_standby",
"videomenu.hdmi_cec_view_on",
"videomenu.dbdr",
"videomenu.dbdr_none",
"videomenu.dbdr_deblock",

1
src/system/setting_helpers.h
View File

@@ -317,4 +317,5 @@ class CAllUsalsNotifier : public CChangeObserver
public:
bool changeNotify(const neutrino_locale_t, void * data);
};
#endif

64
src/system/settings.cpp
View File

@@ -55,70 +55,6 @@ CScanSettings::CScanSettings(void)
satNameNoDiseqc[0] = 0;
}
void CScanSettings::toSatList( CZapitClient::ScanSatelliteList& /*satList*/) const
{
#if 0
satList.clear();
CZapitClient::commandSetScanSatelliteList sat;
sat.diseqc = 0;
strncpy(sat.satName, satNameNoDiseqc, 30);
if(diseqcMode == DISEQC_1_2)
sat.diseqc = -1;
if((scan_mode == 2) || (diseqcMode == DISEQC_1_2)) {
for (int i = 0; i < MAX_SATELLITES; i++) {
if (!strcmp(satName[i], satNameNoDiseqc)) {
if (satDiseqc[i] != -1)
sat.diseqc = satDiseqc[i];
break;
}
}
}
satList.push_back(sat);
#endif
#if 0
if (scan_mode == 2) {
strncpy(sat.satName, satNameNoDiseqc, 30);
sat.diseqc = 0;
for (int i = 0; i < MAX_SATELLITES; i++) {
if (!strcmp(satName[i], satNameNoDiseqc)) {
if (satDiseqc[i] != -1)
sat.diseqc = satDiseqc[i];
break;
}
}
satList.push_back(sat);
}
else if (diseqcMode == NO_DISEQC) {
strncpy(sat.satName, satNameNoDiseqc, 30);
sat.diseqc = 0;
satList.push_back(sat);
}
else if (diseqcMode == DISEQC_1_2) {
strncpy(sat.satName, satNameNoDiseqc, 30);
sat.diseqc = -1;
for (int i = 0; i < MAX_SATELLITES; i++) {
if (!strcmp(satName[i], satNameNoDiseqc)) {
if (satDiseqc[i] != -1)
sat.diseqc = satDiseqc[i];
break;
}
}
satList.push_back(sat);
} else { // scan all sats with configured diseqc
for( int i = 0; i < MAX_SATELLITES; i++) {
if (satDiseqc[i] != -1) {
strncpy(sat.satName, satName[i], 30);
sat.diseqc = satDiseqc[i];
satList.push_back(sat);
}
}
}
#endif
}
void CScanSettings::useDefaults(const delivery_system_t _delivery_system)
{
delivery_system = _delivery_system;

4
src/system/settings.h
View File

@@ -87,6 +87,8 @@ struct SNeutrinoSettings
//video
int video_dbdr;
int hdmi_cec_mode;
int hdmi_cec_view_on;
int hdmi_cec_standby;
int enabled_video_modes[VIDEOMENU_VIDEOMODE_OPTION_COUNT];
int cpufreq;
int standby_cpufreq;
@@ -532,6 +534,7 @@ const int PARENTALLOCK_PROMPT_CHANGETOLOCKED = 2;
const int PARENTALLOCK_PROMPT_ONSIGNAL = 3;
#define MAX_SATELLITES 80
#define get_set CNeutrinoApp::getInstance()->getScanSettings()
class CScanSettings
{
@@ -556,7 +559,6 @@ public:
CScanSettings();
void toSatList( CZapitClient::ScanSatelliteList& ) const;
void useDefaults(const delivery_system_t _delivery_system);
bool loadSettings(const char * const fileName, const delivery_system_t _delivery_system);
bool saveSettings(const char * const fileName);