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

Merge branch 'check/dvbsi++' commit 5db16ee2ff

Browse Source 
Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/channellist.cpp
	src/gui/components/Makefile.am
	src/gui/components/cc.h
	src/gui/components/components.cpp
	src/gui/moviebrowser.cpp
	src/gui/scan.cpp
	src/neutrino.cpp
	src/zapit/src/bouquets.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp
This commit is contained in:
Stefan Seyfried
2013-02-21 17:07:18 +01:00
parent c83a35ebfc 5db16ee2ff
commit 0cf191822a
42 changed files with 871 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/system/locals.h
View File

@@ -227,6 +227,10 @@ typedef enum
LOCALE_BOUQUETNAME_OTHER,
LOCALE_BOUQUETNAME_REMOVED,
LOCALE_CABLESETUP_PROVIDER,
LOCALE_CHANNELLIST_ADDITIONAL,
LOCALE_CHANNELLIST_ADDITIONAL_OFF,
LOCALE_CHANNELLIST_ADDITIONAL_ON,
LOCALE_CHANNELLIST_ADDITIONAL_ON_MINITV,
LOCALE_CHANNELLIST_CURRENT_TP,
LOCALE_CHANNELLIST_EDIT,
LOCALE_CHANNELLIST_EPGTEXT_ALIGN_LEFT,
@@ -248,6 +252,9 @@ typedef enum
LOCALE_CHANNELLIST_MAKE_NEWLIST,
LOCALE_CHANNELLIST_MAKE_REMOVEDLIST,
LOCALE_CHANNELLIST_NEW_ZAP_MODE,
LOCALE_CHANNELLIST_NEW_ZAP_MODE_ACTIVE,
LOCALE_CHANNELLIST_NEW_ZAP_MODE_ALLOW,
LOCALE_CHANNELLIST_NEW_ZAP_MODE_OFF,
LOCALE_CHANNELLIST_NONEFOUND,
LOCALE_CHANNELLIST_PROVS,
LOCALE_CHANNELLIST_RECORDING_NOT_POSSIBLE,
@@ -543,6 +550,7 @@ typedef enum
LOCALE_FONTSIZE_CHANNEL_NUM_ZAP,
LOCALE_FONTSIZE_CHANNELLIST,
LOCALE_FONTSIZE_CHANNELLIST_DESCR,
LOCALE_FONTSIZE_CHANNELLIST_EVENT,
LOCALE_FONTSIZE_CHANNELLIST_NUMBER,
LOCALE_FONTSIZE_EPG_DATE,
LOCALE_FONTSIZE_EPG_INFO1,
@@ -760,6 +768,7 @@ typedef enum
LOCALE_MENU_HINT_CEC_MODE,
LOCALE_MENU_HINT_CEC_STANDBY,
LOCALE_MENU_HINT_CEC_VIEW_ON,
LOCALE_MENU_HINT_CHANNELLIST_ADDITIONAL,
LOCALE_MENU_HINT_CHANNELLIST_COLORED,
LOCALE_MENU_HINT_CHANNELLIST_EPG_ALIGN,
LOCALE_MENU_HINT_CHANNELLIST_EXTENDED,
@@ -821,6 +830,7 @@ typedef enum
LOCALE_MENU_HINT_INFOBAR_LOGO,
LOCALE_MENU_HINT_INFOBAR_LOGO_DIR,
LOCALE_MENU_HINT_INFOBAR_ON_EPG,
LOCALE_MENU_HINT_INFOBAR_PROGRESSBAR,
LOCALE_MENU_HINT_INFOBAR_RADIOTEXT,
LOCALE_MENU_HINT_INFOBAR_RES,
LOCALE_MENU_HINT_INFOBAR_SAT,
@@ -1150,6 +1160,11 @@ typedef enum
LOCALE_MISCSETTINGS_INFOBAR_DISP_6,
LOCALE_MISCSETTINGS_INFOBAR_DISP_LOG,
LOCALE_MISCSETTINGS_INFOBAR_LOGO_HDD_DIR,
LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR,
LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_0,
LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_1,
LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_2,
LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_3,
LOCALE_MISCSETTINGS_INFOBAR_SAT_DISPLAY,
LOCALE_MISCSETTINGS_INFOBAR_SHOW,
LOCALE_MISCSETTINGS_INFOBAR_SHOW_DD_AVAILABLE,

15
src/system/locals_intern.h
View File

