Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-12 09:33:37 +02:00
Code Issues Projects Releases Wiki Activity

2019-01-07 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Removed 'apis/rlm/'.
	* Removed the 'Edit Now & Next' button from the 'Configure RDAirPlay'
	dialog in rdadmin(1).
	* Removed RLM support from rdairplay(1) and rdvairplayd(8).
	* Removed v1.x legacy PAD update support from rdairplay(1).
	* Dropped the 'NOWNEXT_PLUGINS' table from the database.
	* Dropped the 'LOG_MACHINES.UDP_ADDR' field from the database.
	* Dropped the 'LOG_MACHINES.UDP_PORT' field from the database.
	* Dropped the 'LOG_MACHINES.UDP_STRING' field from the database.
	* Dropped the 'LOG_MACHINES.LOG_RML' field from the database.
	* Incremented the database version to 305.
This commit is contained in:
Fred Gleason
2019-01-08 10:55:36 -05:00
parent dfc2e86505
commit c85e16c0a2
41 changed files with 245 additions and 2761 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
rdvairplayd/rdvairplayd.cpp
View File

@@ -109,11 +109,6 @@ MainObject::MainObject(QObject *parent)
//
air_event_player=new RDEventPlayer(rda->ripc(),this);
//
// UDP Transmission Socket
//
air_nownext_socket=new Q3SocketDevice(Q3SocketDevice::Datagram);
//
// Log Machines
//
@@ -122,12 +117,8 @@ MainObject::MainObject(QObject *parent)
QSignalMapper *rename_mapper=new QSignalMapper(this);
QString default_svcname=rda->airplayConf()->defaultSvc();
for(int i=0;i<RD_RDVAIRPLAY_LOG_QUAN;i++) {
air_logs[i]=new RDLogPlay(i+RD_RDVAIRPLAY_LOG_BASE,air_event_player,
air_nownext_socket,&air_plugin_hosts);
air_logs[i]=new RDLogPlay(i+RD_RDVAIRPLAY_LOG_BASE,air_event_player,this);
air_logs[i]->setDefaultServiceName(default_svcname);
//
// FIXME: Add the ability to specify default carts for vLogs!
//
air_logs[i]->setNowCart(rda->airplayConf()->logNowCart(i));
air_logs[i]->setNextCart(rda->airplayConf()->logNextCart(i));
reload_mapper->setMapping(air_logs[i],i);
@@ -161,34 +152,6 @@ MainObject::MainObject(QObject *parent)
// connect(air_logs[0],SIGNAL(transportChanged()),
// this,SLOT(transportChangedData()));
//
// Load Plugins
//
QString sql;
RDSqlQuery *q;
sql=QString("select ")+
"PLUGIN_PATH,"+
"PLUGIN_ARG "+
"from NOWNEXT_PLUGINS where "+
"(STATION_NAME=\""+RDEscapeString(rda->config()->stationName())+"\")&&"+
"(LOG_MACHINE=0)";
q=new RDSqlQuery(sql);
while(q->next()) {
air_plugin_hosts.
push_back(new RDRLMHost(q->value(0).toString(),q->value(1).toString(),
air_nownext_socket,this));
rda->log(RDConfig::LogInfo,QString().
sprintf("Loading RLM \"%s\"",
(const char *)q->value(0).toString()));
if(!air_plugin_hosts.back()->load()) {
rda->log(RDConfig::LogWarning,QString().
sprintf("Failed to load RLM \"%s\"",
(const char *)q->value(0).toString()));
}
}
delete q;
//
// Exit Timer
//
@@ -333,9 +296,6 @@ void MainObject::logReloadedData(int log)
void MainObject::exitData()
{
if(global_exiting) {
for(unsigned i=0;i<air_plugin_hosts.size();i++) {
air_plugin_hosts[i]->unload();
}
for(int i=0;i<RD_RDVAIRPLAY_LOG_QUAN;i++) {
delete air_logs[i];
}

4
rdvairplayd/rdvairplayd.h
View File

@@ -22,13 +22,11 @@
#define RDVAIRPLAYD_H
#include <qobject.h>
#include <q3socketdevice.h>
#include <rdevent_player.h>
#include <rd.h>
#include <rdlogplay.h>
#include <rdmacro.h>
#include <rdrlmhost.h>
#define RDVAIRPLAYD_USAGE "[options]\n"
@@ -54,9 +52,7 @@ class MainObject : public QObject
QString air_start_lognames[RD_RDVAIRPLAY_LOG_QUAN];
int air_start_lines[RD_RDVAIRPLAY_LOG_QUAN];
bool air_start_starts[RD_RDVAIRPLAY_LOG_QUAN];
std::vector<RDRLMHost *> air_plugin_hosts;
RDEventPlayer *air_event_player;
Q3SocketDevice *air_nownext_socket;
QDateTime air_startup_datetime;
RDAirPlayConf::ExitCode air_previous_exit_code;
QTimer *air_exit_timer;