Removed the first recording button from SongEditor as it has no use #7899

steven-jaro · 2025-05-20T21:31:25Z

Changes:

Editor.h:

Changed the name of the default value of Editor.cpp constructor from "record_step" to "recordStep".
Added bool "recordAccompany" and set to false to reflect the changes in the parammeters on Editor.cpp.

Song.h:

Removed the "record()" method as it will not be used.
Remove parts of the code that had spaces instead of tabs size 4.

SongEditor.h:

Removed the "record()" method as it will not be used.

Song.cpp:

Removed the "record()" method as it will not be used.
Remove parts of the code that had spaces instead of tabs size 4.

Editor.cpp:

Added bool "recordAccompany" to the constructor.
Renamed "stepRecord" to "recordStep" so that every parammeter name starts with "record*"
Added a lambda functionally for conditional button creation.
Changed the order in which the buttons are created. They were ordered in phases, now it is ordered by button.

PianoRoll.cpp:

Added "(true, true, true)" to the parammeters entry for the Editor constructor to reflect which buttons need to be shown.

SongEditor.cpp (the key change):

Added "(false, true, false)" to the parammeters entry for the Editor constructor to reflect which buttons need to be shown. This is for showing only the recordAccompany button in the song editor.
Removed connection fro "m_recordAction" as it wil not be used here.
Removed checking for "m_recordAction" as it doesn't exist anymore.
Removed the "record()" method as it will not be used.

How to test?:
This PR just removes the button in the Song Editor. So one only has to make sure that the correct buttons are shown on each editor and that they work properly as intended.

All of these was decided because there is no really a use for a button that records without playing the song. So the only audio recording button left is the "RecordAccompany". Also this PR solves the first issue out of 4 in #7786.

src/gui/editors/Editor.cpp

src/gui/editors/SongEditor.cpp

…sary loop

steven-jaro · 2025-05-22T02:59:05Z

I added the changes you asked me.

src/gui/editors/Editor.cpp

steven-jaro · 2025-05-22T12:27:16Z

I modified the logic of the set up for all the buttons so when adding the conditions, the code looks as compact and simplified as much as possible. The code order was:
[Action set up for each button (play, record, recordAccompany, stepRecord, Stop)] ->
[Connection set up for each button (play, record, recordAccompany, stepRecord, Stop)] ->
[Toolbar set up for each button (play, record, recordAccompany, stepRecord, Stop)]

And now I changed it to:
[Complete setup for play (action, connection, toolbar)] ->
[Complete setup for record (action, connection, toolbar)] ->
[Complete setup for recordAccompany (action, connection, toolbar)] ->
[Complete setup for stepRecord (action, connection, toolbar)] ->
[Complete setup for stop (action, connection, toolbar)]

I made this change because otherwise I would have to add 9 "ifs" if I wanted to keep the previous order. So for adding just 3 "ifs" I reordered the logic of the code grouping by button instead of by set up stage. I also changed the order of the bools in the constructor and updated the change for the constructor of the PianoRoll and SongEditor

regulus79 · 2025-05-22T15:53:20Z

Nice! That does look much cleaner

include/Editor.h

steven-jaro · 2025-05-22T20:39:02Z

The error is now fixed.

szeli1

Please could you address my suggestions? Also I did not test this PR.

src/gui/editors/Editor.cpp

include/Editor.h

src/gui/editors/Editor.cpp

steven-jaro · 2025-05-23T20:53:42Z

@szeli1 I will adress all your naming and commenting suggestions as soon as I can.

steven-jaro · 2025-05-25T11:23:15Z

@szeli1 I made the changes you requested but I kept the amount of documentation as I think it is useful. In the future, I will adress your suggestion for refactoring some bad variable names (in another PR).

szeli1

I will approve this, but I did not test. I still don't like how many comments there are.

szeli1 · 2025-05-25T16:23:52Z

I will adress your suggestion for refactoring some bad variable names (in another PR).

Don't bother with it, thanks for working on this issue.

steven-jaro · 2025-05-25T16:31:33Z

