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

Merge remote-tracking branch 'check/next-cc'

Browse Source 
needs buildfixing...

Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/infoclock.cpp
	src/gui/infoviewer.cpp
	src/gui/motorcontrol.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/update.cpp
	src/gui/widget/progresswindow.cpp
	src/gui/widget/textbox.cpp
	src/neutrino.cpp
	src/zapit/include/zapit/femanager.h
This commit is contained in:
Stefan Seyfried
2013-09-01 19:46:10 +02:00
parent a5999ea165 4c8e32101c
commit 32de6beef0
163 changed files with 4066 additions and 1537 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/system/settings.h
View File

@@ -89,6 +89,7 @@ struct SNeutrinoSettings
int scrambled_message;
int volume_pos;
int volume_digits;
int volume_size;
int show_mute_icon;
int menu_pos;
int show_menu_hints;
@@ -419,6 +420,9 @@ struct SNeutrinoSettings
int key_pip_close;
int key_pip_setup;
int key_pip_swap;
int key_format_mode_active;
int key_pic_mode_active;
int key_pic_size_active;
int cacheTXT;
int minimode;
@@ -478,6 +482,8 @@ struct SNeutrinoSettings
char softupdate_proxyserver[31];
char softupdate_proxyusername[31];
char softupdate_proxypassword[31];
int softupdate_name_mode_apply;
int softupdate_name_mode_backup;
int apply_settings;
int apply_kernel;
@@ -545,6 +551,9 @@ struct SNeutrinoSettings
int led_deep_mode;
int led_rec_mode;
int led_blink;
int backlight_tv;
int backlight_standby;
int backlight_deepstandby;
#define FILESYSTEM_ENCODING_TO_UTF8(a) (g_settings.filesystem_is_utf8 ? (a) : ZapitTools::Latin1_to_UTF8(a).c_str())
#define UTF8_TO_FILESYSTEM_ENCODING(a) (g_settings.filesystem_is_utf8 ? (a) : ZapitTools::UTF8_to_Latin1(a).c_str())
#define FILESYSTEM_ENCODING_TO_UTF8_STRING(a) (g_settings.filesystem_is_utf8 ? (a) : ZapitTools::Latin1_to_UTF8(a))