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

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
J. Krieg
2018-11-13 20:45:06 +01:00
committed by Thilo Graf
parent fffa3d6963
commit 2c1a210d2f
2 changed files with 2 additions and 2 deletions

View File

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

View File

@@ -629,7 +629,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.network_nfs_recordingdir = configfile.getString( "network_nfs_recordingdir", "/media/sda1/movies" ); g_settings.network_nfs_recordingdir = configfile.getString( "network_nfs_recordingdir", "/media/sda1/movies" );
g_settings.timeshiftdir = configfile.getString( "timeshiftdir", "" ); g_settings.timeshiftdir = configfile.getString( "timeshiftdir", "" );
g_settings.downloadcache_dir = configfile.getString( "downloadcache_dir", g_settings.network_nfs_recordingdir.c_str()); 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", CONFIGDIR); 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", CONFIGDIR);
g_settings.temp_timeshift = configfile.getInt32( "temp_timeshift", 0 ); g_settings.temp_timeshift = configfile.getInt32( "temp_timeshift", 0 );