From ffcfd56d372095bd6fdf8a911c00fbd8c44074bc Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Fri, 5 Oct 2018 17:09:22 -0400 Subject: [PATCH] 2018-10-05 Fred Gleason * 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). --- ChangeLog | 4 ++++ rdairplay/rdairplay.cpp | 16 ++++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 16642b9e..6b5f0c06 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16696,3 +16696,7 @@ 2018-09-20 Fred Gleason * Corrected an omission in the documentation of the 'Start Button' ['PB'] RML. +2018-10-05 Fred Gleason + * 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). diff --git a/rdairplay/rdairplay.cpp b/rdairplay/rdairplay.cpp index 6db40609..525685e1 100644 --- a/rdairplay/rdairplay.cpp +++ b/rdairplay/rdairplay.cpp @@ -1610,14 +1610,16 @@ void MainWidget::selectClickedData(int id,int line,RDLogLine::Status status) case StartButton::AddTo: if(line<0) { 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)-> setTransType(rdairplay_conf->defaultTransType()); air_log_list[id]->refresh(air_log[id]->size()-1); } else { 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)-> setTransType(rdairplay_conf->defaultTransType()); air_log_list[id]->refresh(line); @@ -1691,10 +1693,12 @@ void MainWidget::selectClickedData(int id,int line,RDLogLine::Status status) case StartButton::CopyTo: if(air_source_id==id) { 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 { - air_log[id]->copy(air_copy_line,line); + air_log[id]-> + copy(air_copy_line,line,rdairplay_conf->defaultTransType()); } } else { @@ -1772,14 +1776,14 @@ void MainWidget::cartDroppedData(int id,int line,RDLogLine *ll) else { if(line<0) { 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)-> setTransType(rdairplay_conf->defaultTransType()); air_log_list[id]->refresh(air_log[id]->size()-1); } else { 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)-> setTransType(rdairplay_conf->defaultTransType()); air_log_list[id]->refresh(line);