- movieplayer: allow to display plackback time instead of movietitle on vfd

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/neutrino.cpp
	src/system/locals.h
	src/system/locals_intern.h
	src/system/settings.h

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2018-02-27 00:54:05 +01:00
committed by Thilo Graf
parent 0c5485d4ca
commit 6ad2ca6a46
9 changed files with 49 additions and 7 deletions

View File

@@ -875,6 +875,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
//Movie-Player
g_settings.movieplayer_repeat_on = configfile.getInt32("movieplayer_repeat_on", CMoviePlayerGui::REPEAT_OFF);
g_settings.youtube_dev_id = configfile.getString("youtube_dev_id","XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX");
g_settings.movieplayer_display_playtime = configfile.getInt32("movieplayer_display_playtime", 0);
g_settings.youtube_enabled = configfile.getInt32("youtube_enabled", 1);
g_settings.youtube_enabled = g_settings.youtube_enabled && check_youtube_dev_id();
g_settings.tmdb_api_key = configfile.getString("tmdb_api_key","XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX");
@@ -1496,6 +1497,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
//Movie-Player
configfile.setInt32( "movieplayer_repeat_on", g_settings.movieplayer_repeat_on );
configfile.setInt32( "movieplayer_display_playtime", g_settings.movieplayer_display_playtime );
configfile.setString( "youtube_dev_id", g_settings.youtube_dev_id );
configfile.setInt32( "youtube_enabled", g_settings.youtube_enabled );
configfile.setString( "tmdb_api_key", g_settings.tmdb_api_key );