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

*neutrino infobar: add extra timeout setting for radiomode

Browse Source 
moved single arrays named "default_timing" and "timing_setting_name" into
struct named "timing_setting"

This is a partial port from original Neutrino,
The default timeout for radiomode is 0 (no timeout), this timeout
has more sense e.g. with radiotext

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1504 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
thilo
2011-06-03 00:14:31 +00:00
parent 9609466f48
commit a512a15781
10 changed files with 59 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/system/locals.h
View File

@@ -1426,6 +1426,7 @@ typedef enum
LOCALE_TIMING_HINT_1,
LOCALE_TIMING_HINT_2,
LOCALE_TIMING_INFOBAR,
LOCALE_TIMING_INFOBAR_RADIO,
LOCALE_TIMING_MENU,
LOCALE_TIMING_NUMERICZAP,
LOCALE_UCODECHECK_AVIA500,

1
src/system/locals_intern.h
View File

@@ -1426,6 +1426,7 @@ const char * locale_real_names[] =
"timing.hint_1",
"timing.hint_2",
"timing.infobar",
"timing.infobar_radio",
"timing.menu",
"timing.numericzap",
"ucodecheck.avia500",

4
src/system/setting_helpers.cpp
View File

@@ -566,9 +566,9 @@ bool CConsoleDestChangeNotifier::changeNotify(const neutrino_locale_t, void * Da
bool CTimingSettingsNotifier::changeNotify(const neutrino_locale_t OptionName, void *)
{
for (int i = 0; i < TIMING_SETTING_COUNT; i++)
for (int i = 0; i < SNeutrinoSettings::TIMING_SETTING_COUNT; i++)
{
if (ARE_LOCALES_EQUAL(OptionName, timing_setting_name[i]))
if (ARE_LOCALES_EQUAL(OptionName, timing_setting[i].name))
{
g_settings.timing[i] = atoi(g_settings.timing_string[i]);
return true;

21
src/system/settings.cpp
View File

@@ -27,27 +27,6 @@
#include <zapit/settings.h>
#include <zapit/satconfig.h>
const int default_timing[TIMING_SETTING_COUNT] =
{
0,
60,
240,
6,
60,
3
};
const neutrino_locale_t timing_setting_name[TIMING_SETTING_COUNT] =
{
LOCALE_TIMING_MENU,
LOCALE_TIMING_CHANLIST,
LOCALE_TIMING_EPG,
LOCALE_TIMING_INFOBAR,
LOCALE_TIMING_FILEBROWSER,
LOCALE_TIMING_NUMERICZAP
};
CScanSettings::CScanSettings(void)
: configfile('\t')
{

31
src/system/settings.h
View File

@@ -129,14 +129,18 @@ struct SNeutrinoSettings
char ifname[10];
//timing
#define TIMING_SETTING_COUNT 6
enum TIMING_SETTINGS {
TIMING_MENU = 0,
TIMING_CHANLIST = 1,
TIMING_EPG = 2,
TIMING_INFOBAR = 3,
TIMING_FILEBROWSER = 4,
TIMING_NUMERICZAP = 5
TIMING_INFOBAR_RADIO = 4,
// TIMING_INFOBAR_MOVIEPLAYER,
// TIMING_VOLUMEBAR,
TIMING_FILEBROWSER = 5,
TIMING_NUMERICZAP = 6,
TIMING_SETTING_COUNT
};
int timing [TIMING_SETTING_COUNT] ;
@@ -513,8 +517,24 @@ struct SNeutrinoSettings
/* some default Values */
extern const int default_timing [TIMING_SETTING_COUNT];
extern const neutrino_locale_t timing_setting_name[TIMING_SETTING_COUNT];
typedef struct time_settings_t
{
const int default_timing;
const neutrino_locale_t name;
} time_settings_struct_t;
const time_settings_struct_t timing_setting[SNeutrinoSettings::TIMING_SETTING_COUNT] =
{
{ 0, LOCALE_TIMING_MENU },
{ 60, LOCALE_TIMING_CHANLIST },
{ 240, LOCALE_TIMING_EPG },
{ 6, LOCALE_TIMING_INFOBAR },
{ 0, LOCALE_TIMING_INFOBAR_RADIO },
// { 6, LOCALE_TIMING_INFOBAR_MOVIEPLAYER},
// { 3, LOCALE_TIMING_VOLUMEBAR },
{ 60, LOCALE_TIMING_FILEBROWSER },
{ 3, LOCALE_TIMING_NUMERICZAP }
};
// lcdd
#define DEFAULT_VFD_BRIGHTNESS 15
@@ -543,6 +563,7 @@ extern const neutrino_locale_t timing_setting_name[TIMING_SETTING_COUNT];
/* end default values */
struct SglobalInfo
{
unsigned char box_Type;