diff --git a/ChangeLog b/ChangeLog index d6cc09da..a7e2c45d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24354,3 +24354,5 @@ * Fixed a bug in rdlibrary(1) that caused it to emit a SQL error when processing notifications for cart object with one or more Scheduler Codes selected. +2023-08-21 Fred Gleason + * Removed dead code from the 'RDPlayDeck' class. diff --git a/lib/rdplay_deck.cpp b/lib/rdplay_deck.cpp index e9203414..bcd40423 100644 --- a/lib/rdplay_deck.cpp +++ b/lib/rdplay_deck.cpp @@ -2,7 +2,7 @@ // // Abstract a Rivendell Playback Deck // -// (C) Copyright 2003-2004,2016 Fred Gleason +// (C) Copyright 2003-2023 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -18,10 +18,10 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include +#include -#include -#include +#include "rdmixer.h" +#include "rdplay_deck.h" RDPlayDeck::RDPlayDeck(RDCae *cae,int id,QObject *parent) : QObject(parent) @@ -159,10 +159,6 @@ bool RDPlayDeck::setCart(RDLogLine *logline,bool rotate) } if(logline->startPoint(RDLogLine::LogPointer)<0) { play_forced_length=logline->forcedLength(); - /* - play_audio_point[0]=logline->startPoint(); - play_audio_point[1]=logline->endPoint(); - */ play_audio_point[0]=play_cut->startPoint(RDLogLine::CartPointer); play_audio_point[1]=play_cut->endPoint(); } @@ -238,18 +234,6 @@ bool RDPlayDeck::setCart(RDLogLine *logline,bool rotate) } play_duck_gain[0]=logline->duckUpGain(); play_duck_gain[1]=logline->duckDownGain(); - -/* - if(play_timescale_active) { - play_timescale_speed= - (int)(1000*(double)(play_audio_point[1]-play_audio_point[0])/ - (double)play_forced_length); - } - else { - play_timescale_speed=1000; - } -*/ - if(play_state!=RDPlayDeck::Paused) { if(!play_cae->loadPlay(play_card,play_cut->cutName(), &play_stream,&play_handle)) { diff --git a/lib/rdplay_deck.h b/lib/rdplay_deck.h index 574a9531..7cee7315 100644 --- a/lib/rdplay_deck.h +++ b/lib/rdplay_deck.h @@ -2,7 +2,7 @@ // // Abstract a Rivendell Playback Deck // -// (C) Copyright 2003,2016 Fred Gleason +// (C) Copyright 2003-2023 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -18,10 +18,9 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include -#include -#include -#include +#include +#include +#include #include #include @@ -71,7 +70,6 @@ class RDPlayDeck : public QObject void playHook(); void pause(); void stop(); - // void stop(int interval); void stop(int interval,int gain=-10000); void duckDown(int interval); void duckVolume(int level,int fade); @@ -145,4 +143,4 @@ class RDPlayDeck : public QObject }; -#endif +#endif // RDPLAY_DECK_H