mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-30 17:01:15 +02:00
webtv: switch default webtv paths from CONFIGDIR to WEBRADIODIR_VAR (specified by configure)
Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
@@ -28,7 +28,7 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <gui/widget/menue.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"
|
#define WEBRADIO_XML WEBRADIODIR_VAR "/webradio_usr.xml"
|
||||||
|
|
||||||
class CWebTVSetup : public CMenuTarget, CChangeObserver
|
class CWebTVSetup : public CMenuTarget, CChangeObserver
|
||||||
|
@@ -630,7 +630,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
|
|||||||
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", WEBRADIODIR_VAR);
|
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", 0 );
|
g_settings.temp_timeshift = configfile.getInt32( "temp_timeshift", 0 );
|
||||||
g_settings.auto_timeshift = configfile.getInt32( "auto_timeshift", 0 );
|
g_settings.auto_timeshift = configfile.getInt32( "auto_timeshift", 0 );
|
||||||
|
Reference in New Issue
Block a user