Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-14 22:51:13 +02:00
Code Issues Projects Releases Wiki Activity

2020-05-29 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a bug in rdairplay(1) where attempting to audition an
	audio cart with a disabled cue output would crash the application.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2020-05-29 10:24:24 -04:00
parent f3bd897eff
commit 6cd1b3bb19
11 changed files with 39 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/rdcueedit.cpp
View File

@@ -2,7 +2,7 @@
//
// Cueing Editor for RDLogLine-based Events
//
// (C) Copyright 2013-2019 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2013-2020 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
@@ -26,12 +26,9 @@
#include "rdconf.h"
#include "rdcueedit.h"
RDCueEdit::RDCueEdit(RDCae *cae,int card,int port,QWidget *parent)
RDCueEdit::RDCueEdit(QWidget *parent)
: RDWidget(parent)
{
edit_cae=cae;
edit_play_card=card;
edit_play_port=port;
edit_height=325;
edit_slider_pressed=false;
edit_shift_pressed=false;
@@ -102,7 +99,8 @@ RDCueEdit::RDCueEdit(RDCae *cae,int card,int port,QWidget *parent)
edit_audition_button->
setPalette(QPalette(backgroundColor(),QColor(Qt::gray)));
edit_audition_button->setFont(buttonFont());
// edit_audition_button->setText(tr("&Audition"));
edit_audition_button->
setDisabled((rda->station()->cueCard()<0)||(rda->station()->cuePort()<0));
connect(edit_audition_button,SIGNAL(clicked()),
this,SLOT(auditionButtonData()));
@@ -114,7 +112,8 @@ RDCueEdit::RDCueEdit(RDCae *cae,int card,int port,QWidget *parent)
edit_pause_button->
setPalette(QPalette(backgroundColor(),QColor(Qt::gray)));
edit_pause_button->setFont(buttonFont());
// edit_pause_button->setText(tr("&Pause"));
edit_pause_button->
setDisabled((rda->station()->cueCard()<0)||(rda->station()->cuePort()<0));
connect(edit_pause_button,SIGNAL(clicked()),this,SLOT(pauseButtonData()));
//
@@ -126,7 +125,8 @@ RDCueEdit::RDCueEdit(RDCae *cae,int card,int port,QWidget *parent)
edit_stop_button->
setPalette(QPalette(backgroundColor(),QColor(Qt::gray)));
edit_stop_button->setFont(buttonFont());
// edit_stop_button->setText(tr("&Stop"));
edit_stop_button->
setDisabled((rda->station()->cueCard()<0)||(rda->station()->cuePort()<0));
connect(edit_stop_button,SIGNAL(clicked()),this,SLOT(stopButtonData()));
//
@@ -180,7 +180,7 @@ RDCueEdit::RDCueEdit(RDCae *cae,int card,int port,QWidget *parent)
//
// Play Deck
//
edit_play_deck=new RDPlayDeck(edit_cae,RDPLAYDECK_AUDITION_ID,this);
edit_play_deck=new RDPlayDeck(rda->cae(),RDPLAYDECK_AUDITION_ID,this);
connect(edit_play_deck,SIGNAL(stateChanged(int,RDPlayDeck::State)),this,
SLOT(stateChangedData(int,RDPlayDeck::State)));
connect(edit_play_deck,SIGNAL(position(int,int)),
@@ -312,8 +312,8 @@ void RDCueEdit::auditionButtonData()
if(edit_play_deck->state()==RDPlayDeck::Playing) {
return;
}
edit_play_deck->setCard(edit_play_card);
edit_play_deck->setPort(edit_play_port);
edit_play_deck->setCard(rda->station()->cueCard());
edit_play_deck->setPort(rda->station()->cuePort());
if(!edit_play_deck->setCart(edit_logline,false)) {
return;
}
@@ -621,8 +621,8 @@ void RDCueEdit::UpdateCounters()
void RDCueEdit::ClearChannel()
{
if(edit_cae->playPortActive(edit_play_deck->card(),edit_play_deck->port(),
edit_play_deck->stream())) {
if(rda->cae()->playPortActive(edit_play_deck->card(),edit_play_deck->port(),
edit_play_deck->stream())) {
return;
}
if((!edit_stop_rml.isEmpty())&&(edit_event_player!=NULL)) {

7
lib/rdcueedit.h
View File

@@ -2,7 +2,7 @@
//
// Cueing Editor for RDLogLine-based Events
//
// (C) Copyright 2002-2019 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2020 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
@@ -39,7 +39,7 @@ class RDCueEdit : public RDWidget
{
Q_OBJECT
public:
RDCueEdit(RDCae *cae,int card,int port,QWidget *parent=0);
RDCueEdit(QWidget *parent=0);
~RDCueEdit();
QSize sizeHint() const;
QSizePolicy sizePolicy() const;
@@ -82,9 +82,6 @@ class RDCueEdit : public RDWidget
RDEventPlayer *edit_event_player;
QString edit_start_rml;
QString edit_stop_rml;
RDCae *edit_cae;
int edit_play_card;
int edit_play_port;
RDSlider *edit_slider;
QLabel *edit_up_label;
QLabel *edit_down_label;

4
lib/rdcueeditdialog.cpp
View File

@@ -2,7 +2,7 @@
//
// A Dialog Box for using an RDCueEdit widget.
//
// (C) Copyright 2002-2019 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2020 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU Library General Public License
@@ -32,7 +32,7 @@ RDCueEditDialog::RDCueEditDialog(RDCae *cae,int play_card,int play_port,
//
// Cue Editor
//
cue_edit=new RDCueEdit(cae,play_card,play_port,this);
cue_edit=new RDCueEdit(this);
cue_edit->setGeometry(15,10,
cue_edit->sizeHint().width(),
cue_edit->sizeHint().height());