I will approve this, but I did not test. I still don't like how many comments there are.

I would like to know the opinion from the other devs. If another devs says it is too much commenting, then I will remove them.

…e implementation

szeli1

Making a lambda was a good Idea, I couldn't find any issues, so I will approve this

JohannesLorenz

I only have 3 style suggestions left, but overall this PR is good and can go into testing phase.

src/gui/editors/Editor.cpp

include/Editor.h

JohannesLorenz · 2025-05-29T21:46:29Z

You changed all TABs to spaces, can you please fix? Also, what about the unique_ptr question?

src/gui/editors/Editor.cpp

JohannesLorenz

3 Approvals, ready for testing phase.

Feel free to fix the whitespace comment.

include/Song.h

src/core/Song.cpp

bratpeki · 2025-06-03T21:16:18Z

So, this PR just nuked one recording button from the Song-Editor, not touching anything else.

I can confirm it's not there for SDL, Jack, PulseAudio and ALSA, which I think is sufficient.

bratpeki · 2025-06-03T21:20:19Z

What I'm wondering is this: Are we completely removing it, or is it still possible to get it to happen via the add recordAccompany parameter?

IMO, it shouldn't be able to happen at all. We should have one type of recording, that being the "accompanying recording". If the user chooses to keep certain items unmuted while recording, we shouldn't stop him. If he sets the recording sample track to solo, we record to that track only.

This raises the question of what happens when the recording track is (un)muted, but that might be a problem for the future. Still, would be good to discuss it.

bratpeki · 2025-06-03T21:21:35Z

I trust @regulus79, @szeli1 and @JohannesLorenz that the PR is well made, and the button is not there, so I approve it. Still, please change the following before merging.

bratpeki · 2025-06-03T21:21:52Z

include/Song.h

@@ -503,7 +502,7 @@ private slots:
 	bar_t m_elapsedBars;

 	VstSyncController m_vstSyncController;
-    
+	


bratpeki · 2025-06-03T21:22:01Z

src/core/Song.cpp

