Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-08-01 08:29:41 +02:00
Code Issues Projects Releases Wiki Activity

2021-08-25 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Added a 'SuppressMusicImportLinks=' directive to the [Hacks]
	section of rd.conf(5).

Signed-off-by: Fred Gleason <fredg@paraelsystems.com>
This commit is contained in:
Fred Gleason 2021-08-25 14:17:11 -04:00
parent f7cbfa59db
commit b1cdb4e87b
5 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -20781,3 +20781,6 @@
the '--set-string-title=' switch was used. the '--set-string-title=' switch was used.
2021-07-30 Fred Gleason <fredg@paravelsystems.com> 2021-07-30 Fred Gleason <fredg@paravelsystems.com>
* Incremented the package version to 3.6.2. * Incremented the package version to 3.6.2.
2021-08-25 Fred Gleason <fredg@paravelsystems.com>
* Added a 'SuppressMusicImportLinks=' directive to the [Hacks]
section of rd.conf(5).

4
conf/rd.conf-sample
View File

@ -176,3 +176,7 @@ TranscodingDelay=0
; dropboxes configured. Rivendell imposes a hard limit of 999 on this ; dropboxes configured. Rivendell imposes a hard limit of 999 on this
; setting. ; setting.
; MeterPortRange=100 ; MeterPortRange=100
; Suppress the generation of Music Link Markers in logs, even if the
; 'Include Import Markers in Finished Logs' box is checked in rdadmin(1).
; SuppressMusicImportLinks=No

12
lib/rdconfig.cpp
View File

@ -382,6 +382,12 @@ bool RDConfig::lockRdairplayMemory() const
} }
bool RDConfig::suppressMusicImportLinks() const
{
return conf_suppress_music_import_links;
}
int RDConfig::meterBasePort() const int RDConfig::meterBasePort() const
{ {
return conf_meter_base_port; return conf_meter_base_port;
@ -600,8 +606,13 @@ bool RDConfig::load()
conf_disable_maint_checks= conf_disable_maint_checks=
profile->boolValue("Hacks","DisableMaintChecks",false); profile->boolValue("Hacks","DisableMaintChecks",false);
conf_suppress_music_import_links=
profile->boolValue("Hacks","SuppressMusicImportLinks",false);
conf_lock_rdairplay_memory= conf_lock_rdairplay_memory=
profile->boolValue("Hacks","LockRdairplayMemory",false); profile->boolValue("Hacks","LockRdairplayMemory",false);
conf_meter_base_port= conf_meter_base_port=
profile->intValue("Hacks","MeterPortBaseNumber",RD_DEFAULT_METER_SOCKET_BASE_UDP_PORT); profile->intValue("Hacks","MeterPortBaseNumber",RD_DEFAULT_METER_SOCKET_BASE_UDP_PORT);
conf_meter_port_range= conf_meter_port_range=
@ -728,6 +739,7 @@ void RDConfig::clear()
conf_jack_ports[0].clear(); conf_jack_ports[0].clear();
conf_jack_ports[1].clear(); conf_jack_ports[1].clear();
conf_disable_maint_checks=false; conf_disable_maint_checks=false;
conf_suppress_music_import_links=false;
conf_lock_rdairplay_memory=false; conf_lock_rdairplay_memory=false;
conf_meter_base_port=RD_DEFAULT_METER_SOCKET_BASE_UDP_PORT; conf_meter_base_port=RD_DEFAULT_METER_SOCKET_BASE_UDP_PORT;
conf_meter_port_range=RD_METER_SOCKET_PORT_RANGE; conf_meter_port_range=RD_METER_SOCKET_PORT_RANGE;

2
lib/rdconfig.h
View File

@ -100,6 +100,7 @@ class RDConfig
QString jackPort(int num,int endpt) const; QString jackPort(int num,int endpt) const;
bool disableMaintChecks() const; bool disableMaintChecks() const;
bool lockRdairplayMemory() const; bool lockRdairplayMemory() const;
bool suppressMusicImportLinks() const;
int meterBasePort() const; int meterBasePort() const;
int meterPortRange() const; int meterPortRange() const;
bool enableMixerLogging() const; bool enableMixerLogging() const;
@ -172,6 +173,7 @@ class RDConfig
QString conf_http_user_agent; QString conf_http_user_agent;
bool conf_disable_maint_checks; bool conf_disable_maint_checks;
bool conf_lock_rdairplay_memory; bool conf_lock_rdairplay_memory;
bool conf_suppress_music_import_links;
int conf_meter_base_port; int conf_meter_base_port;
int conf_meter_port_range; int conf_meter_port_range;
std::vector<QString> conf_jack_ports[2]; std::vector<QString> conf_jack_ports[2];

7
lib/rdevent_line.cpp
View File

@ -2,7 +2,7 @@
// //
// Abstract a Rivendell Log Manager Event // Abstract a Rivendell Log Manager Event
// //
// (C) Copyright 2002-2020 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2002-2021 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
@ -21,6 +21,7 @@
#include <qobject.h> #include <qobject.h>
#include <q3textstream.h> #include <q3textstream.h>
#include "rdapplication.h"
#include "rdconf.h" #include "rdconf.h"
#include "rdcart.h" #include "rdcart.h"
#include "rddb.h" #include "rddb.h"
@ -948,7 +949,9 @@ bool RDEventLine::linkLog(RDLogEvent *e,RDLog *log,const QString &svcname,
// //
// Insert Parent Link // Insert Parent Link
// //
if(log->includeImportMarkers()) { if(log->includeImportMarkers()&&
!(rda->config()->suppressMusicImportLinks()&&
(event_import_source==RDEventLine::Music))) {
e->insert(e->size(),1); e->insert(e->size(),1);
logline=new RDLogLine(); logline=new RDLogLine();
*logline=*link_logline; *logline=*link_logline;