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

2018-10-05 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a regression in rdairplay(1) that caused carts Added or Copied
	to a log to have a PLAY transition regardless of the default
	transition type set in rdadmin(1).
This commit is contained in:
Fred Gleason
2018-10-05 17:09:22 -04:00
parent 070ebd5e03
commit ffcfd56d37
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -16696,3 +16696,7 @@
2018-09-20 Fred Gleason <fredg@paravelsystems.com> 2018-09-20 Fred Gleason <fredg@paravelsystems.com>
* Corrected an omission in the documentation of the * Corrected an omission in the documentation of the
'Start Button' ['PB'] RML. 'Start Button' ['PB'] RML.
2018-10-05 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in rdairplay(1) that caused carts Added or Copied
to a log to have a PLAY transition regardless of the default
transition type set in rdadmin(1).

16
rdairplay/rdairplay.cpp
View File

@@ -1610,14 +1610,16 @@ void MainWidget::selectClickedData(int id,int line,RDLogLine::Status status)
case StartButton::AddTo: case StartButton::AddTo:
if(line<0) { if(line<0) {
air_log[id]-> air_log[id]->
insert(air_log[id]->size(),air_add_cart,RDLogLine::Play); insert(air_log[id]->size(),air_add_cart,RDLogLine::Play,
rdairplay_conf->defaultTransType());
air_log[id]->logLine(air_log[id]->size()-1)-> air_log[id]->logLine(air_log[id]->size()-1)->
setTransType(rdairplay_conf->defaultTransType()); setTransType(rdairplay_conf->defaultTransType());
air_log_list[id]->refresh(air_log[id]->size()-1); air_log_list[id]->refresh(air_log[id]->size()-1);
} }
else { else {
air_log[id]-> air_log[id]->
insert(line,air_add_cart,air_log[id]->nextTransType(line)); insert(line,air_add_cart,air_log[id]->nextTransType(line),
rdairplay_conf->defaultTransType());
air_log[id]->logLine(line)-> air_log[id]->logLine(line)->
setTransType(rdairplay_conf->defaultTransType()); setTransType(rdairplay_conf->defaultTransType());
air_log_list[id]->refresh(line); air_log_list[id]->refresh(line);
@@ -1691,10 +1693,12 @@ void MainWidget::selectClickedData(int id,int line,RDLogLine::Status status)
case StartButton::CopyTo: case StartButton::CopyTo:
if(air_source_id==id) { if(air_source_id==id) {
if(line<0) { if(line<0) {
air_log[id]->copy(air_copy_line,air_log[id]->size()); air_log[id]->copy(air_copy_line,air_log[id]->size(),
rdairplay_conf->defaultTransType());
} }
else { else {
air_log[id]->copy(air_copy_line,line); air_log[id]->
copy(air_copy_line,line,rdairplay_conf->defaultTransType());
} }
} }
else { else {
@@ -1772,14 +1776,14 @@ void MainWidget::cartDroppedData(int id,int line,RDLogLine *ll)
else { else {
if(line<0) { if(line<0) {
air_log[id]-> air_log[id]->
insert(air_log[id]->size(),ll->cartNumber(),RDLogLine::Play); insert(air_log[id]->size(),ll->cartNumber(),RDLogLine::Play,rdairplay_conf->defaultTransType());
air_log[id]->logLine(air_log[id]->size()-1)-> air_log[id]->logLine(air_log[id]->size()-1)->
setTransType(rdairplay_conf->defaultTransType()); setTransType(rdairplay_conf->defaultTransType());
air_log_list[id]->refresh(air_log[id]->size()-1); air_log_list[id]->refresh(air_log[id]->size()-1);
} }
else { else {
air_log[id]-> air_log[id]->
insert(line,ll->cartNumber(),air_log[id]->nextTransType(line)); insert(line,ll->cartNumber(),air_log[id]->nextTransType(line),rdairplay_conf->defaultTransType());
air_log[id]->logLine(line)-> air_log[id]->logLine(line)->
setTransType(rdairplay_conf->defaultTransType()); setTransType(rdairplay_conf->defaultTransType());
air_log_list[id]->refresh(line); air_log_list[id]->refresh(line);