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

- screensaver: remove audioplayer_screensaver; add screensaver_delay

Browse Source
This commit is contained in:
svenhoefer
2014-12-29 21:53:50 +01:00
parent 9d34d4ba97
commit df18f1f4e5
9 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/system/locals.h
View File

@@ -200,7 +200,6 @@ typedef enum
LOCALE_AUDIOPLAYER_REPEAT_ON,
LOCALE_AUDIOPLAYER_REWIND,
LOCALE_AUDIOPLAYER_SAVE_PLAYLIST,
LOCALE_AUDIOPLAYER_SCREENSAVER_TIMEOUT,
LOCALE_AUDIOPLAYER_SELECT_TITLE_BY_NAME,
LOCALE_AUDIOPLAYER_SHOW_PLAYLIST,
LOCALE_AUDIOPLAYER_SHUFFLE,
@@ -938,7 +937,6 @@ typedef enum
LOCALE_MENU_HINT_AUDIOPLAYER_PLAYLIST,
LOCALE_MENU_HINT_AUDIOPLAYER_REPEAT,
LOCALE_MENU_HINT_AUDIOPLAYER_SC_METADATA,
LOCALE_MENU_HINT_AUDIOPLAYER_SCREENSAVER,
LOCALE_MENU_HINT_AUDIOPLAYER_TITLE,
LOCALE_MENU_HINT_AUTO_LANG,
LOCALE_MENU_HINT_AUTO_SUBS,
@@ -1317,6 +1315,7 @@ typedef enum
LOCALE_MENU_HINT_SCAN_USEUSALS,
LOCALE_MENU_HINT_SCRAMBLED_MESSAGE,
LOCALE_MENU_HINT_SCREEN_SETUP,
LOCALE_MENU_HINT_SCREENSAVER_DELAY,
LOCALE_MENU_HINT_SCREENSAVER_DIR,
LOCALE_MENU_HINT_SCREENSAVER_TIMEOUT,
LOCALE_MENU_HINT_SCREENSAVER_SETUP,
@@ -2086,6 +2085,7 @@ typedef enum
LOCALE_SCANTS_TEST,
LOCALE_SCANTS_TRANSPONDERS,
LOCALE_SCRAMBLED_CHANNEL,
LOCALE_SCREENSAVER_DELAY,
LOCALE_SCREENSAVER_DIR,
LOCALE_SCREENSAVER_MENU,
LOCALE_SCREENSAVER_TIMEOUT,

4
src/system/locals_intern.h
View File

@@ -200,7 +200,6 @@ const char * locale_real_names[] =
"audioplayer.repeat_on",
"audioplayer.rewind",
"audioplayer.save_playlist",
"audioplayer.screensaver_timeout",
"audioplayer.select_title_by_name",
"audioplayer.show_playlist",
"audioplayer.shuffle",
@@ -938,7 +937,6 @@ const char * locale_real_names[] =
"menu.hint_audioplayer_playlist",
"menu.hint_audioplayer_repeat",
"menu.hint_audioplayer_sc_metadata",
"menu.hint_audioplayer_screensaver",
"menu.hint_audioplayer_title",
"menu.hint_auto_lang",
"menu.hint_auto_subs",
@@ -1317,6 +1315,7 @@ const char * locale_real_names[] =
"menu.hint_scan_useusals",
"menu.hint_scrambled_message",
"menu.hint_screen_setup",
"menu.hint_screensaver_delay",
"menu.hint_screensaver_dir",
"menu.hint_screensaver_timeout",
"menu.hint_screensaver_setup",
@@ -2086,6 +2085,7 @@ const char * locale_real_names[] =
"scants.test",
"scants.transponders",
"scrambled_channel",
"screensaver.delay",
"screensaver.dir",
"screensaver.menu",
"screensaver.timeout",

2
src/system/settings.h
View File

@@ -207,6 +207,7 @@ struct SNeutrinoSettings
int easymenu;
//screen saver
int screensaver_delay;
std::string screensaver_dir;
int screensaver_timeout;
@@ -656,7 +657,6 @@ struct SNeutrinoSettings
//audioplayer
int audioplayer_display;
int audioplayer_follow;
int audioplayer_screensaver;
int audioplayer_highprio;
int audioplayer_select_title_by_name;
int audioplayer_repeat_on;