diff --git a/ChangeLog b/ChangeLog index a9acfcd6..d4b2fcef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16716,3 +16716,5 @@ of rd.conf(5). 2018-10-17 Fred Gleason * Incremented the package version to 2.19.2int06. +2018-10-17 Fred Gleason + * Fixed a bug that broke the build under Windows. diff --git a/lib/rdconfig.cpp b/lib/rdconfig.cpp index 9aa2ec5b..1ad01a97 100644 --- a/lib/rdconfig.cpp +++ b/lib/rdconfig.cpp @@ -2,7 +2,7 @@ // // A container class for a Rivendell Base Configuration // -// (C) Copyright 2002-2004,2016-2017 Fred Gleason +// (C) Copyright 2002-2018 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -473,10 +473,13 @@ int RDConfig::transcodingDelay() const } +#ifndef WIN32 mode_t RDConfig::tuningExportedFileMode() const { return conf_tuning_exported_file_mode; } +#endif // WIN32 + // Don't use this method in application code, use RDTempDirectory() QString RDConfig::tempDirectory() @@ -645,10 +648,12 @@ void RDConfig::load() conf_use_realtime=profile->boolValue("Tuning","UseRealtime",false); conf_realtime_priority=profile->intValue("Tuning","RealtimePriority",9); conf_transcoding_delay=profile->intValue("Tuning","TranscodingDelay"); +#ifndef WIN32 conf_tuning_exported_file_mode=profile-> stringValue("Tuning","ExportedFileMode", QString().sprintf("%o",RD_TUNING_DEFAULT_EXPORTED_FILE_MODE)). toInt(NULL,8); +#endif // WIN32 conf_temp_directory=profile->stringValue("Tuning","TempDirectory",""); conf_sas_station=profile->stringValue("SASFilter","Station",""); conf_sas_matrix=profile->intValue("SASFilter","Matrix",0); @@ -759,7 +764,9 @@ void RDConfig::clear() conf_enable_mixer_logging=false; conf_use_realtime=false; conf_realtime_priority=9; +#ifndef WIN32 conf_tuning_exported_file_mode=RD_TUNING_DEFAULT_EXPORTED_FILE_MODE; +#endif // WIN32 conf_transcoding_delay=0; conf_temp_directory=""; conf_sas_station=""; diff --git a/lib/rdconfig.h b/lib/rdconfig.h index 1b787f36..9014fdef 100644 --- a/lib/rdconfig.h +++ b/lib/rdconfig.h @@ -113,7 +113,9 @@ class RDConfig bool useRealtime(); int realtimePriority(); int transcodingDelay() const; +#ifndef WIN32 mode_t tuningExportedFileMode() const; +#endif // WIN32 QString tempDirectory(); QString sasStation() const; int sasMatrix() const; @@ -177,11 +179,11 @@ class RDConfig #ifndef WIN32 uid_t conf_uid; gid_t conf_gid; + mode_t conf_tuning_exported_file_mode; #endif QString conf_cae_logfile; bool conf_enable_mixer_logging; bool conf_use_realtime; - mode_t conf_tuning_exported_file_mode; int conf_transcoding_delay; int conf_realtime_priority; QString conf_temp_directory;