@@ -456,7 +456,7 @@ bool Song::isExportDone() const
 int Song::getExportProgress() const
 {
 	TimePos pos = getPlayPos();
-    
+	


bratpeki · 2025-06-03T21:22:09Z

src/core/Song.cpp

@@ -740,7 +731,7 @@ void Song::startExport()

 		if (!m_exportLoop) 
 			m_exportSongEnd += TimePos(1,0);
-        
+		


bratpeki

Remove unneeded whitespace.

steven-jaro added 2 commits May 20, 2025 14:45

Removed the first record button from the Song Editor

5e74e3c

Removed commented lines in SongEditor

6cbd25f

regulus79 requested changes May 21, 2025

View reviewed changes

src/gui/editors/Editor.cpp Outdated Show resolved Hide resolved

src/gui/editors/SongEditor.cpp Outdated Show resolved Hide resolved

src/gui/editors/SongEditor.cpp Show resolved Hide resolved

Fixed regulus request about inverted bool name and removed an unneces…

621e69b

…sary loop

regulus79 reviewed May 22, 2025

View reviewed changes

src/gui/editors/Editor.cpp Outdated Show resolved Hide resolved

Modified editor buttons construction logic

73d5293

steven-jaro requested a review from regulus79 May 22, 2025 12:38

regulus79 reviewed May 22, 2025

View reviewed changes

include/Editor.h Outdated Show resolved Hide resolved

Fixed recordAccompany as false by default

2915379

steven-jaro requested a review from regulus79 May 22, 2025 20:09

regulus79 approved these changes May 22, 2025

View reviewed changes

szeli1 self-requested a review May 23, 2025 07:17

steven-jaro mentioned this pull request May 23, 2025

Sample Track Recording Stage One (by Reflexe, LMMS/lmms continuation) #7786

Draft

szeli1 reviewed May 23, 2025

View reviewed changes

Fixed szeli1 request for consisten documentation

21fece4

steven-jaro requested a review from szeli1 May 25, 2025 11:24

szeli1 approved these changes May 25, 2025

View reviewed changes

Fixed too much comments and implementation of a lambda to simplify th…

b981b53

…e implementation

steven-jaro requested a review from szeli1 May 26, 2025 23:01

szeli1 approved these changes May 28, 2025

View reviewed changes

JohannesLorenz approved these changes May 28, 2025

View reviewed changes

src/gui/editors/Editor.cpp Outdated Show resolved Hide resolved

src/gui/editors/Editor.cpp Show resolved Hide resolved

include/Editor.h Outdated Show resolved Hide resolved

Fixed use of new function for all buttons and step_record to recordStep

036f4b4

steven-jaro requested a review from JohannesLorenz May 29, 2025 15:57

JohannesLorenz reviewed May 29, 2025

View reviewed changes

src/gui/editors/Editor.cpp Outdated Show resolved Hide resolved

Fixed 4 tab size instead of 4 spaces

14eb1de

JohannesLorenz approved these changes May 30, 2025

View reviewed changes

include/Song.h Outdated Show resolved Hide resolved

steven-jaro added 2 commits May 30, 2025 11:10

Update Song.h

0ccb8ff

Update Song.h

1bfa2a6

JohannesLorenz added the needs testing This pull request needs more testing label May 31, 2025

szeli1 assigned bratpeki Jun 1, 2025

bratpeki reviewed Jun 1, 2025

View reviewed changes

src/core/Song.cpp Outdated Show resolved Hide resolved

steven-jaro requested a review from bratpeki June 2, 2025 13:07

Update Song.cpp

c1b4178

bratpeki reviewed Jun 3, 2025

View reviewed changes

include/Song.h

@@ -503,7 +502,7 @@ private slots:

bar_t m_elapsedBars;

VstSyncController m_vstSyncController;

Copy link

Member

bratpeki Jun 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

.

bratpeki reviewed Jun 3, 2025

View reviewed changes

src/core/Song.cpp

@@ -740,7 +731,7 @@ void Song::startExport()

if (!m_exportLoop)

m_exportSongEnd += TimePos(1,0);

Copy link

Member

bratpeki Jun 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

.

bratpeki reviewed Jun 3, 2025

View reviewed changes

		@@ -503,7 +502,7 @@ private slots:
		bar_t m_elapsedBars;

		VstSyncController m_vstSyncController;

		@@ -740,7 +731,7 @@ void Song::startExport()

		if (!m_exportLoop)
		m_exportSongEnd += TimePos(1,0);

Uh oh!

Removed the first recording button from SongEditor as it has no use #7899

Are you sure you want to change the base?

Removed the first recording button from SongEditor as it has no use #7899

Uh oh!

Conversation

steven-jaro commented May 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

steven-jaro commented May 22, 2025

Uh oh!

Uh oh!

steven-jaro commented May 22, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

regulus79 commented May 22, 2025

Uh oh!

Uh oh!

steven-jaro commented May 22, 2025

Uh oh!

szeli1 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

steven-jaro commented May 23, 2025

Uh oh!

steven-jaro commented May 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

szeli1 left a comment

Choose a reason for hiding this comment

Uh oh!

szeli1 commented May 25, 2025

Uh oh!

steven-jaro commented May 25, 2025

Uh oh!

szeli1 left a comment

Choose a reason for hiding this comment

Uh oh!

JohannesLorenz left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

JohannesLorenz commented May 29, 2025

Uh oh!

Uh oh!

JohannesLorenz left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

bratpeki commented Jun 3, 2025

Uh oh!

bratpeki commented Jun 3, 2025

Uh oh!

bratpeki commented Jun 3, 2025

Uh oh!

bratpeki Jun 3, 2025

Choose a reason for hiding this comment

Uh oh!

bratpeki Jun 3, 2025

Choose a reason for hiding this comment

Uh oh!

bratpeki Jun 3, 2025

Choose a reason for hiding this comment

Uh oh!

bratpeki left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

steven-jaro commented May 20, 2025 •

edited

Loading

steven-jaro commented May 22, 2025 •

edited

Loading

steven-jaro commented May 25, 2025 •

edited

Loading