mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-09 14:48:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add CEC gui code.

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


Origin commit data
------------------
Commit: 3474cecc22
Author: nightshad <nightshad@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2010-05-28 (Fri, 28 May 2010)
This commit is contained in:
nightshad
2010-05-28 08:09:18 +00:00
parent c19460113f
commit 4b3ecab1ad
5 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/neutrino.cpp
View File

@@ -754,6 +754,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
prev_video_mode = g_settings.video_Mode;
g_settings.analog_mode1 = configfile.getInt32("analog_mode1", 0); // default RGB
g_settings.analog_mode2 = configfile.getInt32("analog_mode2", 0); // default RGB
g_settings.hdmi_cec_mode = configfile.getInt32("hdmi_cec_mode", 0); // default off
g_settings.video_Format = configfile.getInt32("video_Format", 3);
g_settings.video_43mode = configfile.getInt32("video_43mode", 0);
@@ -1292,6 +1293,8 @@ void CNeutrinoApp::saveSetup(const char * fname)
configfile.setInt32( "analog_mode2", g_settings.analog_mode2 );
configfile.setInt32( "video_Format", g_settings.video_Format );
configfile.setInt32( "video_43mode", g_settings.video_43mode );
configfile.setInt32( "hdmi_cec_mode", g_settings.hdmi_cec_mode );
configfile.setInt32( "current_volume", g_settings.current_volume );
configfile.setInt32( "channel_mode", g_settings.channel_mode );
configfile.setInt32( "channel_mode_radio", g_settings.channel_mode_radio );

13
src/neutrino_menue.cpp
View File

@@ -238,6 +238,14 @@ const CMenuOptionChooser::keyval VIDEOMENU_43MODE_OPTIONS[VIDEOMENU_43MODE_OPTIO
//{ 2, LOCALE_VIDEOMENU_AUTO } // whatever is this auto mode, it seems its totally broken
};
#define VIDEOMENU_HDMI_CEC_MODE_OPTION_COUNT 3
const CMenuOptionChooser::keyval VIDEOMENU_HDMI_CEC_MODE_OPTIONS[VIDEOMENU_HDMI_CEC_MODE_OPTION_COUNT] =
{
{ VIDEO_HDMI_CEC_MODE_OFF , LOCALE_VIDEOMENU_HDMI_CEC_MODE_OFF },
{ VIDEO_HDMI_CEC_MODE_TUNER , LOCALE_VIDEOMENU_HDMI_CEC_MODE_TUNER },
{ VIDEO_HDMI_CEC_MODE_RECORDER , LOCALE_VIDEOMENU_HDMI_CEC_MODE_RECORDER },
};
/* numbers corresponding to video.cpp from zapit */
//#define VIDEOMENU_VIDEOMODE_OPTION_COUNT 11
const CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_OPTION_COUNT] =
@@ -287,6 +295,7 @@ CVideoSettings::CVideoSettings() : CMenuWidget(LOCALE_VIDEOMENU_HEAD, NEUTRINO_I
addItem(new CMenuOptionChooser(LOCALE_VIDEOMENU_43MODE, &g_settings.video_43mode, VIDEOMENU_43MODE_OPTIONS, VIDEOMENU_43MODE_OPTION_COUNT, true, this));
addItem(new CMenuOptionChooser(LOCALE_VIDEOMENU_VIDEOMODE, &g_settings.video_Mode, VIDEOMENU_VIDEOMODE_OPTIONS, VIDEOMENU_VIDEOMODE_OPTION_COUNT, true, this, CRCInput::RC_nokey, "", true));
addItem(new CMenuOptionChooser(LOCALE_VIDEOMENU_DBDR, &g_settings.video_dbdr, VIDEOMENU_DBDR_OPTIONS, VIDEOMENU_DBDR_OPTION_COUNT, true, this));
addItem(new CMenuOptionChooser(LOCALE_VIDEOMENU_HDMI_CEC_MODE, &g_settings.hdmi_cec_mode, VIDEOMENU_HDMI_CEC_MODE_OPTIONS, VIDEOMENU_HDMI_CEC_MODE_OPTION_COUNT, true, this));
CMenuWidget* menu = new CMenuWidget(LOCALE_VIDEOMENU_ENABLED_MODES, NEUTRINO_ICON_SETTINGS);
for (int i = 0; i < VIDEOMENU_VIDEOMODE_OPTION_COUNT; i++)
@@ -415,6 +424,10 @@ bool CVideoSettings::changeNotify(const neutrino_locale_t OptionName, void *)
{
videoDecoder->SetVideoMode((analog_mode_t) g_settings.analog_mode2);
}
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_HDMI_CEC_MODE))
{
videoDecoder->SetCEC((VIDEO_HDMI_CEC_MODE)g_settings.hdmi_cec_mode);
}
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_DBDR))
{
videoDecoder->SetDBDR(g_settings.video_dbdr);

4
src/system/locals.h
View File

@@ -1194,6 +1194,10 @@ typedef enum {
LOCALE_VIDEOMENU_ANALOG_MODE_HD_YPRPB_CINCH,
LOCALE_VIDEOMENU_SCART,
LOCALE_VIDEOMENU_CINCH,
LOCALE_VIDEOMENU_HDMI_CEC_MODE,
LOCALE_VIDEOMENU_HDMI_CEC_MODE_OFF,
LOCALE_VIDEOMENU_HDMI_CEC_MODE_TUNER,
LOCALE_VIDEOMENU_HDMI_CEC_MODE_RECORDER,
LOCALE_VIDEOMENU_DBDR,
LOCALE_VIDEOMENU_DBDR_NONE,
LOCALE_VIDEOMENU_DBDR_DEBLOCK,

4
src/system/locals_intern.h
View File

@@ -1194,6 +1194,10 @@ const char *locale_real_names[] = {
"videomenu.analog_hd_yprpb_cinch",
"videomenu.scart",
"videomenu.cinch",
"videomenu.hdmi_cec_mode",
"videomenu.hdmi_cec_mode_off",
"videomenu.hdmi_cec_mode_tuner",
"videomenu.hdmi_cec_mode_recorder",
"videomenu.dbdr",
"videomenu.dbdr_none",
"videomenu.dbdr_deblock",

2
src/system/settings.h
View File

@@ -84,7 +84,9 @@ struct SNeutrinoSettings
int hdmi_dd;
int spdif_dd;
int analog_out;
//video
int video_dbdr;
int hdmi_cec_mode;
int enabled_video_modes[VIDEOMENU_VIDEOMODE_OPTION_COUNT];
int cpufreq;
int standby_cpufreq;