Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-04-09 14:33:28 +02:00
Code Issues Projects Releases Wiki Activity

2019-06-25 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Adjusted to priority of 'operations' system events to use
	LOG_INFO priority.
This commit is contained in:
Fred Gleason 2019-06-25 15:08:12 -04:00
parent 338fd54796
commit ac4d9305bc
23 changed files with 83 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -18830,3 +18830,6 @@
2019-06-24 Fred Gleason <fredg@paravelsystems.com> 2019-06-24 Fred Gleason <fredg@paravelsystems.com>
* Added a 'pypad.rivendellConfig()' method. * Added a 'pypad.rivendellConfig()' method.
* Added a 'pypad.syslog()' method. * Added a 'pypad.syslog()' method.
2019-06-25 Fred Gleason <fredg@paravelsystems.com>
* Adjusted to priority of 'operations' system events to use
LOG_INFO priority.

52
cae/cae.cpp
View File

@ -394,7 +394,7 @@ MainObject::MainObject(QObject *parent,const char *name)
} }
*/ */
if(rd_config->enableMixerLogging()) { if(rd_config->enableMixerLogging()) {
RDApplication::syslog(rd_config,LOG_NOTICE,"mixer logging enabled"); RDApplication::syslog(rd_config,LOG_INFO,"mixer logging enabled");
} }
RDApplication::syslog(rd_config,LOG_INFO,"cae started"); RDApplication::syslog(rd_config,LOG_INFO,"cae started");
} }
@ -460,7 +460,7 @@ void MainObject::loadPlaybackData(int id,unsigned card,const QString &name)
play_handle[handle].stream=new_stream; play_handle[handle].stream=new_stream;
play_handle[handle].owner=id; play_handle[handle].owner=id;
play_owner[card][new_stream]=id; play_owner[card][new_stream]=id;
RDApplication::syslog(rd_config,LOG_DEBUG, RDApplication::syslog(rd_config,LOG_INFO,
"LoadPlayback Card: %d Stream: %d Name: %s Handle: %d", "LoadPlayback Card: %d Stream: %d Name: %s Handle: %d",
card,new_stream,(const char *)wavename.toUtf8(),handle); card,new_stream,(const char *)wavename.toUtf8(),handle);
cae_server-> cae_server->
@ -480,7 +480,7 @@ void MainObject::unloadPlaybackData(int id,unsigned handle)
case RDStation::Hpi: case RDStation::Hpi:
if(hpiUnloadPlayback(card,stream)) { if(hpiUnloadPlayback(card,stream)) {
play_owner[card][stream]=-1; play_owner[card][stream]=-1;
RDApplication::syslog(rd_config,LOG_DEBUG, RDApplication::syslog(rd_config,LOG_INFO,
"UnloadPlayback - Card: %d Stream: %d Handle: %d", "UnloadPlayback - Card: %d Stream: %d Handle: %d",
card,stream,handle); card,stream,handle);
cae_server->sendCommand(id,QString().sprintf("UP %d +!",handle)); cae_server->sendCommand(id,QString().sprintf("UP %d +!",handle));
@ -493,7 +493,7 @@ void MainObject::unloadPlaybackData(int id,unsigned handle)
case RDStation::Alsa: case RDStation::Alsa:
if(alsaUnloadPlayback(card,stream)) { if(alsaUnloadPlayback(card,stream)) {
play_owner[card][stream]=-1; play_owner[card][stream]=-1;
RDApplication::syslog(rd_config,LOG_DEBUG, RDApplication::syslog(rd_config,LOG_INFO,
"UnloadPlayback - Card: %d Stream: %d Handle: %d", "UnloadPlayback - Card: %d Stream: %d Handle: %d",
card,stream,handle); card,stream,handle);
cae_server->sendCommand(id,QString().sprintf("UP %d +!",handle)); cae_server->sendCommand(id,QString().sprintf("UP %d +!",handle));
@ -506,7 +506,7 @@ void MainObject::unloadPlaybackData(int id,unsigned handle)
case RDStation::Jack: case RDStation::Jack:
if(jackUnloadPlayback(card,stream)) { if(jackUnloadPlayback(card,stream)) {
play_owner[card][stream]=-1; play_owner[card][stream]=-1;
RDApplication::syslog(rd_config,LOG_DEBUG, RDApplication::syslog(rd_config,LOG_INFO,
"UnloadPlayback - Card: %d Stream: %d Handle: %d", "UnloadPlayback - Card: %d Stream: %d Handle: %d",
card,stream,handle); card,stream,handle);
cae_server->sendCommand(id,QString().sprintf("UP %d +!",handle)); cae_server->sendCommand(id,QString().sprintf("UP %d +!",handle));
@ -540,7 +540,7 @@ void MainObject::playPositionData(int id,unsigned handle,unsigned pos)
switch(cae_driver[card]) { switch(cae_driver[card]) {
case RDStation::Hpi: case RDStation::Hpi:
if(hpiPlaybackPosition(card,stream,pos)) { if(hpiPlaybackPosition(card,stream,pos)) {
RDApplication::syslog(rd_config,LOG_DEBUG, RDApplication::syslog(rd_config,LOG_INFO,
"PlaybackPosition - Card: %d Stream: %d Pos: %d Handle: %d", "PlaybackPosition - Card: %d Stream: %d Pos: %d Handle: %d",
card,stream,pos,handle); card,stream,pos,handle);
cae_server->sendCommand(id,QString().sprintf("PP %d %d +!",handle,pos)); cae_server->sendCommand(id,QString().sprintf("PP %d %d +!",handle,pos));
@ -552,7 +552,7 @@ void MainObject::playPositionData(int id,unsigned handle,unsigned pos)
case RDStation::Alsa: case RDStation::Alsa:
if(alsaPlaybackPosition(card,stream,pos)) { if(alsaPlaybackPosition(card,stream,pos)) {
RDApplication::syslog(rd_config,LOG_DEBUG, RDApplication::syslog(rd_config,LOG_INFO,
"PlaybackPosition - Card: %d Stream: %d Pos: %d Handle: %d", "PlaybackPosition - Card: %d Stream: %d Pos: %d Handle: %d",
card,stream,pos,handle); card,stream,pos,handle);
cae_server->sendCommand(id,QString().sprintf("PP %d %d +!",handle,pos)); cae_server->sendCommand(id,QString().sprintf("PP %d %d +!",handle,pos));
@ -564,7 +564,7 @@ void MainObject::playPositionData(int id,unsigned handle,unsigned pos)
case RDStation::Jack: case RDStation::Jack:
if(jackPlaybackPosition(card,stream,pos)) { if(jackPlaybackPosition(card,stream,pos)) {
RDApplication::syslog(rd_config,LOG_DEBUG, RDApplication::syslog(rd_config,LOG_INFO,
"PlaybackPosition - Card: %d Stream: %d Pos: %d Handle: %d", "PlaybackPosition - Card: %d Stream: %d Pos: %d Handle: %d",
card,stream,pos,handle); card,stream,pos,handle);
cae_server->sendCommand(id,QString().sprintf("PP %d %d +!",handle,pos)); cae_server->sendCommand(id,QString().sprintf("PP %d %d +!",handle,pos));
@ -648,7 +648,7 @@ void MainObject::playData(int id,unsigned handle,unsigned length,unsigned speed,
handle,length,speed,pitch_flag)); handle,length,speed,pitch_flag));
return; return;
} }
RDApplication::syslog(rd_config,LOG_DEBUG, RDApplication::syslog(rd_config,LOG_INFO,
"Play - Card: %d Stream: %d Handle: %d Length: %d Speed: %d Pitch: %d", "Play - Card: %d Stream: %d Handle: %d Length: %d Speed: %d Pitch: %d",
card,stream,handle,play_length[card][stream], card,stream,handle,play_length[card][stream],
play_speed[card][stream],pitch_flag); play_speed[card][stream],pitch_flag);
@ -692,7 +692,7 @@ void MainObject::stopPlaybackData(int id,unsigned handle)
cae_server->sendCommand(id,QString().sprintf("SP %u -!",handle)); cae_server->sendCommand(id,QString().sprintf("SP %u -!",handle));
return; return;
} }
RDApplication::syslog(rd_config,LOG_DEBUG, RDApplication::syslog(rd_config,LOG_INFO,
"StopPlayback - Card: %d Stream: %d Handle: %d", "StopPlayback - Card: %d Stream: %d Handle: %d",
card,stream,handle); card,stream,handle);
return; return;
@ -782,7 +782,7 @@ void MainObject::loadRecordingData(int id,unsigned card,unsigned port,
bitrate,(const char *)name.toUtf8())); bitrate,(const char *)name.toUtf8()));
return; return;
} }
RDApplication::syslog(rd_config,LOG_DEBUG, RDApplication::syslog(rd_config,LOG_INFO,
"LoadRecord - Card: %d Stream: %d Coding: %d Chans: %d SampRate: %d BitRate: %d Name: %s", "LoadRecord - Card: %d Stream: %d Coding: %d Chans: %d SampRate: %d BitRate: %d Name: %s",
card,port,coding,channels,samprate,bitrate, card,port,coding,channels,samprate,bitrate,
(const char *)wavename.toUtf8()); (const char *)wavename.toUtf8());
@ -832,7 +832,7 @@ void MainObject::unloadRecordingData(int id,unsigned card,unsigned stream)
return; return;
} }
record_owner[card][stream]=-1; record_owner[card][stream]=-1;
RDApplication::syslog(rd_config,LOG_DEBUG, RDApplication::syslog(rd_config,LOG_INFO,
"UnloadRecord - Card: %d Stream: %d, Length: %u", "UnloadRecord - Card: %d Stream: %d, Length: %u",
card,stream,len); card,stream,len);
cae_server-> cae_server->
@ -890,7 +890,7 @@ void MainObject::recordData(int id,unsigned card,unsigned stream,unsigned len,
card,stream,len,threshold_level)); card,stream,len,threshold_level));
return; return;
} }
RDApplication::syslog(rd_config,LOG_DEBUG, RDApplication::syslog(rd_config,LOG_INFO,
"Record - Card: %d Stream: %d Length: %d Thres: %d", "Record - Card: %d Stream: %d Length: %d Thres: %d",
card,stream,record_length[card][stream], card,stream,record_length[card][stream],
record_threshold[card][stream]); record_threshold[card][stream]);
@ -933,7 +933,7 @@ void MainObject::stopRecordingData(int id,unsigned card,unsigned stream)
cae_server->sendCommand(id,QString().sprintf("SR %u %u -!",card,stream)); cae_server->sendCommand(id,QString().sprintf("SR %u %u -!",card,stream));
return; return;
} }
RDApplication::syslog(rd_config,LOG_DEBUG, RDApplication::syslog(rd_config,LOG_INFO,
"StopRecord - Card: %d Stream: %d",card,stream); "StopRecord - Card: %d Stream: %d",card,stream);
} }
@ -969,7 +969,7 @@ void MainObject::setInputVolumeData(int id,unsigned card,unsigned stream,
return; return;
} }
if(rd_config->enableMixerLogging()) { if(rd_config->enableMixerLogging()) {
RDApplication::syslog(rd_config,LOG_DEBUG, RDApplication::syslog(rd_config,LOG_INFO,
"SetInputVolume - Card: %d Stream: %d Level: %d", "SetInputVolume - Card: %d Stream: %d Level: %d",
card,stream,level); card,stream,level);
} }
@ -1012,7 +1012,7 @@ void MainObject::setOutputVolumeData(int id,unsigned card,unsigned stream,
return; return;
} }
if(rd_config->enableMixerLogging()) { if(rd_config->enableMixerLogging()) {
RDApplication::syslog(rd_config,LOG_DEBUG, RDApplication::syslog(rd_config,LOG_INFO,
"SetOutputVolume - Card: %d Stream: %d Port: %d Level: %d", "SetOutputVolume - Card: %d Stream: %d Port: %d Level: %d",
card,stream,port,level); card,stream,port,level);
} }
@ -1059,7 +1059,7 @@ void MainObject::fadeOutputVolumeData(int id,unsigned card,unsigned stream,
return; return;
} }
if(rd_config->enableMixerLogging()) { if(rd_config->enableMixerLogging()) {
RDApplication::syslog(rd_config,LOG_DEBUG, RDApplication::syslog(rd_config,LOG_INFO,
"FadeOutputVolume - Card: %d Stream: %d Port: %d Level: %d Length: %d", "FadeOutputVolume - Card: %d Stream: %d Port: %d Level: %d Length: %d",
card,stream,port,level,length); card,stream,port,level,length);
} }
@ -1103,7 +1103,7 @@ void MainObject::setInputLevelData(int id,unsigned card,unsigned port,
return; return;
} }
if(rd_config->enableMixerLogging()) { if(rd_config->enableMixerLogging()) {
RDApplication::syslog(rd_config,LOG_DEBUG, RDApplication::syslog(rd_config,LOG_INFO,
"SetInputLevel - Card: %d Port: %d Level: %d", "SetInputLevel - Card: %d Port: %d Level: %d",
card,port,level); card,port,level);
} }
@ -1146,7 +1146,7 @@ void MainObject::setOutputLevelData(int id,unsigned card,unsigned port,
return; return;
} }
if(rd_config->enableMixerLogging()) { if(rd_config->enableMixerLogging()) {
RDApplication::syslog(rd_config,LOG_DEBUG, RDApplication::syslog(rd_config,LOG_INFO,
"SetOutputLevel - Card: %d Port: %d Level: %d", "SetOutputLevel - Card: %d Port: %d Level: %d",
card,port,level); card,port,level);
} }
@ -1189,7 +1189,7 @@ void MainObject::setInputModeData(int id,unsigned card,unsigned stream,
return; return;
} }
if(rd_config->enableMixerLogging()) { if(rd_config->enableMixerLogging()) {
RDApplication::syslog(rd_config,LOG_DEBUG, RDApplication::syslog(rd_config,LOG_INFO,
"SetInputMode - Card: %d Stream: %d Mode: %d", "SetInputMode - Card: %d Stream: %d Mode: %d",
card,stream,mode); card,stream,mode);
} }
@ -1232,7 +1232,7 @@ void MainObject::setOutputModeData(int id,unsigned card,unsigned stream,
return; return;
} }
if(rd_config->enableMixerLogging()) { if(rd_config->enableMixerLogging()) {
RDApplication::syslog(rd_config,LOG_DEBUG, RDApplication::syslog(rd_config,LOG_INFO,
"SetOutputMode - Card: %d Stream: %d Mode: %d", "SetOutputMode - Card: %d Stream: %d Mode: %d",
card,stream,mode); card,stream,mode);
} }
@ -1275,7 +1275,7 @@ void MainObject::setInputVoxLevelData(int id,unsigned card,unsigned stream,
return; return;
} }
if(rd_config->enableMixerLogging()) { if(rd_config->enableMixerLogging()) {
RDApplication::syslog(rd_config,LOG_DEBUG, RDApplication::syslog(rd_config,LOG_INFO,
"SetInputVOXLevel - Card: %d Stream: %d Level: %d", "SetInputVOXLevel - Card: %d Stream: %d Level: %d",
card,stream,level); card,stream,level);
} }
@ -1318,7 +1318,7 @@ void MainObject::setInputTypeData(int id,unsigned card,unsigned port,
return; return;
} }
if(rd_config->enableMixerLogging()) { if(rd_config->enableMixerLogging()) {
RDApplication::syslog(rd_config,LOG_DEBUG, RDApplication::syslog(rd_config,LOG_INFO,
"SetInputType - Card: %d Port: %d Type: %d", "SetInputType - Card: %d Port: %d Type: %d",
card,port,type); card,port,type);
} }
@ -1373,7 +1373,7 @@ void MainObject::setAudioPassthroughLevelData(int id,unsigned card,
return; return;
} }
if(rd_config->enableMixerLogging()) { if(rd_config->enableMixerLogging()) {
RDApplication::syslog(rd_config,LOG_DEBUG, RDApplication::syslog(rd_config,LOG_INFO,
"SetPassthroughLevel - Card: %d InPort: %d OutPort: %d Level: %d", "SetPassthroughLevel - Card: %d InPort: %d OutPort: %d Level: %d",
card,input,output,level); card,input,output,level);
} }
@ -1400,7 +1400,7 @@ void MainObject::setClockSourceData(int id,unsigned card,int input)
return; return;
} }
if(rd_config->enableMixerLogging()) { if(rd_config->enableMixerLogging()) {
RDApplication::syslog(rd_config,LOG_DEBUG, RDApplication::syslog(rd_config,LOG_INFO,
"SetClockSource - Card: %d Source: %d",card,input); "SetClockSource - Card: %d Source: %d",card,input);
} }
cae_server->sendCommand(id,QString().sprintf("CS %u %u +!",card,input)); cae_server->sendCommand(id,QString().sprintf("CS %u %u +!",card,input));
@ -1778,7 +1778,7 @@ void MainObject::KillSocket(int ch)
break; break;
default: default:
RDApplication::syslog(rd_config,LOG_NOTICE, RDApplication::syslog(rd_config,LOG_DEBUG,
"tried to kill unowned socket!"); "tried to kill unowned socket!");
break; break;
} }

