Skip to content

Commit b4cbfff

Browse files
committed
GUI - fix Audio -> Link Connect menu item
1 parent 5ecb0c5 commit b4cbfff

File tree

3 files changed

+5
-16
lines changed

3 files changed

+5
-16
lines changed

app/gui/mainwindow.cpp

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -415,6 +415,7 @@ void MainWindow::setupWindowStructure()
415415
errorPane = new QTextBrowser;
416416
metroPane = new SonicPiMetro(m_spClient, m_spAPI, theme, this);
417417

418+
418419
connect(metroPane, SIGNAL(linkEnabled()), this, SLOT(checkEnableLinkMenu()));
419420
connect(metroPane, SIGNAL(linkDisabled()), this, SLOT(uncheckEnableLinkMenu()));
420421

@@ -1365,22 +1366,9 @@ void MainWindow::enableScsynthInputsMenuChanged()
13651366
changeEnableScsynthInputs();
13661367
}
13671368

1368-
void MainWindow::enableLinkMenuChanged()
1369-
{
1370-
if (enableLinkAct->isChecked())
1371-
{
1372-
metroPane->linkEnable();
1373-
}
1374-
else
1375-
{
1376-
metroPane->linkDisable();
1377-
}
1378-
}
1379-
13801369
void MainWindow::toggleLinkMenu()
13811370
{
1382-
enableLinkAct->setChecked(!enableLinkAct->isChecked());
1383-
enableLinkMenuChanged();
1371+
metroPane->toggleLink();
13841372
}
13851373

13861374
void MainWindow::uncheckEnableLinkMenu()
@@ -3538,6 +3526,7 @@ void MainWindow::createToolBar()
35383526
enableLinkAct->setChecked(false);
35393527
connect(enableLinkAct, SIGNAL(triggered()), this, SLOT(toggleLinkMenu()));
35403528

3529+
35413530
linkTapTempoAct = new QAction(tr("Tap Tempo"), this);
35423531
connect(linkTapTempoAct, SIGNAL(triggered()), metroPane, SLOT(tapTempo()));
35433532

app/gui/mainwindow.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,6 @@ private slots:
233233
void mixerInvertStereoMenuChanged();
234234
void mixerForceMonoMenuChanged();
235235
void enableScsynthInputsMenuChanged();
236-
void enableLinkMenuChanged();
237236
void uncheckEnableLinkMenu();
238237
void checkEnableLinkMenu();
239238
void toggleLinkMenu();

app/gui/widgets/sonicpimetro.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ class SonicPiMetro : public QWidget
4343

4444
void setFocusBPMScrubber();
4545
void setFocusTimeWarpScrubber();
46+
void toggleLink();
4647

4748
signals:
4849
void linkEnabled();
@@ -68,7 +69,7 @@ public slots:
6869
qint64 firstTap = 0;
6970
qint64 lastTap = 0;
7071

71-
void toggleLink();
72+
7273
bool isSetPosAvailable();
7374
void updateActiveLinkText();
7475
void updateLinkButtonDisplay();

0 commit comments

Comments
 (0)