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

2023-03-07 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a regression in rdvairplayd(8) that caused a segfault on
	startup.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2023-03-07 11:05:33 -05:00
parent c1dbdd2066
commit 66b331cab2
5 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -24003,3 +24003,6 @@
resolutions when using the 'MMM' wildcard.
2023-03-07 Fred Gleason <fredg@paravelsystems.com>
* Corrected a maintainer's note in 'lib/rdcoreapplication.cpp'.
2023-03-07 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in rdvairplayd(8) that caused a segfault on
startup.

4
lib/rdlogplay.cpp
View File

@ -35,7 +35,7 @@
//#define SHOW_SLOTS
//#define SHOW_METER_SLOTS
RDLogPlay::RDLogPlay(int id,RDEventPlayer *player,QObject *parent)
RDLogPlay::RDLogPlay(int id,RDEventPlayer *player,bool enable_cue,QObject *parent)
: RDLogModel(parent)
{
//
@ -131,7 +131,7 @@ RDLogPlay::RDLogPlay(int id,RDEventPlayer *player,QObject *parent)
// Audition Player
//
play_audition_line=-1;
if((rda->station()->cueCard()>=0)&&
if(enable_cue&&(rda->station()->cueCard()>=0)&&
(rda->station()->cuePort()>=0)) {
play_audition_player=
new RDSimplePlayer(play_cae,rda->ripc(),rda->station()->cueCard(),

4
lib/rdlogplay.h
View File

@ -2,7 +2,7 @@
//
// Rivendell Log Playout Machine
//
// (C) Copyright 2002-2022 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2023 Fred Gleason <fredg@paravelsystems.com>
//
// 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
@ -50,7 +50,7 @@ class RDLogPlay : public RDLogModel
{
Q_OBJECT
public:
RDLogPlay(int id,RDEventPlayer *player,QObject *parent=0);
RDLogPlay(int id,RDEventPlayer *player,bool enable_cue,QObject *parent);
QString serviceName() const;
void setServiceName(const QString &svcname);
QString defaultServiceName() const;

2
rdairplay/rdairplay.cpp
View File

@ -277,7 +277,7 @@ MainWidget::MainWidget(RDConfig *config,QWidget *parent)
connect(rename_mapper,SIGNAL(mapped(int)),this,SLOT(logRenamedData(int)));
QString default_svcname=rda->airplayConf()->defaultSvc();
for(int i=0;i<RDAIRPLAY_LOG_QUANTITY;i++) {
air_log[i]=new RDLogPlay(i,air_event_player,this);
air_log[i]=new RDLogPlay(i,air_event_player,true,this);
air_log[i]->setDefaultServiceName(default_svcname);
air_log[i]->setNowCart(rda->airplayConf()->logNowCart(i));
air_log[i]->setNextCart(rda->airplayConf()->logNextCart(i));

2
rdvairplayd/rdvairplayd.cpp
View File

@ -119,7 +119,7 @@ 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,this);
air_logs[i]=new RDLogPlay(i+RD_RDVAIRPLAY_LOG_BASE,air_event_player,false,this);
air_logs[i]->setDefaultServiceName(default_svcname);
air_logs[i]->setNowCart(rda->airplayConf()->logNowCart(i));
air_logs[i]->setNextCart(rda->airplayConf()->logNextCart(i));