From f891bb30eb932d444b9c08f8641f624693d3aa3f Mon Sep 17 00:00:00 2001 From: Bimal Poudel Date: Fri, 17 May 2024 19:32:59 -0600 Subject: [PATCH 1/2] Update widths of combo boxes (#7262) * Update widths of combo boxes * Update src/gui/editors/PianoRoll.cpp no space right after brace Co-authored-by: saker * Update src/gui/editors/PianoRoll.cpp Co-authored-by: saker * Update src/gui/editors/PianoRoll.cpp Co-authored-by: saker * Update src/gui/editors/PianoRoll.cpp Co-authored-by: saker --------- Co-authored-by: saker --- src/gui/editors/PianoRoll.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/editors/PianoRoll.cpp b/src/gui/editors/PianoRoll.cpp index 75bac22439d..2e99aab4df1 100644 --- a/src/gui/editors/PianoRoll.cpp +++ b/src/gui/editors/PianoRoll.cpp @@ -4894,7 +4894,7 @@ PianoRollWindow::PianoRollWindow() : m_quantizeComboBox = new ComboBox( m_toolBar ); m_quantizeComboBox->setModel( &m_editor->m_quantizeModel ); - m_quantizeComboBox->setFixedSize( 64, ComboBox::DEFAULT_HEIGHT ); + m_quantizeComboBox->setFixedSize(85, ComboBox::DEFAULT_HEIGHT); m_quantizeComboBox->setToolTip( tr( "Quantization") ); // setup note-len-stuff @@ -4918,7 +4918,7 @@ PianoRollWindow::PianoRollWindow() : m_scaleComboBox = new ComboBox( m_toolBar ); m_scaleComboBox->setModel( &m_editor->m_scaleModel ); - m_scaleComboBox->setFixedSize( 105, ComboBox::DEFAULT_HEIGHT ); + m_scaleComboBox->setFixedSize(155, ComboBox::DEFAULT_HEIGHT); m_scaleComboBox->setToolTip( tr( "Scale") ); // setup chord-stuff @@ -4927,7 +4927,7 @@ PianoRollWindow::PianoRollWindow() : m_chordComboBox = new ComboBox( m_toolBar ); m_chordComboBox->setModel( &m_editor->m_chordModel ); - m_chordComboBox->setFixedSize( 105, ComboBox::DEFAULT_HEIGHT ); + m_chordComboBox->setFixedSize(125, ComboBox::DEFAULT_HEIGHT); m_chordComboBox->setToolTip( tr( "Chord" ) ); // setup snap-stuff @@ -4936,7 +4936,7 @@ PianoRollWindow::PianoRollWindow() : m_snapComboBox = new ComboBox(m_toolBar); m_snapComboBox->setModel(&m_editor->m_snapModel); - m_snapComboBox->setFixedSize(105, ComboBox::DEFAULT_HEIGHT); + m_snapComboBox->setFixedSize(96, ComboBox::DEFAULT_HEIGHT); m_snapComboBox->setToolTip(tr("Snap mode")); // -- Clear ghost MIDI clip button From 0ee05f5ad8874e76b9c1effab4e9f8923e081f3a Mon Sep 17 00:00:00 2001 From: Pascal <81458575+khoidauminh@users.noreply.github.com> Date: Sun, 19 May 2024 05:40:29 +0700 Subject: [PATCH 2/2] Fix crash in AFP when playing with loop while no sample is loaded (#7266) --- src/core/Sample.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/core/Sample.cpp b/src/core/Sample.cpp index cd238b2ca9f..584d1bc13c9 100644 --- a/src/core/Sample.cpp +++ b/src/core/Sample.cpp @@ -170,6 +170,8 @@ void Sample::setAllPointFrames(int startFrame, int endFrame, int loopStartFrame, void Sample::playRaw(sampleFrame* dst, size_t numFrames, const PlaybackState* state, Loop loopMode) const { + if (m_buffer->size() < 1) { return; } + auto index = state->m_frameIndex; auto backwards = state->m_backwards;