* reworked CA menu code

* added support for internal cardreaders for future conax support
* added inactivity shutdown timer for EuP
WARNING: new libcoolstream and libOpenThreads needed.



git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@925 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
focus
2010-12-07 10:00:52 +00:00
parent 987d09c77d
commit b8c1fa5cc1
35 changed files with 882 additions and 536 deletions

View File

@@ -578,6 +578,7 @@ typedef enum {
LOCALE_MISCSETTINGS_SHUTDOWN_COUNT,
LOCALE_MISCSETTINGS_SHUTDOWN_COUNT_HINT1,
LOCALE_MISCSETTINGS_SHUTDOWN_COUNT_HINT2,
LOCALE_MISCSETTINGS_SLEEPTIMER,
LOCALE_MISCSETTINGS_NOAVIAWATCHDOG,
LOCALE_MISCSETTINGS_NOENXWATCHDOG,
LOCALE_MISCSETTINGS_PMTUPDATE,
@@ -1041,7 +1042,9 @@ typedef enum {
LOCALE_SLEEPTIMERBOX_ANNOUNCE,
LOCALE_SLEEPTIMERBOX_HINT1,
LOCALE_SLEEPTIMERBOX_HINT2,
LOCALE_SLEEPTIMERBOX_HINT3,
LOCALE_SLEEPTIMERBOX_TITLE,
LOCALE_SLEEPTIMERBOX_TITLE2,
LOCALE_STREAMFEATURES_HEAD,
LOCALE_STREAMINFO_ARATIO,
LOCALE_STREAMINFO_ARATIO_UNKNOWN,
@@ -1417,15 +1420,24 @@ typedef enum {
LOCALE_VIDEOMODE_OK,
LOCALE_SCRAMBLED_CHANNEL,
LOCALE_NEUTRINO_STARTING,
LOCALE_CAM_SETTINGS,
LOCALE_CAM_EMPTY,
LOCACE_CAM_INSERTED,
LOCALE_CAM_REMOVED,
LOCALE_CAM_INIT_OK,
LOCALE_CAM_WAITING,
LOCALE_CAM_TIMEOUT,
LOCALE_CAM_RESET,
LOCALE_CAM_RESET_STANDBY,
LOCALE_CI_SETTINGS,
LOCALE_CI_EMPTY,
LOCALE_CI_INSERTED,
LOCALE_CI_REMOVED,
LOCALE_CI_INIT_OK,
LOCALE_CI_INIT_FAILED,
LOCALE_CI_WAITING,
LOCALE_CI_TIMEOUT,
LOCALE_CI_RESET,
LOCALE_CI_RESET_STANDBY,
LOCALE_SC_EMPTY,
LOCALE_SC_INSERTED,
LOCALE_SC_REMOVED,
LOCALE_SC_INIT_OK,
LOCALE_SC_INIT_FAILED,
LOCALE_SC_WAITING,
LOCALE_SC_TIMEOUT,
LOCALE_SC_RESET,
LOCALE_SUBTITLES_HEAD,
LOCALE_SUBTITLES_STOP,
LOCALE_FAN_SPEED,

View File

@@ -578,6 +578,7 @@ const char *locale_real_names[] = {
"miscsettings.shutdown_count",
"miscsettings.shutdown_count_hint1",
"miscsettings.shutdown_count_hint2",
"miscsettings.sleeptimer",
"miscsettings.noaviawatchdog",
"miscsettings.noenxwatchdog",
"miscsettings.pmtupdate",
@@ -1041,7 +1042,9 @@ const char *locale_real_names[] = {
"sleeptimerbox.announce",
"sleeptimerbox.hint1",
"sleeptimerbox.hint2",
"sleeptimerbox.hint3",
"sleeptimerbox.title",
"sleeptimerbox.title2",
"streamfeatures.head",
"streaminfo.aratio",
"streaminfo.aratio_unknown",
@@ -1417,15 +1420,24 @@ const char *locale_real_names[] = {
"video_mode_ok",
"scrambled_channel",
"neutrino_starting",
"cam.settings",
"cam.empty",
"cam.inserted",
"cam.removed",
"cam.init_ok",
"cam.waiting",
"cam.timeout",
"cam.reset",
"cam.reset_standby",
"ci.settings",
"ci.empty",
"ci.inserted",
"ci.removed",
"ci.init_ok",
"ci.init_failed",
"ci.waiting",
"ci.timeout",
"ci.reset",
"ci.reset_standby",
"sc.empty",
"sc.inserted",
"sc.removed",
"sc.init_ok",
"sc.init_failed",
"sc.waiting",
"sc.timeout",
"sc.reset",
"subtitles.head",
"subtitles.stop",
"fan_speed",

View File

@@ -56,6 +56,7 @@ struct SNeutrinoSettings
int shutdown_real;
int shutdown_real_rcdelay;
char shutdown_count[4];
int shutdown_min;
char record_safety_time_before[3];
char record_safety_time_after[3];
int infobar_sat_display;