mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 10:21:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/system/settings.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: a19fc5532b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-22 (Tue, 22 Nov 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-11-22 23:45:32 +01:00
parent f57041a98b 99b59f1641
commit 0b8c62cd41
15 changed files with 42 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/system/settings.h
View File

@@ -413,6 +413,7 @@ struct SNeutrinoSettings
TIMING_VOLUMEBAR = 6,
TIMING_FILEBROWSER = 7,
TIMING_NUMERICZAP = 8,
TIMING_POPUP_MESSAGES = 9,
TIMING_SETTING_COUNT
};
@@ -929,7 +930,8 @@ const time_settings_struct_t timing_setting[SNeutrinoSettings::TIMING_SETTING_CO
{ 6, LOCALE_TIMING_INFOBAR_MOVIEPLAYER},
{ 3, LOCALE_TIMING_VOLUMEBAR },
{ 180, LOCALE_TIMING_FILEBROWSER }, //NI
{ 3, LOCALE_TIMING_NUMERICZAP }
{ 3, LOCALE_TIMING_NUMERICZAP },
{ 6, LOCALE_TIMING_POPUP_MESSAGES}
};
// lcdd