@@ -227,6 +227,10 @@ const char * locale_real_names[] =
"bouquetname.other",
"bouquetname.removed",
"cablesetup.provider",
"channellist.additional",
"channellist.additional_off",
"channellist.additional_on",
"channellist.additional_on_minitv",
"channellist.current_tp",
"channellist.edit",
"channellist.epgtext_align_left",
@@ -248,6 +252,9 @@ const char * locale_real_names[] =
"channellist.make_newlist",
"channellist.make_removedlist",
"channellist.new_zap_mode",
"channellist.new_zap_mode_active",
"channellist.new_zap_mode_allow",
"channellist.new_zap_mode_off",
"channellist.nonefound",
"channellist.provs",
"channellist.recording_not_possible",
@@ -543,6 +550,7 @@ const char * locale_real_names[] =
"fontsize.channel_num_zap",
"fontsize.channellist",
"fontsize.channellist_descr",
"fontsize.channellist_event",
"fontsize.channellist_number",
"fontsize.epg_date",
"fontsize.epg_info1",
@@ -760,6 +768,7 @@ const char * locale_real_names[] =
"menu.hint_cec_mode",
"menu.hint_cec_standby",
"menu.hint_cec_view_on",
"menu.hint_channellist_additional",
"menu.hint_channellist_colored",
"menu.hint_channellist_epg_align",
"menu.hint_channellist_extended",
@@ -821,6 +830,7 @@ const char * locale_real_names[] =
"menu.hint_infobar_logo",
"menu.hint_infobar_logo_dir",
"menu.hint_infobar_on_epg",
"menu.hint_infobar_progressbar",
"menu.hint_infobar_radiotext",
"menu.hint_infobar_res",
"menu.hint_infobar_sat",
@@ -1150,6 +1160,11 @@ const char * locale_real_names[] =
"miscsettings.infobar_disp_6",
"miscsettings.infobar_disp_log",
"miscsettings.infobar_logo_hdd_dir",
"miscsettings.infobar_progressbar",
"miscsettings.infobar_progressbar_0",
"miscsettings.infobar_progressbar_1",
"miscsettings.infobar_progressbar_2",
"miscsettings.infobar_progressbar_3",
"miscsettings.infobar_sat_display",
"miscsettings.infobar_show",
"miscsettings.infobar_show_dd_available",

19
src/system/settings.h
View File

@@ -73,6 +73,7 @@ struct SNeutrinoSettings
int fan_speed;
int infobar_show;
int infobar_show_channellogo;
int infobar_progressbar;
int progressbar_color;
int casystem_display;
int scrambled_message;
@@ -421,6 +422,7 @@ struct SNeutrinoSettings
int pip_y;
int bigFonts;
int big_windows;
int channellist_additional;
int channellist_epgtext_align_right;
int channellist_extended;
int channellist_foot;
@@ -468,7 +470,7 @@ struct SNeutrinoSettings
// Font sizes
#define FONT_TYPE_COUNT 23
#define FONT_TYPE_COUNT 24
enum FONT_TYPES {
FONT_TYPE_MENU = 0,
FONT_TYPE_MENU_TITLE = 1,
@@ -486,13 +488,14 @@ struct SNeutrinoSettings
FONT_TYPE_CHANNELLIST = 13,
FONT_TYPE_CHANNELLIST_DESCR = 14,
FONT_TYPE_CHANNELLIST_NUMBER = 15,
FONT_TYPE_CHANNEL_NUM_ZAP = 16,
FONT_TYPE_INFOBAR_NUMBER = 17,
FONT_TYPE_INFOBAR_CHANNAME = 18,
FONT_TYPE_INFOBAR_INFO = 19,
FONT_TYPE_INFOBAR_SMALL = 20,
FONT_TYPE_FILEBROWSER_ITEM = 21,
FONT_TYPE_MENU_HINT = 22
FONT_TYPE_CHANNELLIST_EVENT = 16,
FONT_TYPE_CHANNEL_NUM_ZAP = 17,
FONT_TYPE_INFOBAR_NUMBER = 18,
FONT_TYPE_INFOBAR_CHANNAME = 19,
FONT_TYPE_INFOBAR_INFO = 20,
FONT_TYPE_INFOBAR_SMALL = 21,
FONT_TYPE_FILEBROWSER_ITEM = 22,
FONT_TYPE_MENU_HINT = 23
};
// lcdd