Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2026-01-10 22:56:01 +01:00
Code Issues Projects Releases Wiki Activity

2018-10-17 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a bug that broke the build under Windows.
This commit is contained in:
Fred Gleason
2018-10-17 15:14:53 -04:00
parent 0af3398c2b
commit d2b53a3216
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -16716,3 +16716,5 @@
of rd.conf(5). of rd.conf(5).
2018-10-17 Fred Gleason <fredg@paravelsystems.com> 2018-10-17 Fred Gleason <fredg@paravelsystems.com>
* Incremented the package version to 2.19.2int06. * Incremented the package version to 2.19.2int06.
2018-10-17 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug that broke the build under Windows.

9
lib/rdconfig.cpp
View File

@@ -2,7 +2,7 @@
// //
// A container class for a Rivendell Base Configuration // A container class for a Rivendell Base Configuration
// //
// (C) Copyright 2002-2004,2016-2017 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2002-2018 Fred Gleason <fredg@paravelsystems.com>
// //
// This program is free software; you can redistribute it and/or modify // 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 // 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 mode_t RDConfig::tuningExportedFileMode() const
{ {
return conf_tuning_exported_file_mode; return conf_tuning_exported_file_mode;
} }
#endif // WIN32
// Don't use this method in application code, use RDTempDirectory() // Don't use this method in application code, use RDTempDirectory()
QString RDConfig::tempDirectory() QString RDConfig::tempDirectory()
@@ -645,10 +648,12 @@ void RDConfig::load()
conf_use_realtime=profile->boolValue("Tuning","UseRealtime",false); conf_use_realtime=profile->boolValue("Tuning","UseRealtime",false);
conf_realtime_priority=profile->intValue("Tuning","RealtimePriority",9); conf_realtime_priority=profile->intValue("Tuning","RealtimePriority",9);
conf_transcoding_delay=profile->intValue("Tuning","TranscodingDelay"); conf_transcoding_delay=profile->intValue("Tuning","TranscodingDelay");
#ifndef WIN32
conf_tuning_exported_file_mode=profile-> conf_tuning_exported_file_mode=profile->
stringValue("Tuning","ExportedFileMode", stringValue("Tuning","ExportedFileMode",
QString().sprintf("%o",RD_TUNING_DEFAULT_EXPORTED_FILE_MODE)). QString().sprintf("%o",RD_TUNING_DEFAULT_EXPORTED_FILE_MODE)).
toInt(NULL,8); toInt(NULL,8);
#endif // WIN32
conf_temp_directory=profile->stringValue("Tuning","TempDirectory",""); conf_temp_directory=profile->stringValue("Tuning","TempDirectory","");
conf_sas_station=profile->stringValue("SASFilter","Station",""); conf_sas_station=profile->stringValue("SASFilter","Station","");
conf_sas_matrix=profile->intValue("SASFilter","Matrix",0); conf_sas_matrix=profile->intValue("SASFilter","Matrix",0);
@@ -759,7 +764,9 @@ void RDConfig::clear()
conf_enable_mixer_logging=false; conf_enable_mixer_logging=false;
conf_use_realtime=false; conf_use_realtime=false;
conf_realtime_priority=9; conf_realtime_priority=9;
#ifndef WIN32
conf_tuning_exported_file_mode=RD_TUNING_DEFAULT_EXPORTED_FILE_MODE; conf_tuning_exported_file_mode=RD_TUNING_DEFAULT_EXPORTED_FILE_MODE;
#endif // WIN32
conf_transcoding_delay=0; conf_transcoding_delay=0;
conf_temp_directory=""; conf_temp_directory="";
conf_sas_station=""; conf_sas_station="";

4
lib/rdconfig.h
View File

@@ -113,7 +113,9 @@ class RDConfig
bool useRealtime(); bool useRealtime();
int realtimePriority(); int realtimePriority();
int transcodingDelay() const; int transcodingDelay() const;
#ifndef WIN32
mode_t tuningExportedFileMode() const; mode_t tuningExportedFileMode() const;
#endif // WIN32
QString tempDirectory(); QString tempDirectory();
QString sasStation() const; QString sasStation() const;
int sasMatrix() const; int sasMatrix() const;
@@ -177,11 +179,11 @@ class RDConfig
#ifndef WIN32 #ifndef WIN32
uid_t conf_uid; uid_t conf_uid;
gid_t conf_gid; gid_t conf_gid;
mode_t conf_tuning_exported_file_mode;
#endif #endif
QString conf_cae_logfile; QString conf_cae_logfile;
bool conf_enable_mixer_logging; bool conf_enable_mixer_logging;
bool conf_use_realtime; bool conf_use_realtime;
mode_t conf_tuning_exported_file_mode;
int conf_transcoding_delay; int conf_transcoding_delay;
int conf_realtime_priority; int conf_realtime_priority;
QString conf_temp_directory; QString conf_temp_directory;