Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-11 17:13:47 +02:00
Code Issues Projects Releases Wiki Activity

2020-06-23 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a bug in the 'Add Next' ['PX'] RML that failed to return an
	error when an invalid offset value was supplied.
	* Fixed a bug in the 'Add Next' ['PX'] RML that failed to honor
	the 'Default Trans. Type' setting in the 'Configure RDAirPlay'
	dialog in rdadmin(1).

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2020-06-23 11:03:40 -04:00
parent 3f7be11b1c
commit e223de2609
4 changed files with 42 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
rdairplay/local_macros.cpp
View File

@@ -2,7 +2,7 @@
//
// Local RML Macros for the Rivendell's RDAirPlay
//
// (C) Copyright 2002-2018 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2020 Fred Gleason <fredg@paravelsystems.com>
//
// 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
@@ -44,6 +44,8 @@ void MainWidget::RunLocalMacros(RDMacro *rml)
int mach=0;
RDLogLine::TransType trans=RDLogLine::Play;
int offset=0;
bool ok=false;
unsigned cart=0;
if(rml->role()!=RDMacro::Cmd) {
return;
@@ -792,7 +794,11 @@ void MainWidget::RunLocalMacros(RDMacro *rml)
}
return;
}
if((rml->arg(0).toInt()<1)||(rml->arg(0).toInt()>3)||
mach=rml->arg(0).toInt();
cart=cart;
offset=0;
trans=air_default_trans_type;
if((mach<1)||(mach>3)||
(rml->arg(1).toUInt()>999999)) {
if(rml->echoRequested()) {
rml->acknowledge(false);
@@ -800,30 +806,46 @@ void MainWidget::RunLocalMacros(RDMacro *rml)
}
return;
}
offset=0;
if(rml->argQuantity()>=3) {
offset=rml->arg(2).toInt();
offset=rml->arg(2).toInt(&ok);
if(!ok) {
if(rml->echoRequested()) {
rml->acknowledge(false);
rda->ripc()->sendRml(rml);
}
return;
}
}
trans=RDLogLine::Play;
if(rml->argQuantity()==4) {
trans=RDLogLine::NoTrans;
if(rml->arg(3).toLower()=="play") {
trans=RDLogLine::Play;
}
if(rml->arg(3).toLower()=="segue") {
trans=RDLogLine::Segue;
}
if(rml->arg(3).toLower()=="stop") {
trans=RDLogLine::Stop;
}
if(trans==RDLogLine::NoTrans) {
if(rml->echoRequested()) {
rml->acknowledge(false);
rda->ripc()->sendRml(rml);
}
return;
}
}
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()+offset,
if(air_log[mach-1]->nextLine()>=0) {
air_log[mach-1]->
insert(air_log[mach-1]->nextLine()+offset,
rml->arg(1).toUInt(),RDLogLine::NoTrans,trans);
}
else {
air_log[rml->arg(0).toInt()-1]->
insert(air_log[rml->arg(0).toInt()-1]->size(),
air_log[mach-1]->
insert(air_log[mach-1]->size(),
rml->arg(1).toUInt(),RDLogLine::NoTrans,trans);
air_log[rml->arg(0).toInt()-1]->
makeNext(air_log[rml->arg(0).toInt()-1]->size()-1);
air_log[mach-1]->
makeNext(air_log[mach-1]->size()-1);
}
if(rml->echoRequested()) {
rml->acknowledge(true);