zepto-mirrors/meta-musicians
1
0
Fork 0
mirror of https://github.com/schnitzeltony/meta-musicians.git synced 2026-09-12 03:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

qtractor: add patch to fix initial tempo on midi-file-import

Browse Source 
More details at [1]

[1] https://github.com/rncbc/qtractor/issues/230#issuecomment-538139609

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2019-10-04 23:22:05 +02:00
parent ebadfd348b
commit 7b7fce8cb5
2 changed files with 113 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
recipes-musicians/rncbc/qtractor.bb
View File

@@ -26,6 +26,8 @@ SRC_URI = " \
file://0002-do-nor-try-run-for-suil-libs-detection.patch \
file://0003-Add-ARM-NEON-acceleration-for-time-stretch-not-yet-t.patch \
\
file://0004-Fixed-initial-session-tempo-override-when-importing.patch \
\
file://Qtractor.conf \
"
SRCREV = "51459c9f414927b26c8d4644c356886281f199a7"

111
recipes-musicians/rncbc/qtractor/0004-Fixed-initial-session-tempo-override-when-importing.patch Normal file
View File

@@ -0,0 +1,111 @@
From cb72c229bc0d58d29426a018ed9b0c1c410626fe Mon Sep 17 00:00:00 2001
From: rncbc <rncbc@rncbc.org>
Date: Fri, 4 Oct 2019 10:36:14 +0100
Subject: [PATCH] - Fixed initial session tempo override when importing a
standard MIDI file (as reported on issue #230).
Upstream-Status: Backport [1]
[1] https://github.com/rncbc/qtractor/commit/cb72c229bc0d58d29426a018ed9b0c1c410626fe
---
src/qtractorMainForm.cpp | 7 +++----
src/qtractorMidiClip.cpp | 2 +-
src/qtractorMidiFileTempo.cpp | 10 ++++++++++
src/qtractorSession.cpp | 9 +++++++++
src/qtractorSession.h | 1 +
6 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/src/qtractorMainForm.cpp b/src/qtractorMainForm.cpp
index c137d5c3..7b09283f 100644
--- a/src/qtractorMainForm.cpp
+++ b/src/qtractorMainForm.cpp
@@ -7511,7 +7511,7 @@ void qtractorMainForm::fastTimerSlot (void)
updateTransportTime(iPlayHead);
m_pThumbView->updateThumb();
}
- // Ensure the amin form is stable later on...
+ // Ensure the main form is stable later on...
++m_iStabilizeTimer;
// Done with transport tricks.
}
@@ -8627,9 +8627,8 @@ void qtractorMainForm::contentsChanged (void)
qDebug("qtractorMainForm::contentsChanged()");
#endif
- // HACK: Force play-head position update...
- // m_iPlayHead = 0;
- m_pTempoCursor->clear();
+ // HACK: Force immediate stabilization later...
+ m_iStabilizeTimer = 0;
// Stabilize session toolbar widgets...
// m_pTempoSpinBox->setTempo(m_pSession->tempo(), false);
diff --git a/src/qtractorMidiClip.cpp b/src/qtractorMidiClip.cpp
index 06e9fec3..00257520 100644
--- a/src/qtractorMidiClip.cpp
+++ b/src/qtractorMidiClip.cpp
@@ -465,7 +465,7 @@ bool qtractorMidiClip::openMidiFile (
qtractorMidiFileTempo *pTempoMap = m_pFile->tempoMap();
if (pTempoMap) {
pTempoMap->intoTimeScale(pSession->timeScale(), t0);
- pSession->updateTimeScale();
+ pSession->updateTimeScaleEx();
}
// Reset session flag now.
m_bSessionFlag = false;
diff --git a/src/qtractorMidiFileTempo.cpp b/src/qtractorMidiFileTempo.cpp
index 6858bb70..14a08ded 100644
--- a/src/qtractorMidiFileTempo.cpp
+++ b/src/qtractorMidiFileTempo.cpp
@@ -270,6 +270,16 @@ void qtractorMidiFileTempo::intoTimeScale (
// Copy tempo-map nodes...
qtractorMidiFileTempo::Node *pNode = m_nodes.first();
+
+ // Very first node is kinda special...
+ if (pNode) {
+ pTimeScale->setTempo(pNode->tempo);
+ pTimeScale->setBeatsPerBar(pNode->beatsPerBar);
+ pTimeScale->setBeatDivisor(pNode->beatDivisor);
+ pNode = pNode->next();
+ }
+
+ // Now for all the rest...
while (pNode) {
const unsigned long iTime = uint64_t(pNode->tick) * p / q;
pTimeScale->addNode(
diff --git a/src/qtractorSession.cpp b/src/qtractorSession.cpp
index 3087fe2a..1be63831 100644
--- a/src/qtractorSession.cpp
+++ b/src/qtractorSession.cpp
@@ -746,6 +746,15 @@ void qtractorSession::updateTimeScale (void)
}
+void qtractorSession::updateTimeScaleEx (void)
+{
+ updateTimeScale();
+
+ if (m_pAudioEngine)
+ m_pAudioEngine->resetTimebase();
+}
+
+
// Update time resolution divisor factors.
void qtractorSession::updateTimeResolution (void)
{
diff --git a/src/qtractorSession.h b/src/qtractorSession.h
index 2aff216e..db5281cf 100644
--- a/src/qtractorSession.h
+++ b/src/qtractorSession.h
@@ -170,6 +170,7 @@ public:
// Update time scale divisor factors.
void updateTimeScale();
+ void updateTimeScaleEx();
// Update time resolution divisor factors.
void updateTimeResolution();
--
2.21.0