webtv: switch default webtv paths from CONFIGDIR to WEBRADIODIR_VAR (specified by configure)

Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 84f2233b2e
Author: J. Krieg <bellum07@googlemail.com>
Date: 2018-11-22 (Thu, 22 Nov 2018)



------------------
This commit was generated by Migit
This commit is contained in:
J. Krieg
2018-11-22 00:00:28 +01:00
committed by vanhofen
parent 199813136d
commit d7c06c3f69
2 changed files with 2 additions and 2 deletions

View File

@@ -28,7 +28,7 @@
#include <string.h>
#include <gui/widget/menue.h>
#define WEBTV_XML CONFIGDIR "/webtv_usr.xml"
#define WEBTV_XML WEBTVDIR_VAR "/webtv_usr.xml"
#define WEBRADIO_XML WEBRADIODIR_VAR "/webradio_usr.xml"
class CWebTVSetup : public CMenuTarget, CChangeObserver

View File

@@ -685,7 +685,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.timeshiftdir = configfile.getString( "timeshiftdir", "" );
g_settings.downloadcache_dir = configfile.getString( "downloadcache_dir", g_settings.network_nfs_recordingdir.c_str());
g_settings.last_webradio_dir = configfile.getString( "last_webradio_dir", WEBRADIODIR_VAR);
g_settings.last_webtv_dir = configfile.getString( "last_webtv_dir", CONFIGDIR);
g_settings.last_webtv_dir = configfile.getString( "last_webtv_dir", WEBTVDIR_VAR);
g_settings.temp_timeshift = configfile.getInt32( "temp_timeshift", 1 ); //NI
g_settings.auto_timeshift = configfile.getInt32( "auto_timeshift", 0 );