Merged 'stable'

This commit is contained in:
Fred Gleason
2018-08-23 16:02:45 +00:00
24 changed files with 1100 additions and 84 deletions

View File

@@ -110,6 +110,7 @@ class RDConfig
#endif
bool useRealtime();
int realtimePriority();
int transcodingDelay() const;
QString tempDirectory();
QString sasStation() const;
int sasMatrix() const;
@@ -180,6 +181,7 @@ class RDConfig
QString conf_cae_logfile;
bool conf_enable_mixer_logging;
bool conf_use_realtime;
int conf_transcoding_delay;
int conf_realtime_priority;
QString conf_temp_directory;
QString conf_sas_station;