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

2018-07-31 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Refactored 'RDMacro' to handle UTF-8 strings correctly.
This commit is contained in:
Fred Gleason
2018-07-31 12:54:08 -04:00
parent dbb0d9c415
commit 26c29e1d4e
47 changed files with 676 additions and 686 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rdvairplayd/local_macros.cpp
View File

@@ -64,7 +64,7 @@ void MainObject::rmlReceivedData(RDMacro *rml)
rml->arg(0).toInt()));
}
else { // Load Log
logname=rml->arg(1).toString();
logname=rml->arg(1);
if(!RDLog::exists(logname)) {
if(rml->echoRequested()) {
rml->acknowledge(false);
@@ -157,7 +157,7 @@ void MainObject::rmlReceivedData(RDMacro *rml)
}
return;
}
logname=rml->arg(1).toString();
logname=rml->arg(1);
if(!RDLog::exists(logname)) {
if(rml->echoRequested()) {
rml->acknowledge(false);
@@ -562,8 +562,8 @@ void MainObject::rmlReceivedData(RDMacro *rml)
}
return;
}
if((rml->arg(0).toString().lower()!="now")&&
(rml->arg(0).toString().lower()!="next")) {
if((rml->arg(0).lower()!="now")&&
(rml->arg(0).lower()!="next")) {
if(rml->echoRequested()) {
rml->acknowledge(false);
rda->ripc()->sendRml(rml);
@@ -584,7 +584,7 @@ void MainObject::rmlReceivedData(RDMacro *rml)
}
return;
}
if(rml->arg(0).toString().lower()=="now") {
if(rml->arg(0).lower()=="now") {
air_logs[index]->setNowCart(rml->arg(2).toUInt());
rda->log(RDConfig::LogInfo,QString().
sprintf("set default \"now\" cart to %06u on log machine %d",