2
cae/cae_alsa.cpp
View File

@ -723,7 +723,7 @@ void MainObject::alsaInit(RDStation *station)
if(cae_driver[i]==RDStation::Alsa) { if(cae_driver[i]==RDStation::Alsa) {
station->setCardDriver(i,RDStation::Alsa); station->setCardDriver(i,RDStation::Alsa);
if(snd_ctl_open(&snd_ctl,dev,0)<0) { if(snd_ctl_open(&snd_ctl,dev,0)<0) {
RDApplication::syslog(rd_config,LOG_DEBUG, RDApplication::syslog(rd_config,LOG_INFO,
"no control device found for %s", "no control device found for %s",
(const char *)dev); (const char *)dev);
station-> station->

2
lib/rdaudioimport.cpp
View File

@ -219,7 +219,7 @@ RDAudioImport::ErrorCode RDAudioImport::runImport(const QString &username,
return RDAudioImport::ErrorUrlInvalid; return RDAudioImport::ErrorUrlInvalid;
} }
/* /*
rda->syslog(LOG_NOTICE,"CURL code: %d [%s]\n",curl_err, rda->syslog(LOG_DEBUG,"CURL code: %d [%s]\n",curl_err,
curl_easy_strerror(curl_err)); curl_easy_strerror(curl_err));
*/ */

2
lib/rddelete.cpp
View File

@ -161,7 +161,7 @@ RDDelete::ErrorCode RDDelete::runDelete(const QString &username,
break; break;
} }
if(log_debug) { if(log_debug) {
rda->syslog(LOG_NOTICE,curl_easy_strerror(err)); rda->syslog(LOG_INFO,curl_easy_strerror(err));
} }
curl_slist_free_all(cmds); curl_slist_free_all(cmds);
curl_easy_cleanup(curl); curl_easy_cleanup(curl);

12
lib/rdlogplay.cpp
View File

@ -1936,7 +1936,7 @@ bool RDLogPlay::StartEvent(int line,RDLogLine::TransType trans_type,
*/ */
emit channelStarted(play_id,playdeck->channel(), emit channelStarted(play_id,playdeck->channel(),
playdeck->card(),playdeck->port()); playdeck->card(),playdeck->port());
rda->syslog(LOG_DEBUG,"log engine: started audio cart: Line: %d Cart: %u Cut: %u Pos: %d Card: %d Stream: %d Port: %d", rda->syslog(LOG_INFO,"log engine: started audio cart: Line: %d Cart: %u Cut: %u Pos: %d Card: %d Stream: %d Port: %d",
line,logline->cartNumber(), line,logline->cartNumber(),
playdeck->cut()->cutNumber(), playdeck->cut()->cutNumber(),
logline->playPosition(), logline->playPosition(),
@ -1991,14 +1991,14 @@ bool RDLogPlay::StartEvent(int line,RDLogLine::TransType trans_type,
RDAirPlayConf::TrafficMacro,play_onair_flag); RDAirPlayConf::TrafficMacro,play_onair_flag);
FinishEvent(line); FinishEvent(line);
emit transportChanged(); emit transportChanged();
rda->syslog(LOG_DEBUG, rda->syslog(LOG_INFO,
"log engine: asynchronously executed macro cart: Line: %d Cart: %u", "log engine: asynchronously executed macro cart: Line: %d Cart: %u",
line,logline->cartNumber()); line,logline->cartNumber());
} }
else { else {
play_macro_deck->load(logline->cartNumber()); play_macro_deck->load(logline->cartNumber());
play_macro_deck->setLine(line); play_macro_deck->setLine(line);
rda->syslog(LOG_DEBUG, rda->syslog(LOG_INFO,
"log engine: started macro cart: Line: %d Cart: %u", "log engine: started macro cart: Line: %d Cart: %u",
line,logline->cartNumber()); line,logline->cartNumber());
play_macro_deck->exec(); play_macro_deck->exec();
@ -2063,7 +2063,7 @@ bool RDLogPlay::StartEvent(int line,RDLogLine::TransType trans_type,
} }
play_macro_deck->setLine(line); play_macro_deck->setLine(line);
play_macro_deck->exec(); play_macro_deck->exec();
rda->syslog(LOG_DEBUG,"log engine: chained to log: Line: %d Log: %s", rda->syslog(LOG_INFO,"log engine: chained to log: Line: %d Log: %s",
line,(const char *)logline->markerLabel()); line,(const char *)logline->markerLabel());
break; break;
@ -2140,11 +2140,11 @@ void RDLogPlay::CleanupEvent(int id)
} }
playdeck=(RDPlayDeck *)logline->playDeck(); playdeck=(RDPlayDeck *)logline->playDeck();
if(playdeck->cut()==NULL) { if(playdeck->cut()==NULL) {
rda->syslog(LOG_DEBUG,"log engine: event failed: Line: %d Cart: %u",line, rda->syslog(LOG_INFO,"log engine: event failed: Line: %d Cart: %u",line,
logline->cartNumber()); logline->cartNumber());
} }
else { else {
rda->syslog(LOG_DEBUG,"log engine: finished event: Line: %d Cart: %u Cut: %u Card: %d Stream: %d Port: %d", rda->syslog(LOG_INFO,"log engine: finished event: Line: %d Cart: %u Cut: %u Card: %d Stream: %d Port: %d",
line,logline->cartNumber(), line,logline->cartNumber(),
playdeck->cut()->cutNumber(), playdeck->cut()->cutNumber(),
playdeck->card(), playdeck->card(),

6
lib/rdpam.cpp
View File

@ -48,12 +48,12 @@ int RDPamCallback(int num_msg, const struct pam_message **msg,
break; break;
case PAM_PROMPT_ECHO_ON: case PAM_PROMPT_ECHO_ON:
rda->syslog(LOG_ERR,"unhandled PAM request: %s",msg[i]->msg); rda->syslog(LOG_WARNING,"unhandled PAM request: %s",msg[i]->msg);
break; break;
case PAM_ERROR_MSG: case PAM_ERROR_MSG:
case PAM_TEXT_INFO: case PAM_TEXT_INFO:
rda->syslog(LOG_NOTICE,"PAM message: %s",msg[i]->msg); rda->syslog(LOG_INFO,"PAM message: %s",msg[i]->msg);
break; break;
} }
} }
@ -80,7 +80,7 @@ bool RDPam::authenticate(const QString &username,const QString &token)
conv.conv=RDPamCallback; conv.conv=RDPamCallback;
conv.appdata_ptr=(RDPam *)this; conv.appdata_ptr=(RDPam *)this;
if((err=pam_start(system_pam_service,username,&conv,&pamh))!=PAM_SUCCESS) { if((err=pam_start(system_pam_service,username,&conv,&pamh))!=PAM_SUCCESS) {
rda->syslog(LOG_NOTICE,"PAM Error: %s",pam_strerror(pamh,err)); rda->syslog(LOG_WARNING,"PAM Error: %s",pam_strerror(pamh,err));
pam_end(pamh,err); pam_end(pamh,err);
CleanupPam(); CleanupPam();
return false; return false;

24
rdcatchd/rdcatchd.cpp
View File

@ -559,7 +559,7 @@ void MainObject::startTimerData(int id)
BroadcastCommand(QString().sprintf("RE %d %d %d!", BroadcastCommand(QString().sprintf("RE %d %d %d!",
deck+1,catch_record_deck_status[deck], deck+1,catch_record_deck_status[deck],
id)); id));
rda->syslog(LOG_DEBUG,"gpi start window closes: event: %d, gpi: %d:%d", rda->syslog(LOG_INFO,"gpi start window closes: event: %d, gpi: %d:%d",
id,catch_events[event].startMatrix(), id,catch_events[event].startMatrix(),
catch_events[event].startLine()); catch_events[event].startLine());
} }
@ -674,7 +674,7 @@ void MainObject::engineData(int id)
catch_swdelay[catch_events[event].channel()-1]=q->value(5).toInt(); catch_swdelay[catch_events[event].channel()-1]=q->value(5).toInt();
} }
else { else {
rda->syslog(LOG_DEBUG,"id %d specified non-existent record deck, ignored", rda->syslog(LOG_INFO,"id %d specified non-existent record deck, ignored",
catch_events[event].id()); catch_events[event].id());
delete q; delete q;
return; return;
@ -707,7 +707,7 @@ void MainObject::engineData(int id)
catch_record_deck_status[catch_events[event]. catch_record_deck_status[catch_events[event].
channel()-1], channel()-1],
catch_events[event].id())); catch_events[event].id()));
rda->syslog(LOG_DEBUG,"gpi start window opens: event: %d, gpi: %d:%d", rda->syslog(LOG_INFO,"gpi start window opens: event: %d, gpi: %d:%d",
id,catch_events[event].startMatrix(), id,catch_events[event].startMatrix(),
catch_events[event].startLine()); catch_events[event].startLine());
break; break;
@ -748,7 +748,7 @@ void MainObject::engineData(int id)
q->value(2).toInt(); q->value(2).toInt();
} }
else { else {
rda->syslog(LOG_DEBUG,"id %d specified non-existent play deck, ignored", rda->syslog(LOG_INFO,"id %d specified non-existent play deck, ignored",
catch_events[event].id()); catch_events[event].id());
delete q; delete q;
return; return;
@ -1264,7 +1264,7 @@ bool MainObject::StartRecording(int event)
QString str; QString str;
str=rml->toString(); str=rml->toString();
rda->ripc()->sendRml(rml); rda->ripc()->sendRml(rml);
rda->syslog(LOG_DEBUG,"sending switcher command: \"%s\"", rda->syslog(LOG_INFO,"sending switcher command: \"%s\"",
(const char *)str.toUtf8()); (const char *)str.toUtf8());
delete rml; delete rml;
} }
@ -1411,7 +1411,7 @@ void MainObject::StartPlayout(int event)
catch_playout_stream[deck-129]); catch_playout_stream[deck-129]);
catch_events[event].setStatus(RDDeck::Recording); catch_events[event].setStatus(RDDeck::Recording);
rda->syslog(LOG_DEBUG, rda->syslog(LOG_INFO,
"playout started: deck: %d, event %d card %d, stream %d , cut=%s", "playout started: deck: %d, event %d card %d, stream %d , cut=%s",
deck,catch_events[event].id(), deck,catch_events[event].id(),
catch_playout_card[deck-129], catch_playout_card[deck-129],
@ -2238,25 +2238,25 @@ void MainObject::PurgeEvent(int event)
BroadcastCommand(QString().sprintf("PE %d!",catch_events[event].id())); BroadcastCommand(QString().sprintf("PE %d!",catch_events[event].id()));
switch(catch_events[event].type()) { switch(catch_events[event].type()) {
case RDRecording::Recording: case RDRecording::Recording:
rda->syslog(LOG_DEBUG,"purged event %d, Type: recording, Cut: %s", rda->syslog(LOG_INFO,"purged event %d, Type: recording, Cut: %s",
catch_events[event].id(), catch_events[event].id(),
(const char *)catch_events[event].cutName().toUtf8()); (const char *)catch_events[event].cutName().toUtf8());
break; break;
case RDRecording::Playout: case RDRecording::Playout:
rda->syslog(LOG_DEBUG,"purged event %d, Type: playout, Cut: %s", rda->syslog(LOG_INFO,"purged event %d, Type: playout, Cut: %s",
catch_events[event].id(), catch_events[event].id(),
(const char *)catch_events[event].cutName().toUtf8()); (const char *)catch_events[event].cutName().toUtf8());
break; break;
case RDRecording::MacroEvent: case RDRecording::MacroEvent:
rda->syslog(LOG_DEBUG,"purged event %d, Type: macro, Cart: %u", rda->syslog(LOG_INFO,"purged event %d, Type: macro, Cart: %u",
catch_events[event].id(), catch_events[event].id(),
catch_events[event].macroCart()); catch_events[event].macroCart());
break; break;
case RDRecording::SwitchEvent: case RDRecording::SwitchEvent:
rda->syslog(LOG_DEBUG, rda->syslog(LOG_INFO,
"purged event %d, Type: switch, Matrix: %d, Source: %d Dest: %d", "purged event %d, Type: switch, Matrix: %d, Source: %d Dest: %d",
catch_events[event].id(), catch_events[event].id(),
catch_events[event].channel(), catch_events[event].channel(),
@ -2265,13 +2265,13 @@ void MainObject::PurgeEvent(int event)
break; break;
case RDRecording::Download: case RDRecording::Download:
rda->syslog(LOG_DEBUG,"purged event %d, Type: download, Cut: %s", rda->syslog(LOG_INFO,"purged event %d, Type: download, Cut: %s",
catch_events[event].id(), catch_events[event].id(),
(const char *)catch_events[event].cutName().toUtf8()); (const char *)catch_events[event].cutName().toUtf8());
break; break;
case RDRecording::Upload: case RDRecording::Upload:
rda->syslog(LOG_DEBUG,"purged event %d, Type: upload, Cut: %s", rda->syslog(LOG_INFO,"purged event %d, Type: upload, Cut: %s",
catch_events[event].id(), catch_events[event].id(),
(const char *)catch_events[event].cutName().toUtf8()); (const char *)catch_events[event].cutName().toUtf8());
break; break;

2
rdhpi/rdhpiplaystream.cpp
View File

@ -836,7 +836,7 @@ hpi_err_t RDHPIPlayStream::LogHpi(hpi_err_t err,int lineno)
if(err!=0) { if(err!=0) {
HPI_GetErrorText(err,err_txt); HPI_GetErrorText(err,err_txt);
RDApplication::syslog(sound_card->config(),LOG_NOTICE, RDApplication::syslog(sound_card->config(),LOG_WARNING,
"HPI Error: %s, %s line %d",err_txt,__FILE__,lineno); "HPI Error: %s, %s line %d",err_txt,__FILE__,lineno);
} }
return err; return err;

2
rdhpi/rdhpirecordstream.cpp
View File

@ -740,7 +740,7 @@ hpi_err_t RDHPIRecordStream::LogHpi(hpi_err_t err,int lineno)
if(err!=0) { if(err!=0) {
HPI_GetErrorText(err,err_txt); HPI_GetErrorText(err,err_txt);
RDApplication::syslog(sound_card->config(),LOG_NOTICE, RDApplication::syslog(sound_card->config(),LOG_WARNING,
"HPI Error: %s, %s line %d",err_txt,__FILE__,lineno); "HPI Error: %s, %s line %d",err_txt,__FILE__,lineno);
} }
return err; return err;

2
rdhpi/rdhpisoundcard.cpp
View File

@ -1045,7 +1045,7 @@ hpi_err_t RDHPISoundCard::LogHpi(hpi_err_t err,int lineno)
if(err!=0) { if(err!=0) {
HPI_GetErrorText(err,err_txt); HPI_GetErrorText(err,err_txt);
RDApplication::syslog(card_config,LOG_NOTICE, RDApplication::syslog(card_config,LOG_WARNING,
"HPI Error: %s, %s line %d",err_txt,__FILE__,lineno); "HPI Error: %s, %s line %d",err_txt,__FILE__,lineno);
} }
return err; return err;

6
ripcd/am16.cpp
View File

@ -235,16 +235,16 @@ void Am16::ProcessMessage(char *msg,int len)
break; break;
case 0x7E: case 0x7E:
rda->syslog(LOG_NOTICE,"AM16 driver: data error"); rda->syslog(LOG_WARNING,"AM16 driver: data error");
break; break;
case 0x7F: case 0x7F:
rda->syslog(LOG_NOTICE, rda->syslog(LOG_WARNING,
"AM16 driver: memory protect mode is on, cannot change crosspoints"); "AM16 driver: memory protect mode is on, cannot change crosspoints");
break; break;
default: default:
rda->syslog(LOG_NOTICE,"AM16 driver: received unknown ACK code [%d]", rda->syslog(LOG_WARNING,"AM16 driver: received unknown ACK code [%d]",
0xFF&msg[7]); 0xFF&msg[7]);
break; break;
} }

2
ripcd/btu41mlrweb.cpp
View File

@ -175,7 +175,7 @@ void BtU41MlrWeb::watchdogData()
void BtU41MlrWeb::ProcessCommand(const QString &cmd) void BtU41MlrWeb::ProcessCommand(const QString &cmd)
{ {
// rda->syslog(LOG_NOTICE,"ProcessCommand(%s)\n",(const char *)cmd); // rda->syslog(LOG_DEBUG,"ProcessCommand(%s)\n",(const char *)cmd);
QStringList cmds=cmd.split(","); QStringList cmds=cmd.split(",");

2
ripcd/livewire_mcastgpio.cpp
View File

@ -412,7 +412,7 @@ void LiveWireMcastGpio::ProcessGpoOut(int chan,unsigned line,bool state)
htonl(livewire_surface_addresses[it->first].toIPv4Address()); htonl(livewire_surface_addresses[it->first].toIPv4Address());
} }
} }
rda->syslog(LOG_NOTICE,"using %s", rda->syslog(LOG_DEBUG,"using %s",
(const char *)QHostAddress(ntohl(sa.sin_addr.s_addr)).toString()); (const char *)QHostAddress(ntohl(sa.sin_addr.s_addr)).toString());
*/ */

3
ripcd/local_audio.cpp
View File

@ -368,7 +368,8 @@ hpi_err_t LocalAudio::LogHpi(hpi_err_t err,int lineno)
if(err!=0) { if(err!=0) {
HPI_GetErrorText(err,err_txt); HPI_GetErrorText(err,err_txt);
rda->syslog(LOG_NOTICE,"HPI Error: %s, %s line %d",err_txt,__FILE__,lineno); rda->syslog(LOG_WARNING,"HPI Error: %s, %s line %d",err_txt,
__FILE__,lineno);
} }
return err; return err;
} }

