Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-06-05 22:52:45 +02:00
Code Issues Projects Releases Wiki Activity

2018-10-24 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-24 20:56:05 -04:00
parent c546bcc0b4
commit 3cc2b86256
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -17905,3 +17905,7 @@
2018-10-24 Fred Gleason <fredg@paravelsystems.com> 2018-10-24 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in rdadmin(1) that threw a segfault when the * Fixed a regression in rdadmin(1) that threw a segfault when the
'OK' button wash pushed in the 'Configure RDCatch' dialog. 'OK' button wash pushed in the 'Configure RDCatch' dialog.
2018-10-24 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).

15
rdairplay/rdairplay.cpp
View File

@ -1565,14 +1565,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,
rda->airplayConf()->defaultTransType());
air_log[id]->logLine(air_log[id]->size()-1)-> air_log[id]->logLine(air_log[id]->size()-1)->
setTransType(rda->airplayConf()->defaultTransType()); setTransType(rda->airplayConf()->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),
rda->airplayConf()->defaultTransType());
air_log[id]->logLine(line)-> air_log[id]->logLine(line)->
setTransType(rda->airplayConf()->defaultTransType()); setTransType(rda->airplayConf()->defaultTransType());
air_log_list[id]->refresh(line); air_log_list[id]->refresh(line);
@ -1645,7 +1647,8 @@ 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(),
rda->airplayConf()->defaultTransType());
} }
else { else {
air_log[id]->copy(air_copy_line,line); air_log[id]->copy(air_copy_line,line);
@ -1726,14 +1729,16 @@ 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,
rda->airplayConf()->defaultTransType());
air_log[id]->logLine(air_log[id]->size()-1)-> air_log[id]->logLine(air_log[id]->size()-1)->
setTransType(rda->airplayConf()->defaultTransType()); setTransType(rda->airplayConf()->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),
rda->airplayConf()->defaultTransType());
air_log[id]->logLine(line)-> air_log[id]->logLine(line)->
setTransType(rda->airplayConf()->defaultTransType()); setTransType(rda->airplayConf()->defaultTransType());
air_log_list[id]->refresh(line); air_log_list[id]->refresh(line);