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

2018-09-03 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Renamed the 'Add Next' ['PX'] RML to 'Insert Cart' ['PX'].
	* Added an 'offset' parameter to the 'Insert Cart' ['PX'] RML.
This commit is contained in:
Fred Gleason
2018-09-03 14:15:47 +00:00
parent b8e63a26ec
commit 1f18f30cf8
3 changed files with 45 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
rdairplay/local_macros.cpp
View File

@@ -43,6 +43,7 @@ void MainWidget::RunLocalMacros(RDMacro *rml)
QString label;
int mach=0;
RDLogLine::TransType trans=RDLogLine::Play;
int offset=0;
if(rml->role()!=RDMacro::Cmd) {
return;
@@ -784,7 +785,7 @@ void MainWidget::RunLocalMacros(RDMacro *rml)
break;
case RDMacro::PX: // Add Next
if((rml->argQuantity()<2)||(rml->argQuantity()>3)) {
if((rml->argQuantity()<2)||(rml->argQuantity()>4)) {
if(rml->echoRequested()) {
rml->acknowledge(false);
rda->ripc()->sendRml(rml);
@@ -799,18 +800,22 @@ void MainWidget::RunLocalMacros(RDMacro *rml)
}
return;
}
offset=0;
if(rml->argQuantity()>=3) {
offset=rml->arg(2).toInt();
}
trans=RDLogLine::Play;
if(rml->argQuantity()==3) {
if(rml->arg(2).toLower()=="segue") {
if(rml->argQuantity()==4) {
if(rml->arg(3).toLower()=="segue") {
trans=RDLogLine::Segue;
}
if(rml->arg(2).toLower()=="stop") {
if(rml->arg(3).toLower()=="stop") {
trans=RDLogLine::Stop;
}
}
if(air_log[rml->arg(0).toInt()-1]->nextLine()>=0) {
air_log[rml->arg(0).toInt()-1]->
insert(air_log[rml->arg(0).toInt()-1]->nextLine(),
insert(air_log[rml->arg(0).toInt()-1]->nextLine()+offset,
rml->arg(1).toUInt(),RDLogLine::NoTrans,trans);
}
else {