Merge remote-tracking branch 'upstream' into fix-resampling

sakertooth · sakertooth · commit 0c254242b9c7 · 2025-05-30T09:05:59.000-04:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -339,7 +339,7 @@ jobs:
           CCACHE_MAXSIZE: 500M
   msvc:
     name: msvc-x64
-    runs-on: windows-2019
+    runs-on: windows-2022
     env:
       CCACHE_MAXSIZE: 0
       CCACHE_NOCOMPRESS: 1
diff --git a/include/InlineAutomation.h b/include/InlineAutomation.h
@@ -27,7 +27,6 @@
 
 #include "AutomationNode.h"
 #include "AutomationClip.h"
-#include "shared_object.h"
 
 namespace lmms
 {
diff --git a/include/Note.h b/include/Note.h
@@ -104,12 +104,15 @@ class LMMS_EXPORT Note : public SerializingObject
 		int key = DefaultKey,
 		volume_t volume = DefaultVolume,
 		panning_t panning = DefaultPanning,
-		DetuningHelper * detuning = nullptr );
+		std::shared_ptr<DetuningHelper> detuning = nullptr);
 	Note( const Note & note );
 	~Note() override;
 
 	Note& operator=(const Note& note);
 
+	//! Performs a deep copy and returns an owning raw pointer
+	Note* clone() const;
+
 	// Note types
 	enum class Type
 	{
@@ -237,10 +240,8 @@ class LMMS_EXPORT Note : public SerializingObject
 
 	static TimePos quantized( const TimePos & m, const int qGrid );
 
-	DetuningHelper * detuning() const
-	{
-		return m_detuning.get();
-	}
+	const std::shared_ptr<DetuningHelper>& detuning() const { return m_detuning; }
+
 	bool hasDetuningInfo() const;
 	bool withinRange(int tickStart, int tickEnd) const;
 
@@ -265,7 +266,7 @@ class LMMS_EXPORT Note : public SerializingObject
 	panning_t m_panning;
 	TimePos m_length;
 	TimePos m_pos;
-	std::unique_ptr<DetuningHelper> m_detuning;
+	std::shared_ptr<DetuningHelper> m_detuning;
 
 	Type m_type = Type::Regular;
 };
diff --git a/include/shared_object.h b/include/shared_object.h
diff --git a/plugins/SlicerT/SlicerTView.cpp b/plugins/SlicerT/SlicerTView.cpp
@@ -71,6 +71,12 @@ SlicerTView::SlicerTView(SlicerT* instrument, QWidget* parent)
 	m_syncToggle->setToolTip(tr("Enable BPM sync"));
 	m_syncToggle->setModel(&m_slicerTParent->m_enableSync);
 
+	m_clearButton = new PixmapButton(this, tr("Clear all slices"));
+	m_clearButton->setActiveGraphic(PLUGIN_NAME::getIconPixmap("clear_slices_active"));
+	m_clearButton->setInactiveGraphic(PLUGIN_NAME::getIconPixmap("clear_slices_inactive"));
+	m_clearButton->setToolTip(tr("Clear all slices"));
+	connect(m_clearButton, &PixmapButton::clicked, this, &SlicerTView::clearSlices);
+
 	m_bpmBox = new LcdSpinBox(3, "19purple", this);
 	m_bpmBox->setToolTip(tr("Original sample BPM"));
 	m_bpmBox->setModel(&m_slicerTParent->m_originalBPM);
@@ -111,6 +117,19 @@ Knob* SlicerTView::createStyledKnob()
 	return newKnob;
 }
 
