Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2026-01-12 07:35:55 +01:00
Code Issues Projects Releases Wiki Activity

2014-09-04 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Removed object names in 'rdairplay/log_play.cpp' and
	'rdairplay/log_play.h'.
This commit is contained in:
Fred Gleason
2014-09-04 17:16:40 -04:00
parent f2f823eb9b
commit 8b0aa4622d
3 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -14417,3 +14417,6 @@
the 'Switcher Matrix' and 'Switcher Output' dropdowns to fail to the 'Switcher Matrix' and 'Switcher Output' dropdowns to fail to
be populated for a LiveWire LWRP Audio switcher device in be populated for a LiveWire LWRP Audio switcher device in
'rdadmin/edit_decks.cpp' and 'rdadmin/edit_decks.h'. 'rdadmin/edit_decks.cpp' and 'rdadmin/edit_decks.h'.
2014-09-04 Fred Gleason <fredg@paravelsystems.com>
* Removed object names in 'rdairplay/log_play.cpp' and
'rdairplay/log_play.h'.

17
rdairplay/log_play.cpp
View File

@@ -32,9 +32,8 @@
#include <globals.h> #include <globals.h>
LogPlay::LogPlay(RDCae *cae,int id,QSocketDevice *nn_sock,QString logname, LogPlay::LogPlay(RDCae *cae,int id,QSocketDevice *nn_sock,QString logname,
std::vector<RLMHost *> *rlm_hosts, std::vector<RLMHost *> *rlm_hosts,QObject *parent)
QObject *parent,const char *name) : QObject(parent),RDLogEvent(logname)
: QObject(parent,name),RDLogEvent(logname)
{ {
// //
// Initialize Data Structures // Initialize Data Structures
@@ -89,8 +88,7 @@ LogPlay::LogPlay(RDCae *cae,int id,QSocketDevice *nn_sock,QString logname,
// //
// Macro Cart Decks // Macro Cart Decks
// //
play_macro_deck=new RDMacroEvent(rdstation_conf->address(),rdripc, play_macro_deck=new RDMacroEvent(rdstation_conf->address(),rdripc,this);
this,"play_macro_deck");
connect(play_macro_deck,SIGNAL(started()),this,SLOT(macroStartedData())); connect(play_macro_deck,SIGNAL(started()),this,SLOT(macroStartedData()));
connect(play_macro_deck,SIGNAL(finished()),this,SLOT(macroFinishedData())); connect(play_macro_deck,SIGNAL(finished()),this,SLOT(macroFinishedData()));
connect(play_macro_deck,SIGNAL(stopped()),this,SLOT(macroStoppedData())); connect(play_macro_deck,SIGNAL(stopped()),this,SLOT(macroStoppedData()));
@@ -131,19 +129,18 @@ LogPlay::LogPlay(RDCae *cae,int id,QSocketDevice *nn_sock,QString logname,
// //
// Transition Timers // Transition Timers
// //
play_trans_timer=new QTimer(this,"play_trans_timer"); play_trans_timer=new QTimer(this);
connect(play_trans_timer,SIGNAL(timeout()), connect(play_trans_timer,SIGNAL(timeout()),
this,SLOT(transTimerData())); this,SLOT(transTimerData()));
play_grace_timer=new QTimer(this,"play_grace_timer"); play_grace_timer=new QTimer(this);
connect(play_grace_timer,SIGNAL(timeout()), connect(play_grace_timer,SIGNAL(timeout()),
this,SLOT(graceTimerData())); this,SLOT(graceTimerData()));
// //
// Rescan Timer // Rescan Timer
// //
play_rescan_timer=new QTimer(this,"play_rescan_timer"); play_rescan_timer=new QTimer(this);
connect(play_rescan_timer,SIGNAL(timeout()), connect(play_rescan_timer,SIGNAL(timeout()),this,SLOT(rescanEventsData()));
this,SLOT(rescanEventsData()));
play_rescan_timer->start(LOGPLAY_RESCAN_INTERVAL); play_rescan_timer->start(LOGPLAY_RESCAN_INTERVAL);
} }

3
rdairplay/log_play.h
View File

@@ -63,8 +63,7 @@ class LogPlay : public QObject,public RDLogEvent
Q_OBJECT Q_OBJECT
public: public:
LogPlay(RDCae *cae,int id,QSocketDevice *nn_sock,QString logname, LogPlay(RDCae *cae,int id,QSocketDevice *nn_sock,QString logname,
std::vector<RLMHost *> *rlm_hosts, std::vector<RLMHost *> *rlm_hosts,QObject *parent=0);
QObject *parent=0,const char *name=0);
QString serviceName() const; QString serviceName() const;
void setServiceName(const QString &svcname); void setServiceName(const QString &svcname);
QString defaultServiceName() const; QString defaultServiceName() const;