mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-30 08:51:10 +02:00
fixes for system/ytcache.cpp cherry-picks
This commit is contained in:
@@ -546,6 +546,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
|
||||
g_settings.network_nfs_moviedir = configfile.getString( "network_nfs_moviedir", "/media/sda1/movies" );
|
||||
g_settings.network_nfs_recordingdir = configfile.getString( "network_nfs_recordingdir", "/media/sda1/movies" );
|
||||
g_settings.timeshiftdir = configfile.getString( "timeshiftdir", "" );
|
||||
g_settings.downloadcache_dir = configfile.getString( "downloadcache_dir", g_settings.network_nfs_recordingdir.c_str());
|
||||
|
||||
g_settings.temp_timeshift = configfile.getInt32( "temp_timeshift", 0 );
|
||||
g_settings.auto_timeshift = configfile.getInt32( "auto_timeshift", 0 );
|
||||
@@ -1058,6 +1059,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
|
||||
configfile.setString( "network_nfs_moviedir", g_settings.network_nfs_moviedir);
|
||||
configfile.setString( "network_nfs_recordingdir", g_settings.network_nfs_recordingdir);
|
||||
configfile.setString( "timeshiftdir", g_settings.timeshiftdir);
|
||||
configfile.setString( "downloadcache_dir", g_settings.downloadcache_dir);
|
||||
configfile.setBool ("filesystem_is_utf8" , g_settings.filesystem_is_utf8 );
|
||||
|
||||
//recording (server + vcr)
|
||||
|
@@ -20,6 +20,10 @@
|
||||
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
#include "ytcache.h"
|
||||
#include <OpenThreads/ScopedLock>
|
||||
|
||||
|
@@ -17,6 +17,10 @@
|
||||
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <sys/stat.h>
|
||||
|
Reference in New Issue
Block a user