Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-04-17 06:32:36 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request from tryphon/configurable-tempdir

Browse Source 
Use rd.conf Tuning/TempDirectory as RDTempDir result when available
Pulled into master.  Thanks!
This commit is contained in:
Fred Gleason 2014-09-18 20:20:12 -04:00
commit ee4245c228
3 changed files with 13 additions and 0 deletions

4
lib/rdconf.cpp

@ -968,6 +968,10 @@ QString RDHomeDir()
QString RDTempDir()
{
QString conf_temp_directory = RDConfiguration()->tempDirectory();
if (conf_temp_directory != NULL) {
return conf_temp_directory;
}
#ifdef WIN32
if(getenv("TEMP")!=NULL) {
return QString(getenv("TEMP"));

7
lib/rdconfig.cpp

@ -354,6 +354,11 @@ int RDConfig::realtimePriority()
return conf_realtime_priority;
}
// Don't use this method in application code, use RDTempDirectory()
QString RDConfig::tempDirectory()
{
return conf_temp_directory;
}
QString RDConfig::sasStation() const
{
@ -485,6 +490,7 @@ void RDConfig::load()
conf_enable_mixer_logging=profile->boolValue("Caed","EnableMixerLogging");
conf_use_realtime=profile->boolValue("Tuning","UseRealtime",false);
conf_realtime_priority=profile->intValue("Tuning","RealtimePriority",9);
conf_temp_directory=profile->stringValue("Tuning","TempDirectory",NULL);
conf_sas_station=profile->stringValue("SASFilter","Station","");
conf_sas_matrix=profile->intValue("SASFilter","Matrix",0);
conf_sas_base_cart=profile->intValue("SASFilter","BaseCart",0);
@ -554,6 +560,7 @@ void RDConfig::clear()
conf_enable_mixer_logging=false;
conf_use_realtime=false;
conf_realtime_priority=9;
conf_temp_directory=NULL;
conf_sas_station="";
conf_sas_matrix=-1;
conf_sas_base_cart=1;

2
lib/rdconfig.h

@ -97,6 +97,7 @@ class RDConfig
#endif
bool useRealtime();
int realtimePriority();
QString tempDirectory();
QString sasStation() const;
int sasMatrix() const;
unsigned sasBaseCart() const;
@ -148,6 +149,7 @@ class RDConfig
bool conf_enable_mixer_logging;
bool conf_use_realtime;
int conf_realtime_priority;
QString conf_temp_directory;
QString conf_sas_station;
int conf_sas_matrix;
unsigned conf_sas_base_cart;