Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-12-05 16:20:14 +01:00
Code Issues Projects Releases Wiki Activity

2023-11-03 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Prepended the string '[mixer]' to all syslog entries generated
	as a result of enabling the 'EnableMixerLogging=' directive in
	rd.conf(5).

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2023-11-03 11:46:35 -04:00
parent c9953bffe2
commit a77b960345
2 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -24440,3 +24440,7 @@
'RDCoreApplication::ExitCode' enumeration. 'RDCoreApplication::ExitCode' enumeration.
* Refactored the 'RDCae' class to use the native BSD sockets API * Refactored the 'RDCae' class to use the native BSD sockets API
instead of 'QTcpSocket'. instead of 'QTcpSocket'.
2023-11-03 Fred Gleason <fredg@paravelsystems.com>
* Prepended the string '[mixer]' to all syslog entries generated
as a result of enabling the 'EnableMixerLogging=' directive in
rd.conf(5).

26
cae/cae.cpp
View File

@@ -320,7 +320,7 @@ MainObject::MainObject(QObject *parent)
} }
*/ */
if(rda->config()->enableMixerLogging()) { if(rda->config()->enableMixerLogging()) {
rda->syslog(LOG_INFO,"mixer logging enabled"); rda->syslog(LOG_INFO,"[mixer] logging enabled");
} }
if(rda->config()->testOutputStreams()) { if(rda->config()->testOutputStreams()) {
rda->syslog(LOG_INFO,"output stream testing enabled"); rda->syslog(LOG_INFO,"output stream testing enabled");
@@ -672,7 +672,7 @@ void MainObject::setInputVolumeData(int id,unsigned card,unsigned stream,
} }
if(rda->config()->enableMixerLogging()) { if(rda->config()->enableMixerLogging()) {
rda->syslog(LOG_INFO, rda->syslog(LOG_INFO,
"SetInputVolume - Card: %d Stream: %d Level: %d", "[mixer] SetInputVolume - Card: %d Stream: %d Level: %d",
card,stream,level); card,stream,level);
} }
cae_server-> cae_server->
@@ -701,7 +701,7 @@ void MainObject::setOutputPortData(int id,unsigned card,unsigned stream,
} }
if(rda->config()->enableMixerLogging()) { if(rda->config()->enableMixerLogging()) {
rda->syslog(LOG_INFO, rda->syslog(LOG_INFO,
"SetOutputPort - Card: %d Stream: %d Port: %d Level: %d", "[mixer] SetOutputPort - Card: %d Stream: %d Port: %d Level: %d",
card,stream,port,level); card,stream,port,level);
} }
} }
@@ -735,7 +735,7 @@ void MainObject::setOutputVolumeData(int id,unsigned card,unsigned stream,
} }
if(rda->config()->enableMixerLogging()) { if(rda->config()->enableMixerLogging()) {
rda->syslog(LOG_INFO, rda->syslog(LOG_INFO,
"SetOutputVolume - Card: %d Stream: %d Port: %d Level: %d", "[mixer] SetOutputVolume - Card: %d Stream: %d Port: %d Level: %d",
card,stream,port,level); card,stream,port,level);
} }
} }
@@ -764,7 +764,7 @@ void MainObject::fadeOutputVolumeData(int id,unsigned card,unsigned stream,
} }
if(rda->config()->enableMixerLogging()) { if(rda->config()->enableMixerLogging()) {
rda->syslog(LOG_INFO, rda->syslog(LOG_INFO,
"FadeOutputVolume - Card: %d Stream: %d Port: %d Level: %d Length: %d", "[mixer] FadeOutputVolume - Card: %d Stream: %d Port: %d Level: %d Length: %d",
card,stream,port,level,length); card,stream,port,level,length);
} }
} }
@@ -792,7 +792,7 @@ void MainObject::setInputLevelData(int id,unsigned card,unsigned port,
} }
if(rda->config()->enableMixerLogging()) { if(rda->config()->enableMixerLogging()) {
rda->syslog(LOG_INFO, rda->syslog(LOG_INFO,
"SetInputLevel - Card: %d Port: %d Level: %d", "[mixer] SetInputLevel - Card: %d Port: %d Level: %d",
card,port,level); card,port,level);
} }
cae_server->sendCommand(id,QString::asprintf("IL %u %u %d +!", cae_server->sendCommand(id,QString::asprintf("IL %u %u %d +!",
@@ -817,7 +817,7 @@ void MainObject::setOutputLevelData(int id,unsigned card,unsigned port,
} }
if(rda->config()->enableMixerLogging()) { if(rda->config()->enableMixerLogging()) {
rda->syslog(LOG_INFO, rda->syslog(LOG_INFO,
"SetOutputLevel - Card: %d Port: %d Level: %d", "[mixer] SetOutputLevel - Card: %d Port: %d Level: %d",
card,port,level); card,port,level);
} }
cae_server->sendCommand(id,QString::asprintf("OL %u %u %d +!", cae_server->sendCommand(id,QString::asprintf("OL %u %u %d +!",
@@ -842,7 +842,7 @@ void MainObject::setInputModeData(int id,unsigned card,unsigned stream,
} }
if(rda->config()->enableMixerLogging()) { if(rda->config()->enableMixerLogging()) {
rda->syslog(LOG_INFO, rda->syslog(LOG_INFO,
"SetInputMode - Card: %d Stream: %d Mode: %d", "[mixer] SetInputMode - Card: %d Stream: %d Mode: %d",
card,stream,mode); card,stream,mode);
} }
cae_server->sendCommand(id,QString::asprintf("IM %u %u %u +!", cae_server->sendCommand(id,QString::asprintf("IM %u %u %u +!",
@@ -867,7 +867,7 @@ void MainObject::setOutputModeData(int id,unsigned card,unsigned stream,
} }
if(rda->config()->enableMixerLogging()) { if(rda->config()->enableMixerLogging()) {
rda->syslog(LOG_INFO, rda->syslog(LOG_INFO,
"SetOutputMode - Card: %d Stream: %d Mode: %d", "[mixer] SetOutputMode - Card: %d Stream: %d Mode: %d",
card,stream,mode); card,stream,mode);
} }
cae_server->sendCommand(id,QString::asprintf("OM %u %u %u +!", cae_server->sendCommand(id,QString::asprintf("OM %u %u %u +!",
@@ -892,7 +892,7 @@ void MainObject::setInputVoxLevelData(int id,unsigned card,unsigned stream,
} }
if(rda->config()->enableMixerLogging()) { if(rda->config()->enableMixerLogging()) {
rda->syslog(LOG_INFO, rda->syslog(LOG_INFO,
"SetInputVOXLevel - Card: %d Stream: %d Level: %d", "[mixer] SetInputVOXLevel - Card: %d Stream: %d Level: %d",
card,stream,level); card,stream,level);
} }
cae_server->sendCommand(id,QString::asprintf("IX %u %u %d +!", cae_server->sendCommand(id,QString::asprintf("IX %u %u %d +!",
@@ -917,7 +917,7 @@ void MainObject::setInputTypeData(int id,unsigned card,unsigned port,
} }
if(rda->config()->enableMixerLogging()) { if(rda->config()->enableMixerLogging()) {
rda->syslog(LOG_INFO, rda->syslog(LOG_INFO,
"SetInputType - Card: %d Port: %d Type: %d", "[mixer] SetInputType - Card: %d Port: %d Type: %d",
card,port,type); card,port,type);
} }
cae_server->sendCommand(id,QString::asprintf("IT %u %u %u +!", cae_server->sendCommand(id,QString::asprintf("IT %u %u %u +!",
@@ -961,7 +961,7 @@ void MainObject::setAudioPassthroughLevelData(int id,unsigned card,
} }
if(rda->config()->enableMixerLogging()) { if(rda->config()->enableMixerLogging()) {
rda->syslog(LOG_INFO, rda->syslog(LOG_INFO,
"SetPassthroughLevel - Card: %d InPort: %d OutPort: %d Level: %d", "[mixer] SetPassthroughLevel - Card: %d InPort: %d OutPort: %d Level: %d",
card,input,output,level); card,input,output,level);
} }
cae_server->sendCommand(id,QString::asprintf("AL %u %u %u %d +!", cae_server->sendCommand(id,QString::asprintf("AL %u %u %u %d +!",
@@ -993,7 +993,7 @@ void MainObject::setClockSourceData(int id,unsigned card,int input)
} }
if(rda->config()->enableMixerLogging()) { if(rda->config()->enableMixerLogging()) {
rda->syslog(LOG_INFO, rda->syslog(LOG_INFO,
"SetClockSource - Card: %d Source: %d",card,input); "[mixer] SetClockSource - Card: %d Source: %d",card,input);
} }
cae_server->sendCommand(id,QString::asprintf("CS %u %u +!",card,input)); cae_server->sendCommand(id,QString::asprintf("CS %u %u +!",card,input));
} }