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

Merge branch 'uncool/dvbsi++' commit 4965619a79

Browse Source 
Conflicts:
	src/gui/widget/hintboxext.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
This commit is contained in:
Stefan Seyfried
2012-12-30 21:35:20 +01:00
parent 231499a078 8dcd92d557
commit f8f5467fdb
84 changed files with 898 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/system/locals.h
View File

@@ -1198,6 +1198,7 @@ typedef enum
LOCALE_MOTORCONTROL_TIMED_MODE,
LOCALE_MOTORCONTROL_USER_MENU,
LOCALE_MOTORCONTROL_WEST_LIMIT,
LOCALE_MOVIEBROWSER_ASK_REC_TO_DELETE,
LOCALE_MOVIEBROWSER_BOOK_ADD,
LOCALE_MOVIEBROWSER_BOOK_CLEAR_ALL,
LOCALE_MOVIEBROWSER_BOOK_HEAD,
@@ -1215,6 +1216,7 @@ typedef enum
LOCALE_MOVIEBROWSER_BROWSER_ROW_ITEM,
LOCALE_MOVIEBROWSER_BROWSER_ROW_NR,
LOCALE_MOVIEBROWSER_BROWSER_ROW_WIDTH,
LOCALE_MOVIEBROWSER_DELETE_INFO,
LOCALE_MOVIEBROWSER_DIR,
LOCALE_MOVIEBROWSER_DIR_HEAD,
LOCALE_MOVIEBROWSER_EDIT_BOOK,
@@ -1476,10 +1478,13 @@ typedef enum
LOCALE_PICTUREVIEWER_HELP18,
LOCALE_PICTUREVIEWER_HELP19,
LOCALE_PICTUREVIEWER_HELP2,
LOCALE_PICTUREVIEWER_HELP20,
LOCALE_PICTUREVIEWER_HELP21,
LOCALE_PICTUREVIEWER_HELP22,
LOCALE_PICTUREVIEWER_HELP3,
LOCALE_PICTUREVIEWER_HELP30,
LOCALE_PICTUREVIEWER_HELP31,
LOCALE_PICTUREVIEWER_HELP32,
LOCALE_PICTUREVIEWER_HELP33,
LOCALE_PICTUREVIEWER_HELP34,
LOCALE_PICTUREVIEWER_HELP35,
LOCALE_PICTUREVIEWER_HELP4,
LOCALE_PICTUREVIEWER_HELP5,
LOCALE_PICTUREVIEWER_HELP6,

11
src/system/locals_intern.h
View File

@@ -1198,6 +1198,7 @@ const char * locale_real_names[] =
"motorcontrol.timed_mode",
"motorcontrol.user_menu",
"motorcontrol.west_limit",
"moviebrowser.ask_rec_to_delete",
"moviebrowser.book_add",
"moviebrowser.book_clear_all",
"moviebrowser.book_head",
@@ -1215,6 +1216,7 @@ const char * locale_real_names[] =
"moviebrowser.browser_row_item",
"moviebrowser.browser_row_nr",
"moviebrowser.browser_row_width",
"moviebrowser.delete_info",
"moviebrowser.dir",
"moviebrowser.dir_head",
"moviebrowser.edit_book",
@@ -1476,10 +1478,13 @@ const char * locale_real_names[] =
"pictureviewer.help18",
"pictureviewer.help19",
"pictureviewer.help2",
"pictureviewer.help20",
"pictureviewer.help21",
"pictureviewer.help22",
"pictureviewer.help3",
"pictureviewer.help30",
"pictureviewer.help31",
"pictureviewer.help32",
"pictureviewer.help33",
"pictureviewer.help34",
"pictureviewer.help35",
"pictureviewer.help4",
"pictureviewer.help5",
"pictureviewer.help6",

4
src/system/setting_helpers.cpp
View File

@@ -47,10 +47,6 @@
#include <sys/wait.h>
#include <sys/ioctl.h>
#if HAVE_COOL_HARDWARE
#include <coolstream/control.h>
#endif
#include <config.h>
#include <global.h>

1
src/system/settings.h
View File

@@ -68,6 +68,7 @@ struct SNeutrinoSettings
char record_safety_time_after[3];
int zapto_pre_time;
int infobar_sat_display;
int infobar_show_channeldesc;
int infobar_subchan_disp_pos;
int fan_speed;
int infobar_show;