16
ripcd/local_macros.cpp
View File

@ -37,10 +37,10 @@
void MainObject::gpiChangedData(int matrix,int line,bool state) void MainObject::gpiChangedData(int matrix,int line,bool state)
{ {
if(state) { if(state) {
rda->syslog(LOG_DEBUG,"GPI %d:%d ON",matrix,line+1); rda->syslog(LOG_INFO,"GPI %d:%d ON",matrix,line+1);
} }
else { else {
rda->syslog(LOG_DEBUG,"GPI %d:%d OFF",matrix,line+1); rda->syslog(LOG_INFO,"GPI %d:%d OFF",matrix,line+1);
} }
ripcd_gpi_state[matrix][line]=state; ripcd_gpi_state[matrix][line]=state;
BroadcastCommand(QString().sprintf("GI %d %d %d %d!",matrix,line,state, BroadcastCommand(QString().sprintf("GI %d %d %d %d!",matrix,line,state,
@ -58,10 +58,10 @@ void MainObject::gpiChangedData(int matrix,int line,bool state)
void MainObject::gpoChangedData(int matrix,int line,bool state) void MainObject::gpoChangedData(int matrix,int line,bool state)
{ {
if(state) { if(state) {
rda->syslog(LOG_DEBUG,"GPO %d:%d ON",matrix,line+1); rda->syslog(LOG_INFO,"GPO %d:%d ON",matrix,line+1);
} }
else { else {
rda->syslog(LOG_DEBUG,"GPO %d:%d OFF",matrix,line+1); rda->syslog(LOG_INFO,"GPO %d:%d OFF",matrix,line+1);
} }
ripcd_gpo_state[matrix][line]=state; ripcd_gpo_state[matrix][line]=state;
BroadcastCommand(QString().sprintf("GO %d %d %d %d!",matrix,line,state, BroadcastCommand(QString().sprintf("GO %d %d %d %d!",matrix,line,state,
@ -243,7 +243,7 @@ void MainObject::RunLocalMacros(RDMacro *rml_in)
RDMatrix::GpioType gpio_type; RDMatrix::GpioType gpio_type;
QByteArray data; QByteArray data;
rda->syslog(LOG_DEBUG,"received rml: \"%s\" from %s", rda->syslog(LOG_INFO,"received rml: \"%s\" from %s",
(const char *)rml_in->toString().toUtf8(), (const char *)rml_in->toString().toUtf8(),
(const char *)rml_in->address().toString().toUtf8()); (const char *)rml_in->address().toString().toUtf8());
@ -820,11 +820,11 @@ void MainObject::RunLocalMacros(RDMacro *rml_in)
} }
if((rml->arg(0).toInt()==0)&&ripc_onair_flag) { if((rml->arg(0).toInt()==0)&&ripc_onair_flag) {
BroadcastCommand("TA 0!"); BroadcastCommand("TA 0!");
rda->syslog(LOG_DEBUG,"onair flag OFF"); rda->syslog(LOG_INFO,"onair flag OFF");
} }
if((rml->arg(0).toInt()==1)&&(!ripc_onair_flag)) { if((rml->arg(0).toInt()==1)&&(!ripc_onair_flag)) {
BroadcastCommand("TA 1!"); BroadcastCommand("TA 1!");
rda->syslog(LOG_DEBUG,"onair flag ON"); rda->syslog(LOG_INFO,"onair flag ON");
} }
ripc_onair_flag=rml->arg(0).toInt(); ripc_onair_flag=rml->arg(0).toInt();
if(rml->echoRequested()) { if(rml->echoRequested()) {
@ -859,7 +859,7 @@ void MainObject::RunLocalMacros(RDMacro *rml_in)
str+=(rml->arg(i)+" "); str+=(rml->arg(i)+" ");
} }
str+=rml->arg(rml->argQuantity()-1); str+=rml->arg(rml->argQuantity()-1);
rda->syslog(LOG_DEBUG,"sending \"%s\" to %s:%d",(const char *)str.toUtf8(), rda->syslog(LOG_INFO,"sending \"%s\" to %s:%d",(const char *)str.toUtf8(),
(const char *)addr.toString().toUtf8(),rml->arg(1).toInt()); (const char *)addr.toString().toUtf8(),rml->arg(1).toInt());
data=RDStringToData(str); data=RDStringToData(str);
ripcd_rml_send->writeDatagram(data,addr,(Q_UINT16)(rml->arg(1).toInt())); ripcd_rml_send->writeDatagram(data,addr,(Q_UINT16)(rml->arg(1).toInt()));

2
ripcd/quartz1.cpp
View File

@ -213,7 +213,7 @@ void Quartz1::errorData(int conn,int err)
{ {
switch((Q3Socket::Error)err) { switch((Q3Socket::Error)err) {
case Q3Socket::ErrConnectionRefused: case Q3Socket::ErrConnectionRefused:
rda->syslog(LOG_NOTICE, rda->syslog(LOG_WARNING,
"connection to Quartz1 device at %s:%d refused, attempting reconnect", "connection to Quartz1 device at %s:%d refused, attempting reconnect",
(const char *)sas_ipaddress[conn].toString().toUtf8(), (const char *)sas_ipaddress[conn].toString().toUtf8(),
sas_ipport[conn]); sas_ipport[conn]);

8
ripcd/ripcd.cpp
View File

@ -229,7 +229,7 @@ void MainObject::notificationReceivedData(const QString &msg,
RDNotification *notify=new RDNotification(); RDNotification *notify=new RDNotification();
if(!notify->read(msg)) { if(!notify->read(msg)) {
rda->syslog(LOG_DEBUG,"invalid notification received from %s", rda->syslog(LOG_INFO,"invalid notification received from %s",
(const char *)addr.toString().toUtf8()); (const char *)addr.toString().toUtf8());
delete notify; delete notify;
return; return;
@ -507,7 +507,7 @@ bool MainObject::DispatchCommand(RipcdConnection *conn)
msg=msg.left(msg.length()-1); msg=msg.left(msg.length()-1);
RDNotification *notify=new RDNotification(); RDNotification *notify=new RDNotification();
if(!notify->read(msg)) { if(!notify->read(msg)) {
rda->syslog(LOG_DEBUG,"invalid notification processed"); rda->syslog(LOG_INFO,"invalid notification processed");
delete notify; delete notify;
return true; return true;
} }
@ -572,7 +572,7 @@ void MainObject::ReadRmlSocket(QUdpSocket *sock,RDMacro::Role role,
} }
} }
else { else {
rda->syslog(LOG_DEBUG, rda->syslog(LOG_INFO,
"rejected rml: \"%s\": on-air flag not active",buffer); "rejected rml: \"%s\": on-air flag not active",buffer);
break; break;
} }
@ -593,7 +593,7 @@ void MainObject::ReadRmlSocket(QUdpSocket *sock,RDMacro::Role role,
} }
} }
else { else {
rda->syslog(LOG_DEBUG,"received malformed rml: \"%s\" from %s:%u", rda->syslog(LOG_INFO,"received malformed rml: \"%s\" from %s:%u",
buffer, buffer,
(const char *)sock->peerAddress().toString().toUtf8(), (const char *)sock->peerAddress().toString().toUtf8(),
sock->peerPort()); sock->peerPort());

2
ripcd/sas16000.cpp
View File

@ -117,7 +117,7 @@ void Sas16000::processCommand(RDMacro *cmd)
void Sas16000::SendCommand(char *str) void Sas16000::SendCommand(char *str)
{ {
rda->syslog(LOG_DEBUG,"sending USI cmd: %s", rda->syslog(LOG_INFO,"sending USI cmd: %s",
(const char *)PrettifyCommand(str)); (const char *)PrettifyCommand(str));
sas_device->writeBlock(str,strlen(str)); sas_device->writeBlock(str,strlen(str));

6
ripcd/sasusi.cpp
View File

@ -299,7 +299,7 @@ void SasUsi::processCommand(RDMacro *cmd)
if(sas_relay_numbers[cmd->arg(2).toUInt()-1]>=0) { if(sas_relay_numbers[cmd->arg(2).toUInt()-1]>=0) {
snprintf(str,256,"\x05R%d%04d\x0D\x0A",cmd_byte, snprintf(str,256,"\x05R%d%04d\x0D\x0A",cmd_byte,
sas_relay_numbers[cmd->arg(2).toUInt()-1]); sas_relay_numbers[cmd->arg(2).toUInt()-1]);
rda->syslog(LOG_NOTICE,"USI: %s", rda->syslog(LOG_DEBUG,"USI: %s",
(const char *)PrettifyCommand(str)); (const char *)PrettifyCommand(str));
SendCommand(str); SendCommand(str);
cmd->acknowledge(true); cmd->acknowledge(true);
@ -418,7 +418,7 @@ void SasUsi::errorData(int err)
void SasUsi::SendCommand(char *str) void SasUsi::SendCommand(char *str)
{ {
rda->syslog(LOG_DEBUG,"sending USI cmd: %s", rda->syslog(LOG_INFO,"sending USI cmd: %s",
(const char *)PrettifyCommand(str)); (const char *)PrettifyCommand(str));
switch(sas_porttype) { switch(sas_porttype) {
case RDMatrix::TtyPort: case RDMatrix::TtyPort:
@ -476,7 +476,7 @@ void SasUsi::DispatchCommand()
} }
} }
rda->syslog(LOG_DEBUG,"received USI cmd: %s", rda->syslog(LOG_INFO,"received USI cmd: %s",
(const char *)PrettifyCommand(sas_buffer)); (const char *)PrettifyCommand(sas_buffer));

2
ripcd/switcher.cpp
View File

@ -82,7 +82,7 @@ void Switcher::logBytes(uint8_t *data,int len)
for(int i=0;i<len;i++) { for(int i=0;i<len;i++) {
str+=QString().sprintf("%02X ",0xff&data[i]); str+=QString().sprintf("%02X ",0xff&data[i]);
} }
rda->syslog(LOG_NOTICE,"bytes: %s",(const char *)str); rda->syslog(LOG_INFO,"bytes: %s",(const char *)str);
} }

2
ripcd/vguest.cpp
View File

@ -760,7 +760,7 @@ void VGuest::MetadataCommand(char *cmd,int len,int id)
vguest_ping_response_timer[id]->stop(); vguest_ping_response_timer[id]->stop();
} }
else { else {
rda->syslog(LOG_DEBUG, rda->syslog(LOG_INFO,
"vGuest system at %s understands ping, activating timeout monitoring", "vGuest system at %s understands ping, activating timeout monitoring",
(const char *)vguest_ipaddress[id].toString().toUtf8()); (const char *)vguest_ipaddress[id].toString().toUtf8());
} }

2
web/rdxport/tests.cpp
View File

@ -50,7 +50,7 @@ void Xport::SaveString()
// //
// Process Request // Process Request
// //
rda->syslog(LOG_NOTICE,"SAVESTRING: |%s|",(const char *)string.utf8()); rda->syslog(LOG_INFO,"SAVESTRING: |%s|",(const char *)string.utf8());
printf("Content-type: application/xml; charset: UTF-8\n"); printf("Content-type: application/xml; charset: UTF-8\n");
printf("Status: 200\n\n"); printf("Status: 200\n\n");
printf("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"); printf("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n");