Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-05-21 23:29:34 +02:00
Code Issues Projects Releases Wiki Activity

2023-08-21 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Removed dead code from the 'RDPlayDeck' class.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2023-08-21 11:32:37 -04:00
parent 6c1abab4b0
commit cb64fccbbe
3 changed files with 11 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -24354,3 +24354,5 @@
* Fixed a bug in rdlibrary(1) that caused it to emit a SQL error when * 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 processing notifications for cart object with one or more Scheduler
Codes selected. Codes selected.
2023-08-21 Fred Gleason <fredg@paravelsystems.com>
* Removed dead code from the 'RDPlayDeck' class.

24
lib/rdplay_deck.cpp
View File

@ -2,7 +2,7 @@
// //
// Abstract a Rivendell Playback Deck // Abstract a Rivendell Playback Deck
// //
// (C) Copyright 2003-2004,2016 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2003-2023 Fred Gleason <fredg@paravelsystems.com>
// //
// This program is free software; you can redistribute it and/or modify // 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 // 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. // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
// //
#include <qsignalmapper.h> #include <QSignalMapper>
#include <rdplay_deck.h> #include "rdmixer.h"
#include <rdmixer.h> #include "rdplay_deck.h"
RDPlayDeck::RDPlayDeck(RDCae *cae,int id,QObject *parent) RDPlayDeck::RDPlayDeck(RDCae *cae,int id,QObject *parent)
: QObject(parent) : QObject(parent)
@ -159,10 +159,6 @@ bool RDPlayDeck::setCart(RDLogLine *logline,bool rotate)
} }
if(logline->startPoint(RDLogLine::LogPointer)<0) { if(logline->startPoint(RDLogLine::LogPointer)<0) {
play_forced_length=logline->forcedLength(); 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[0]=play_cut->startPoint(RDLogLine::CartPointer);
play_audio_point[1]=play_cut->endPoint(); 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[0]=logline->duckUpGain();
play_duck_gain[1]=logline->duckDownGain(); 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_state!=RDPlayDeck::Paused) {
if(!play_cae->loadPlay(play_card,play_cut->cutName(), if(!play_cae->loadPlay(play_card,play_cut->cutName(),
&play_stream,&play_handle)) { &play_stream,&play_handle)) {

12
lib/rdplay_deck.h
View File

@ -2,7 +2,7 @@
// //
// Abstract a Rivendell Playback Deck // Abstract a Rivendell Playback Deck
// //
// (C) Copyright 2003,2016 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2003-2023 Fred Gleason <fredg@paravelsystems.com>
// //
// This program is free software; you can redistribute it and/or modify // 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 // 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. // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
// //
#include <qdatetime.h> #include <QDateTime>
#include <qsqldatabase.h> #include <QObject>
#include <qobject.h> #include <QTimer>
#include <qtimer.h>
#include <rdcae.h> #include <rdcae.h>
#include <rdcart.h> #include <rdcart.h>
@ -71,7 +70,6 @@ class RDPlayDeck : public QObject
void playHook(); void playHook();
void pause(); void pause();
void stop(); void stop();
// void stop(int interval);
void stop(int interval,int gain=-10000); void stop(int interval,int gain=-10000);
void duckDown(int interval); void duckDown(int interval);
void duckVolume(int level,int fade); void duckVolume(int level,int fade);
@ -145,4 +143,4 @@ class RDPlayDeck : public QObject
}; };
#endif #endif // RDPLAY_DECK_H