mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 01:11:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

driver/pictureviewer/jpeg: remove server-based rescaling code

Browse Source 
Conflicts:
	src/system/settings.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: a99e8df965
Author: martii <m4rtii@gmx.de>
Date: 2013-12-24 (Tue, 24 Dec 2013)



------------------
This commit was generated by Migit
This commit is contained in:
martii
2013-12-24 10:13:15 +01:00
committed by [CST] Focus
parent 3726744448
commit 2778c51fa2
4 changed files with 20 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/neutrino.cpp
View File

@@ -737,7 +737,6 @@ int CNeutrinoApp::loadSetup(const char * fname)
//Picture-Viewer
g_settings.picviewer_slide_time = configfile.getInt32( "picviewer_slide_time", 10);
g_settings.picviewer_scaling = configfile.getInt32("picviewer_scaling", 1 /*(int)CPictureViewer::SIMPLE*/);
g_settings.picviewer_decode_server_ip = configfile.getString("picviewer_decode_server_ip", "");
//Audio-Player
g_settings.audioplayer_display = configfile.getInt32("audioplayer_display",(int)CAudioPlayerGui::ARTIST_TITLE);
@@ -1177,8 +1176,6 @@ void CNeutrinoApp::saveSetup(const char * fname)
//Picture-Viewer
configfile.setInt32( "picviewer_slide_time", g_settings.picviewer_slide_time);
configfile.setInt32( "picviewer_scaling", g_settings.picviewer_scaling );
configfile.setString( "picviewer_decode_server_ip", g_settings.picviewer_decode_server_ip );
configfile.setString( "picviewer_decode_server_port", g_settings.picviewer_decode_server_port);
//Audio-Player
configfile.setInt32( "audioplayer_display", g_settings.audioplayer_display );