LMMS · steven-jaro · May 20, 2025 · May 20, 2025 · May 22, 2025 · May 22, 2025
diff --git a/include/Editor.h b/include/Editor.h
@@ -81,7 +81,7 @@ private slots:
 	///
 	/// \param	record	If set true, the editor's toolbar will contain record
 	///					buttons in addition to the play and stop buttons.
-	Editor(bool record = false, bool record_step = false);
+	Editor(bool record = false, bool recordAccompany = false, bool recordStep = false);
 	~Editor() override = default;
 
 

diff --git a/include/Song.h b/include/Song.h
@@ -238,7 +238,7 @@ class LMMS_EXPORT Song : public TrackContainer
 			m_loopRenderCount = count;
 		m_loopRenderRemaining = m_loopRenderCount;
 	}
-    
+
 	inline int getLoopRenderCount() const
 	{
 		return m_loopRenderCount;
@@ -381,7 +381,6 @@ class LMMS_EXPORT Song : public TrackContainer
 
 public slots:
 	void playSong();
-	void record();
 	void playAndRecord();
 	void playPattern();
 	void playMidiClip( const lmms::MidiClip * midiClipToPlay, bool loop = true );
@@ -505,7 +504,7 @@ private slots:
 	bar_t m_elapsedBars;
 
 	VstSyncController m_vstSyncController;
-    
+
 	int m_loopRenderCount;
 	int m_loopRenderRemaining;
 	TimePos m_exportSongBegin;

diff --git a/include/SongEditor.h b/include/SongEditor.h
@@ -189,7 +189,6 @@ class SongEditorWindow : public Editor
 
 protected slots:
 	void play() override;
-	void record() override;
 	void recordAccompany() override;
 	void stop() override;
 

diff --git a/src/core/Song.cpp b/src/core/Song.cpp
@@ -456,7 +456,7 @@ bool Song::isExportDone() const
 int Song::getExportProgress() const
 {
 	TimePos pos = getPlayPos();
-    
+
 	if (pos >= m_exportSongEnd)
 	{
 		return 100;
@@ -507,14 +507,6 @@ void Song::playSong()
 
 
 
-void Song::record()
-{
-	m_recording = true;
-	// TODO: Implement
-}
-
-
-
 
 void Song::playAndRecord()
 {
@@ -741,7 +733,6 @@ void Song::startExport()
 	else
 	{
 		m_exportSongEnd = TimePos(m_length, 0);
-
 		// Handle potentially ridiculous loop points gracefully.
 		if (m_loopRenderCount > 1 && timeline.loopEnd() > m_exportSongEnd) 
 		{
@@ -750,7 +741,7 @@ void Song::startExport()
 
 		if (!m_exportLoop) 
 			m_exportSongEnd += TimePos(1,0);
-        
+
 		m_exportSongBegin = TimePos(0,0);
 		m_exportLoopBegin = timeline.loopBegin() < m_exportSongEnd && timeline.loopEnd() <= m_exportSongEnd
 			? timeline.loopBegin()

diff --git a/src/gui/editors/Editor.cpp b/src/gui/editors/Editor.cpp
@@ -89,7 +89,7 @@ void Editor::toggleMaximize()
 	isMaximized() ? showNormal() : showMaximized();
 }
 
-Editor::Editor(bool record, bool stepRecord) :
+Editor::Editor(bool record, bool recordAccompany, bool recordStep) :
 	m_toolBar(new DropToolBar(this)),
 	m_playAction(nullptr),
 	m_recordAction(nullptr),
@@ -99,40 +99,36 @@ Editor::Editor(bool record, bool stepRecord) :
 {
 	m_toolBar = addDropToolBarToTop(tr("Transport controls"));
 
-	auto addButton = [this](QAction* action, QString objectName) {
-		m_toolBar->addAction(action);
-		m_toolBar->widgetForAction(action)->setObjectName(objectName);
+	auto createButton = [this](
+		QAction*& targetAction,
+		const char* iconName,
+		const QString& text,
+		const char* slot,
+		const QString& objectName,
+		bool condition = true
+	) {
+		if (condition) {
+			targetAction = new QAction(embed::getIconPixmap(iconName), text, this);
+			connect(targetAction, SIGNAL(triggered()), this, slot);
+			m_toolBar->addAction(targetAction);
+			m_toolBar->widgetForAction(targetAction)->setObjectName(objectName);
+		}
 	};
 
-	// Set up play and record actions
-	m_playAction = new QAction(embed::getIconPixmap("play"), tr("Play (Space)"), this);
-	m_stopAction = new QAction(embed::getIconPixmap("stop"), tr("Stop (Space)"), this);
+	// Play action setup
+	createButton(m_playAction, "play", tr("Play (Space)"), SLOT(play()), "playButton");
 
-	m_recordAction = new QAction(embed::getIconPixmap("record"), tr("Record"), this);
-	m_recordAccompanyAction = new QAction(embed::getIconPixmap("record_accompany"), tr("Record while playing"), this);
-	m_toggleStepRecordingAction = new QAction(embed::getIconPixmap("record_step_off"), tr("Toggle Step Recording"), this);
+	// Conditional buttons setup
+	createButton(m_recordAction, "record", tr("Record"), SLOT(record()), "recordButton", record);
+	createButton(m_recordAccompanyAction, "record_accompany", tr("Record while playing"), SLOT(recordAccompany()), "recordAccompanyButton", recordAccompany);
+	createButton(m_toggleStepRecordingAction, "record_step_off", tr("Toggle Step Recording"), SLOT(toggleStepRecording()), "stepRecordButton", recordStep);
 
-	// Set up connections
-	connect(m_playAction, SIGNAL(triggered()), this, SLOT(play()));
-	connect(m_recordAction, SIGNAL(triggered()), this, SLOT(record()));
-	connect(m_recordAccompanyAction, SIGNAL(triggered()), this, SLOT(recordAccompany()));
-	connect(m_toggleStepRecordingAction, SIGNAL(triggered()), this, SLOT(toggleStepRecording()));
-	connect(m_stopAction, SIGNAL(triggered()), this, SLOT(stop()));
+	// Stop action setup
+	createButton(m_stopAction, "stop", tr("Stop (Space)"), SLOT(stop()), "stopButton");
+
+	// Setup shortcuts for actions
 	new QShortcut(QKeySequence(combine(Qt::SHIFT, Qt::Key_Space)), this, SLOT(togglePause()));
 	new QShortcut(QKeySequence(combine(Qt::SHIFT, Qt::Key_F11)), this, SLOT(toggleMaximize()));
-
-	// Add actions to toolbar
-	addButton(m_playAction, "playButton");
-	if (record)
-	{
-		addButton(m_recordAction, "recordButton");
-		addButton(m_recordAccompanyAction, "recordAccompanyButton");
-	}
-	if(stepRecord)
-	{
-		addButton(m_toggleStepRecordingAction, "stepRecordButton");
-	}
-	addButton(m_stopAction, "stopButton");
 }
 
 QAction *Editor::playAction() const

diff --git a/src/gui/editors/PatternEditor.cpp b/src/gui/editors/PatternEditor.cpp
@@ -223,7 +223,7 @@ void PatternEditor::cloneClip()
 
 
 PatternEditorWindow::PatternEditorWindow(PatternStore* ps) :
-	Editor(false),
+	Editor(false, true, false),
 	m_editor(new PatternEditor(ps))
 {
 	setWindowIcon(embed::getIconPixmap("pattern_track_btn"));

diff --git a/src/gui/editors/PianoRoll.cpp b/src/gui/editors/PianoRoll.cpp
@@ -4941,7 +4941,7 @@ void PianoRoll::changeSnapMode()
 }
 
 PianoRollWindow::PianoRollWindow() :
-	Editor(true, true),
+	Editor(true, true, true),
 	m_editor(new PianoRoll())
 {
 	setCentralWidget( m_editor );

diff --git a/src/gui/editors/SongEditor.cpp b/src/gui/editors/SongEditor.cpp
@@ -914,7 +914,7 @@ ComboBoxModel *SongEditor::snappingModel() const
 
 
 SongEditorWindow::SongEditorWindow(Song* song) :
-	Editor(true, false),
+	Editor(false, true, false),
 	m_editor(new SongEditor(song)),
 	m_crtlAction( nullptr ),
 	m_snapSizeLabel( new QLabel( m_toolBar ) )
@@ -930,7 +930,6 @@ SongEditorWindow::SongEditorWindow(Song* song) :
 
 	// Set up buttons
 	m_playAction->setToolTip(tr("Play song (Space)"));
-	m_recordAction->setToolTip(tr("Record samples from Audio-device"));
 	m_recordAccompanyAction->setToolTip(tr("Record samples from Audio-device while playing song or pattern track"));
 	m_stopAction->setToolTip(tr( "Stop song (Space)" ));
 
@@ -1036,11 +1035,7 @@ SongEditorWindow::SongEditorWindow(Song* song) :
 	// disable the record buttons.
 	if (!Engine::audioEngine()->captureDeviceAvailable())
 	{
-		for (auto &recordAction : {m_recordAccompanyAction, m_recordAction})
-		{
-			recordAction->setEnabled(false);
-			recordAction->setToolTip(tr("Recording is unavailable: try connecting an input device or switching backend"));
-		}
+		m_recordAccompanyAction->setToolTip(tr("Recording is unavailable: try connecting an input device or switching backend"));
 	}
 }
 
@@ -1102,12 +1097,6 @@ void SongEditorWindow::play()
 }
 
 
-void SongEditorWindow::record()
-{
-	m_editor->m_song->record();
-}
-
-
 
 
 void SongEditorWindow::recordAccompany()