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 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next

Browse Source 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/epgview.cpp
	src/neutrino.cpp
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4d898949e3
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-06 (Sat, 06 Aug 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-08-06 23:06:36 +02:00
parent 54155f4a28 8cd6181b9c
commit b679fea30f
13 changed files with 116 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/system/settings.h
View File

@@ -726,6 +726,8 @@ struct SNeutrinoSettings
int audioplayer_show_playlist;
int audioplayer_enable_sc_metadata;
std::string shoutcast_dev_id;
int shoutcast_enabled;
//Filebrowser
int filebrowser_showrights;
int filebrowser_sortmethod;
@@ -734,7 +736,9 @@ struct SNeutrinoSettings
//movieplayer
int movieplayer_repeat_on;
std::string youtube_dev_id;
int youtube_enabled;
std::string tmdb_api_key;
int tmdb_enabled;
//zapit setup
std::string StartChannelTV;