mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 16:01:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

zapit/src/zapit.cpp: rename CONFIGFILE to ZAPITCONFIGFILE to avoid conflicts

Browse Source
This commit is contained in:
[CST] Focus
2015-01-15 15:16:39 +03:00
parent 935acf4f3c
commit 6876dcdf23
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/zapit/include/zapit/settings.h
View File

@@ -31,7 +31,7 @@
#define CONFIGDIR "/var/tuxbox/config" #define CONFIGDIR "/var/tuxbox/config"
#endif #endif
#define CONFIGFILE CONFIGDIR "/zapit/zapit.conf" #define ZAPITCONFIGFILE CONFIGDIR "/zapit/zapit.conf"
#define MOTORCONFIGFILE CONFIGDIR "/zapit/motor.conf" #define MOTORCONFIGFILE CONFIGDIR "/zapit/motor.conf"
#define SATCONFIG CONFIGDIR "/zapit/sat.conf" #define SATCONFIG CONFIGDIR "/zapit/sat.conf"
#define SERVICES_XML CONFIGDIR "/zapit/services.xml" #define SERVICES_XML CONFIGDIR "/zapit/services.xml"

6
src/zapit/src/zapit.cpp
View File

@@ -206,7 +206,7 @@ void CZapit::SaveSettings(bool write)
configfile.setInt32("motorRotationSpeed", config.motorRotationSpeed); configfile.setInt32("motorRotationSpeed", config.motorRotationSpeed);
#endif #endif
if (configfile.getModifiedFlag()) if (configfile.getModifiedFlag())
configfile.saveConfig(CONFIGFILE); configfile.saveConfig(ZAPITCONFIGFILE);
} }
} }
@@ -303,8 +303,8 @@ void CZapit::ClearVolumeMap()
void CZapit::LoadSettings() void CZapit::LoadSettings()
{ {
if (!configfile.loadConfig(CONFIGFILE)) if (!configfile.loadConfig(ZAPITCONFIGFILE))
WARN("%s not found", CONFIGFILE); WARN("%s not found", ZAPITCONFIGFILE);
live_channel_id = configfile.getInt64("lastChannel", 0); live_channel_id = configfile.getInt64("lastChannel", 0);
lastChannelRadio = configfile.getInt64("lastChannelRadio", 0); lastChannelRadio = configfile.getInt64("lastChannelRadio", 0);