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

2017-05-02 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a bug that caused RDCartSlots to fail to rotate cuts when
	replaying a cart without a reload.
This commit is contained in:
Fred Gleason 2017-05-02 11:47:28 -04:00
parent 4a3826bc99
commit 564414cbe3
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -15751,3 +15751,6 @@
* Added a '--enable-rdxport-debug' switch to 'configure.ac'.
2017-04-20 Fred Gleason <fredg@paravelsystems.com>
* Incremented the package version to 2.15.3int04.
2017-05-02 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug that caused RDCartSlots to fail to rotate cuts when
replaying a cart without a reload.

11
lib/rdcartslot.cpp
View File

@ -2,7 +2,7 @@
//
// The cart slot widget.
//
// (C) Copyright 2012-2014,2016 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2012-2014,2016-2017 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
@ -285,7 +285,6 @@ bool RDCartSlot::play()
slot_deck->play(slot_logline->playPosition());
}
slot_logline->setStartTime(RDLogLine::Actual,QTime::currentTime());
// LogPlayout(RDAirPlayConf::TrafficStart);
ret=true;
}
}
@ -305,7 +304,9 @@ bool RDCartSlot::stop()
if(slot_logline->cartNumber()!=0) {
slot_stop_requested=true;
slot_deck->stop();
// LogPlayout(RDAirPlayConf::TrafficStop);
RDCart *cart=new RDCart(slot_logline->cartNumber());
setCart(cart);
delete cart;
ret=true;
}
return ret;
@ -474,6 +475,7 @@ void RDCartSlot::stateChangedData(int id,RDPlayDeck::State state)
{
//printf("stateChangedData(%d,%d)\n",id,state);
short lvls[2]={-10000,-10000};
RDCart *cart=NULL;
switch(state) {
case RDPlayDeck::Playing:
@ -501,6 +503,9 @@ void RDCartSlot::stateChangedData(int id,RDPlayDeck::State state)
if(!slot_stop_requested) {
switch(slot_options->stopAction()) {
case RDSlotOptions::RecueOnStop:
cart=new RDCart(slot_logline->cartNumber());
setCart(cart);
delete cart;
break;
case RDSlotOptions::UnloadOnStop: