Replace addSampleTrack, addAutomationTrack, and addPatternTrack with …

…addNewTrack
sakertooth · Feb 3, 2025 · 289b113 · 289b113
1 parent 59dca59
commit 289b113
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 51 deletions.
diff --git a/include/PatternEditor.h b/include/PatternEditor.h
@@ -59,8 +59,6 @@ public slots:
 	void addSteps();
 	void cloneSteps();
 	void removeSteps();
-	void addSampleTrack();
-	void addAutomationTrack();
 	void cloneClip();
 
 protected slots:

diff --git a/include/Song.h b/include/Song.h
@@ -401,8 +401,6 @@ public slots:
 private slots:
 	void insertBar();
 	void removeBar();
-	void addSampleTrack();
-	void addAutomationTrack();
 
 	void setTempo();
 	void setTimeSignature();

diff --git a/src/core/Song.cpp b/src/core/Song.cpp
@@ -812,25 +812,6 @@ void Song::addPatternTrack()
 	Engine::patternStore()->setCurrentPattern(static_cast<PatternTrack*>(patternTrack)->patternIndex());
 }
 
-
-
-
-void Song::addSampleTrack()
-{
-	addNewTrack<SampleTrack>();
-}
-
-
-
-
-void Song::addAutomationTrack()
-{
-	addNewTrack<AutomationTrack>();
-}
-
-
-
-
 bpm_t Song::getTempo()
 {
 	return ( bpm_t )m_tempoModel.value();

diff --git a/src/gui/editors/PatternEditor.cpp b/src/gui/editors/PatternEditor.cpp
@@ -82,25 +82,6 @@ void PatternEditor::removeSteps()
 	}
 }
 
-
-
-
-void PatternEditor::addSampleTrack()
-{
-	model()->addNewTrack<SampleTrack>();
-}
-
-
-
-
-void PatternEditor::addAutomationTrack()
-{
-	model()->addNewTrack<AutomationTrack>();
-}
-
-
-
-
 void PatternEditor::removeViewsForPattern(int pattern)
 {
 	for( TrackView* view : trackViews() )
@@ -262,13 +243,13 @@ PatternEditorWindow::PatternEditorWindow(PatternStore* ps) :
 
 
 	trackAndStepActionsToolBar->addAction(embed::getIconPixmap("add_pattern_track"), tr("New pattern"),
-						Engine::getSong(), SLOT(addPatternTrack()));
-	trackAndStepActionsToolBar->addAction(embed::getIconPixmap("clone_pattern_track_clip"), tr("Clone pattern"),
-						m_editor, SLOT(cloneClip()));
-	trackAndStepActionsToolBar->addAction(embed::getIconPixmap("add_sample_track"),	tr("Add sample-track"),
-						m_editor, SLOT(addSampleTrack()));
+		Engine::getSong(), &TrackContainer::addNewTrack<PatternTrack>);
+	trackAndStepActionsToolBar->addAction(
+		embed::getIconPixmap("clone_pattern_track_clip"), tr("Clone pattern"), m_editor, SLOT(cloneClip()));
+	trackAndStepActionsToolBar->addAction(embed::getIconPixmap("add_sample_track"), tr("Add sample-track"),
+		m_editor->model(), &TrackContainer::addNewTrack<SampleTrack>);
 	trackAndStepActionsToolBar->addAction(embed::getIconPixmap("add_automation"), tr("Add automation-track"),
-						m_editor, SLOT(addAutomationTrack()));
+		m_editor->model(), &TrackContainer::addNewTrack<AutomationTrack>);
 
 	auto stretch = new QWidget(m_toolBar);
 	stretch->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);

diff --git a/src/gui/editors/SongEditor.cpp b/src/gui/editors/SongEditor.cpp
@@ -945,9 +945,9 @@ SongEditorWindow::SongEditorWindow(Song* song) :
 	m_addAutomationTrackAction = new QAction(embed::getIconPixmap("add_automation"),
 											 tr("Add automation-track"), this);
 
-	connect(m_addPatternTrackAction, SIGNAL(triggered()), m_editor->m_song, SLOT(addPatternTrack()));
-	connect(m_addSampleTrackAction, SIGNAL(triggered()), m_editor->m_song, SLOT(addSampleTrack()));
-	connect(m_addAutomationTrackAction, SIGNAL(triggered()), m_editor->m_song, SLOT(addAutomationTrack()));
+	connect(m_addPatternTrackAction, &QAction::triggered, m_editor->m_song, &TrackContainer::addNewTrack<PatternTrack>);
+	connect(m_addSampleTrackAction, &QAction::triggered, m_editor->m_song, &TrackContainer::addNewTrack<SampleTrack>);
+	connect(m_addAutomationTrackAction, &QAction::triggered, m_editor->m_song, &TrackContainer::addNewTrack<AutomationTrack>);
 
 	trackActionsToolBar->addAction( m_addPatternTrackAction );
 	trackActionsToolBar->addAction( m_addSampleTrackAction );