From 02eee8e7b6e0645b033d5e2add4281cdf7dc6547 Mon Sep 17 00:00:00 2001 From: Lukas W Date: Fri, 26 Aug 2016 10:40:57 +0200 Subject: [PATCH 1/2] AutomatableModel: Don't force step size aligning in setValue --- src/core/AutomatableModel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/AutomatableModel.cpp b/src/core/AutomatableModel.cpp index 751c8b54d16..987beed3e05 100644 --- a/src/core/AutomatableModel.cpp +++ b/src/core/AutomatableModel.cpp @@ -221,7 +221,7 @@ void AutomatableModel::setValue( const float value ) ++m_setValueDepth; const float old_val = m_value; - m_value = fittedValue( value, true ); + m_value = fittedValue( value ); if( old_val != m_value ) { // add changes to history so user can undo it From 67e93710d25a1e12e2c78fb1459d82e6d9bca42a Mon Sep 17 00:00:00 2001 From: Lukas W Date: Mon, 29 Aug 2016 13:56:04 +0200 Subject: [PATCH 2/2] TempoSyncKnobModel: Fix loadSettings order (syncmode takes precedence) --- src/core/TempoSyncKnobModel.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/TempoSyncKnobModel.cpp b/src/core/TempoSyncKnobModel.cpp index c3583f88a26..690b230ba11 100644 --- a/src/core/TempoSyncKnobModel.cpp +++ b/src/core/TempoSyncKnobModel.cpp @@ -138,9 +138,9 @@ void TempoSyncKnobModel::saveSettings( QDomDocument & _doc, QDomElement & _this, void TempoSyncKnobModel::loadSettings( const QDomElement & _this, const QString & _name ) { - setSyncMode( ( TempoSyncMode ) _this.attribute( "syncmode" ).toInt() ); - m_custom.loadSettings( _this, _name ); FloatModel::loadSettings( _this, _name ); + m_custom.loadSettings( _this, _name ); + setSyncMode( ( TempoSyncMode ) _this.attribute( "syncmode" ).toInt() ); }