+// Clear all notes
+void SlicerTView::clearSlices()
+{
+	m_slicerTParent->m_slicePoints.clear();
+
+	// Points are added to the start (0) and end (1) of the sample,
+	// so the whole sample can still be copied using MIDI.
+	m_slicerTParent->m_slicePoints.emplace_back(0);
+	m_slicerTParent->m_slicePoints.emplace_back(1);
+
+	emit m_slicerTParent->dataChanged();
+}
+
 // copied from piano roll
 void SlicerTView::exportMidi()
 {
@@ -261,7 +280,7 @@ void SlicerTView::resizeEvent(QResizeEvent* re)
 {
 	m_y1 = height() - s_bottomBoxOffset;
 
-	// left box
+	// Left box
 	m_noteThresholdKnob->move(s_x1 - 25, m_y1);
 	m_fadeOutKnob->move(s_x2 - 25, m_y1);
 
@@ -271,8 +290,10 @@ void SlicerTView::resizeEvent(QResizeEvent* re)
 	m_bpmBox->move(s_x5 - 13, m_y1 + 4);
 	m_snapSetting->move(s_x6 - 8, m_y1 + 3);
 
-	// right box
-	m_syncToggle->move((width() - 100), m_y1 + 5);
+	// Right box
+	// For explanation on the choice of constants, look at #7850
+	m_syncToggle->move((width() - 100), m_y1 - 7);
+	m_clearButton->move((width() - 100), m_y1 + 17);
 
 	m_folderButton->move(width() - 20, height() - s_bottomBoxHeight - s_sampleBoxHeight + 1);
 
diff --git a/plugins/SlicerT/SlicerTView.h b/plugins/SlicerT/SlicerTView.h
@@ -49,6 +49,7 @@ class SlicerTView : public InstrumentView
 public slots:
 	void exportMidi();
 	void openFiles();
+	void clearSlices();
 
 public:
 	SlicerTView(SlicerT* instrument, QWidget* parent);
@@ -87,6 +88,7 @@ public slots:
 	LcdSpinBox* m_bpmBox;
 	ComboBox* m_snapSetting;
 	PixmapButton* m_syncToggle;
+	PixmapButton* m_clearButton;
 	PixmapButton* m_folderButton;
 
 	QPushButton* m_resetButton;
diff --git a/plugins/SlicerT/clear_slices_active.png b/plugins/SlicerT/clear_slices_active.png
diff --git a/plugins/SlicerT/clear_slices_inactive.png b/plugins/SlicerT/clear_slices_inactive.png
diff --git a/src/core/Note.cpp b/src/core/Note.cpp
@@ -36,7 +36,7 @@ namespace lmms
 
 Note::Note( const TimePos & length, const TimePos & pos,
 		int key, volume_t volume, panning_t panning,
-						DetuningHelper * detuning ) :
+						std::shared_ptr<DetuningHelper> detuning ) :
 	m_selected( false ),
 	m_oldKey(std::clamp(key, 0, NumKeys)),
 	m_oldPos( pos ),
@@ -46,13 +46,10 @@ Note::Note( const TimePos & length, const TimePos & pos,
 	m_volume(std::clamp(volume, MinVolume, MaxVolume)),
 	m_panning(std::clamp(panning, PanningLeft, PanningRight)),
 	m_length( length ),
-	m_pos( pos )
+	m_pos(pos),
+	m_detuning(std::move(detuning))
 {
-	if (detuning)
-	{
-		m_detuning = std::make_unique<DetuningHelper>(*detuning);
-	}
-	else
+	if (!detuning)
 	{
 		createDetuning();
 	}
@@ -73,12 +70,9 @@ Note::Note( const Note & note ) :
 	m_panning( note.m_panning ),
 	m_length( note.m_length ),
 	m_pos( note.m_pos ),
+	m_detuning(note.m_detuning),
 	m_type(note.m_type)
 {
-	if (note.m_detuning)
-	{
-		m_detuning = std::make_unique<DetuningHelper>(*note.m_detuning);
-	}
 }
 
 Note& Note::operator=(const Note& note)
@@ -94,16 +88,19 @@ Note& Note::operator=(const Note& note)
 	m_length = note.m_length;
 	m_pos = note.m_pos;
 	m_type = note.m_type;
-
-	if (note.m_detuning)
-	{
-		m_detuning = std::make_unique<DetuningHelper>(*note.m_detuning);
-	}
+	m_detuning = note.m_detuning;
 
 	return *this;
 }
 
 
+Note* Note::clone() const
+{
+	Note* newNote = new Note(*this);
+	newNote->m_detuning = std::make_shared<DetuningHelper>(*newNote->m_detuning);
+	return newNote;
+}
+
 
 
 Note::~Note()
@@ -234,7 +231,7 @@ void Note::createDetuning()
 {
 	if( m_detuning == nullptr )
 	{
-		m_detuning = std::make_unique<DetuningHelper>();
+		m_detuning = std::make_shared<DetuningHelper>();
 		(void) m_detuning->automationClip();
 		m_detuning->setRange( -MaxDetuning, MaxDetuning, 0.5f );
 		m_detuning->automationClip()->setProgressionType( AutomationClip::ProgressionType::Linear );
diff --git a/src/core/NotePlayHandle.cpp b/src/core/NotePlayHandle.cpp
@@ -54,7 +54,7 @@ NotePlayHandle::NotePlayHandle( InstrumentTrack* instrumentTrack,
 								int midiEventChannel,
 								Origin origin ) :
 	PlayHandle( PlayHandle::Type::NotePlayHandle, _offset ),
-	Note( n.length(), n.pos(), n.key(), n.getVolume(), n.getPanning(), n.detuning() ),
+	Note(n),
 	m_pluginData( nullptr ),
 	m_instrumentTrack( instrumentTrack ),
 	m_frames( 0 ),
@@ -84,7 +84,7 @@ NotePlayHandle::NotePlayHandle( InstrumentTrack* instrumentTrack,
 	lock();
 	if( hasParent() == false )
 	{
-		m_baseDetuning = new BaseDetuning( detuning() );
+		m_baseDetuning = new BaseDetuning(detuning().get());
 		m_instrumentTrack->m_processHandles.push_back( this );
 	}
 	else
diff --git a/src/tracks/MidiClip.cpp b/src/tracks/MidiClip.cpp
@@ -68,7 +68,7 @@ MidiClip::MidiClip( const MidiClip& other ) :
 {
 	for (const auto& note : other.m_notes)
 	{
-		m_notes.push_back(new Note(*note));
+		m_notes.push_back(note->clone());
 	}
 
 	init();
@@ -197,7 +197,7 @@ TimePos MidiClip::beatClipLength() const
 
 Note * MidiClip::addNote( const Note & _new_note, const bool _quant_pos )
 {
-	auto new_note = new Note(_new_note);
+	auto new_note = _new_note.clone();
 	if (_quant_pos && gui::getGUI()->pianoRoll())
 	{
 		new_note->quantizePos(gui::getGUI()->pianoRoll()->quantization());
@@ -326,6 +326,8 @@ void MidiClip::setStep( int step, bool enabled )
 
 void MidiClip::reverseNotes(const NoteVector& notes)
 {
+	if (notes.empty()) { return; }
+
 	addJournalCheckPoint();
 
 	// Find the very first start position and the very last end position of all the notes.
diff --git a/tests/src/tracks/AutomationTrackTest.cpp b/tests/src/tracks/AutomationTrackTest.cpp
@@ -163,8 +163,7 @@ private slots:
 		Note* note = midiClip.addNote(Note(TimePos(4, 0)), false);
 		note->createDetuning();
 
-		DetuningHelper* dh = note->detuning();
-		auto clip = dh->automationClip();
+		auto clip = note->detuning()->automationClip();
 		clip->setProgressionType( AutomationClip::ProgressionType::Linear );
 		clip->putValue(TimePos(0, 0), 0.0);
 		clip->putValue(TimePos(4, 0), 1.0);

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,6 @@`
`27`	`27`
`28`	`28`	`#include "AutomationNode.h"`
`29`	`29`	`#include "AutomationClip.h"`
`30`		`-#include "shared_object.h"`
`31`	`30`
`32`	`31`	`namespace lmms`
`33`	`32`	`{`