Skip to content

Commit

Permalink
vc/cue list: fix side fader input autodetection
Browse files Browse the repository at this point in the history
  • Loading branch information
mcallegari committed Dec 16, 2018
1 parent 1454aaf commit 3c59ec7
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 10 deletions.
10 changes: 1 addition & 9 deletions ui/src/virtualconsole/vccuelistproperties.cpp
Expand Up @@ -115,14 +115,12 @@ VCCueListProperties::VCCueListProperties(VCCueList* cueList, Doc* doc)
m_crossFadeRadio->setChecked(true); m_crossFadeRadio->setChecked(true);


m_crossfadeInputWidget = new InputSelectionWidget(m_doc, this); m_crossfadeInputWidget = new InputSelectionWidget(m_doc, this);
m_crossfadeInputWidget->setTitle(tr("Left Fader")); m_crossfadeInputWidget->setTitle(tr("External Input"));
m_crossfadeInputWidget->setKeyInputVisibility(false); m_crossfadeInputWidget->setKeyInputVisibility(false);
m_crossfadeInputWidget->setInputSource(m_cueList->inputSource(VCCueList::sideFaderInputSourceId)); m_crossfadeInputWidget->setInputSource(m_cueList->inputSource(VCCueList::sideFaderInputSourceId));
m_crossfadeInputWidget->setWidgetPage(m_cueList->page()); m_crossfadeInputWidget->setWidgetPage(m_cueList->page());
m_crossfadeInputWidget->show(); m_crossfadeInputWidget->show();
m_crossFadeLayout->addWidget(m_crossfadeInputWidget); m_crossFadeLayout->addWidget(m_crossfadeInputWidget);
connect(m_crossfadeInputWidget, SIGNAL(autoDetectToggled(bool)),
this, SLOT(slotCFAutoDetectionToggled(bool)));


/* Playback layout */ /* Playback layout */
connect(m_play_stop_pause, SIGNAL(clicked(bool)), this, SLOT(slotPlaybackLayoutChanged())); connect(m_play_stop_pause, SIGNAL(clicked(bool)), this, SLOT(slotPlaybackLayoutChanged()));
Expand Down Expand Up @@ -188,12 +186,6 @@ void VCCueListProperties::slotTabChanged()
m_crossfadeInputWidget->stopAutoDetection(); m_crossfadeInputWidget->stopAutoDetection();
} }


void VCCueListProperties::slotCFAutoDetectionToggled(bool checked)
{
if (checked == true && m_crossfadeInputWidget->isAutoDetecting())
m_crossfadeInputWidget->stopAutoDetection();
}

/**************************************************************************** /****************************************************************************
* Cues * Cues
****************************************************************************/ ****************************************************************************/
Expand Down
1 change: 0 additions & 1 deletion ui/src/virtualconsole/vccuelistproperties.h
Expand Up @@ -49,7 +49,6 @@ class VCCueListProperties : public QDialog, public Ui_VCCueListProperties
public slots: public slots:
void accept(); void accept();
void slotTabChanged(); void slotTabChanged();
void slotCFAutoDetectionToggled(bool checked);


protected: protected:
VCCueList* m_cueList; VCCueList* m_cueList;
Expand Down

0 comments on commit 3c59ec7

Please sign in to comment.