From 386ea83eeaa2a7f09c6ccc88d39c803e26232cec Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Fri, 30 Aug 2024 17:31:16 -0400 Subject: [PATCH] 2024-08-30 Fred Gleason * Fixed a regression in rdairplay(1) that broke segue transitions. Signed-off-by: Fred Gleason --- ChangeLog | 2 ++ lib/rdplay_deck.cpp | 7 +------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6f0c6a85..c077f8fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24892,3 +24892,5 @@ 2024-08-30 Fred Gleason * Modified log machine logic in rdairplay(1) to properly timescale event transitions. +2024-08-30 Fred Gleason + * Fixed a regression in rdairplay(1) that broke segue transitions. diff --git a/lib/rdplay_deck.cpp b/lib/rdplay_deck.cpp index ba16b9c8..a3c89cec 100644 --- a/lib/rdplay_deck.cpp +++ b/lib/rdplay_deck.cpp @@ -456,8 +456,6 @@ void RDPlayDeck::play(unsigned pos,int segue_start,int segue_end, if(play_serial==0) { return; } - play_point_value[RDPlayDeck::Segue][0]=segue_start; - play_point_value[RDPlayDeck::Segue][1]=segue_end; play_start_position=pos; play_current_position=pos; play_last_start_position=play_start_position; @@ -709,7 +707,7 @@ void RDPlayDeck::pointTimerData(int point) void RDPlayDeck::endData() { - printf("RDPlayDeck::endData()\n"); + printf("RDPlayDeck::endData()\n"); play_position_timer->stop(); play_start_time=QTime(); StopTimers(); @@ -865,9 +863,6 @@ void RDPlayDeck::StartTimers(int offset) play_point_state[i]=false; if((play_point_value[i][0]!=-1)&& (play_point_value[i][0]!=play_point_value[i][1])) { - // scaled_audio_point[0]=(int) - // (RD_TIMESCALE_DIVISOR*(double)play_audio_point[0]/ - // (double)play_timescale_speed); if((play_point_value[i][0]-play_audio_point[0]-offset)>=0) { play_point_timer[i]-> start(scaled_point_value[i][0]-scaled_audio_point[0]-offset);