From 3cc2b862568e324152a358673d27e1d7f48c827e Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Wed, 24 Oct 2018 20:56:05 -0400 Subject: [PATCH] 2018-10-24 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 | 15 ++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index c966f3f3..41178e47 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17905,3 +17905,7 @@ 2018-10-24 Fred Gleason * Fixed a regression in rdadmin(1) that threw a segfault when the 'OK' button wash pushed in the 'Configure RDCatch' dialog. +2018-10-24 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 d0989992..d30cb54b 100644 --- a/rdairplay/rdairplay.cpp +++ b/rdairplay/rdairplay.cpp @@ -1565,14 +1565,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, + rda->airplayConf()->defaultTransType()); air_log[id]->logLine(air_log[id]->size()-1)-> setTransType(rda->airplayConf()->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), + rda->airplayConf()->defaultTransType()); air_log[id]->logLine(line)-> setTransType(rda->airplayConf()->defaultTransType()); air_log_list[id]->refresh(line); @@ -1645,7 +1647,8 @@ 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(), + rda->airplayConf()->defaultTransType()); } else { air_log[id]->copy(air_copy_line,line); @@ -1726,14 +1729,16 @@ 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, + rda->airplayConf()->defaultTransType()); air_log[id]->logLine(air_log[id]->size()-1)-> setTransType(rda->airplayConf()->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), + rda->airplayConf()->defaultTransType()); air_log[id]->logLine(line)-> setTransType(rda->airplayConf()->defaultTransType()); air_log_list[id]->refresh(line);