From 81aa00c9782cef6224b7b1dd3f518e2365f50776 Mon Sep 17 00:00:00 2001 From: Oskar Wallgren Date: Wed, 5 Mar 2014 03:10:15 +0100 Subject: [PATCH 1/2] Increased envelope times --- src/core/EnvelopeAndLfoParameters.cpp | 10 +++++----- src/gui/widgets/EnvelopeAndLfoView.cpp | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/core/EnvelopeAndLfoParameters.cpp b/src/core/EnvelopeAndLfoParameters.cpp index 4d9532264f3..668fb9d1812 100644 --- a/src/core/EnvelopeAndLfoParameters.cpp +++ b/src/core/EnvelopeAndLfoParameters.cpp @@ -92,12 +92,12 @@ EnvelopeAndLfoParameters::EnvelopeAndLfoParameters( Model * _parent ) : Model( _parent ), m_used( false ), - m_predelayModel( 0.0, 0.0, 1.0, 0.001, this, tr( "Predelay" ) ), - m_attackModel( 0.0, 0.0, 1.0, 0.001, this, tr( "Attack" ) ), - m_holdModel( 0.5, 0.0, 1.0, 0.001, this, tr( "Hold" ) ), - m_decayModel( 0.5, 0.0, 1.0, 0.001, this, tr( "Decay" ) ), + m_predelayModel( 0.0, 0.0, 2.0, 0.001, this, tr( "Predelay" ) ), + m_attackModel( 0.0, 0.0, 2.0, 0.001, this, tr( "Attack" ) ), + m_holdModel( 0.5, 0.0, 2.0, 0.001, this, tr( "Hold" ) ), + m_decayModel( 0.5, 0.0, 2.0, 0.001, this, tr( "Decay" ) ), m_sustainModel( 0.5, 0.0, 1.0, 0.001, this, tr( "Sustain" ) ), - m_releaseModel( 0.1, 0.0, 1.0, 0.001, this, tr( "Release" ) ), + m_releaseModel( 0.1, 0.0, 2.0, 0.001, this, tr( "Release" ) ), m_amountModel( 0.0, -1.0, 1.0, 0.005, this, tr( "Modulation" ) ), m_valueForZeroAmount( _value_for_zero_amount ), m_pahdEnv( NULL ), diff --git a/src/gui/widgets/EnvelopeAndLfoView.cpp b/src/gui/widgets/EnvelopeAndLfoView.cpp index 24787babe35..4ecdea37f37 100644 --- a/src/gui/widgets/EnvelopeAndLfoView.cpp +++ b/src/gui/widgets/EnvelopeAndLfoView.cpp @@ -62,7 +62,7 @@ const int SUSTAIN_KNOB_X = DECAY_KNOB_X+KNOB_X_SPACING; const int RELEASE_KNOB_X = SUSTAIN_KNOB_X+KNOB_X_SPACING; const int AMOUNT_KNOB_X = RELEASE_KNOB_X+KNOB_X_SPACING; -const float TIME_UNIT_WIDTH = 35.0; +const float TIME_UNIT_WIDTH = 24.0; const int LFO_GRAPH_X = 6; @@ -366,7 +366,7 @@ void EnvelopeAndLfoView::mousePressEvent( QMouseEvent * _me ) -void EnvelopeAndLfoView::dragEnterEvent( QDragEnterEvent * _dee ) +void EnvelopeAndLfoView::dragEnterEvent( QDragEnterEvent * _dee ) // TODO: Remove the expKnobVals, time should be linear { stringPairDrag::processDragEnterEvent( _dee, QString( "samplefile,tco_%1" ).arg( From 5d2100c965a055cefba66c1c79134a6ae0fd2a76 Mon Sep 17 00:00:00 2001 From: Oskar Wallgren Date: Wed, 5 Mar 2014 03:29:07 +0100 Subject: [PATCH 2/2] Revert accidental change --- src/gui/widgets/EnvelopeAndLfoView.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/widgets/EnvelopeAndLfoView.cpp b/src/gui/widgets/EnvelopeAndLfoView.cpp index 4ecdea37f37..712f48ac55a 100644 --- a/src/gui/widgets/EnvelopeAndLfoView.cpp +++ b/src/gui/widgets/EnvelopeAndLfoView.cpp @@ -366,7 +366,7 @@ void EnvelopeAndLfoView::mousePressEvent( QMouseEvent * _me ) -void EnvelopeAndLfoView::dragEnterEvent( QDragEnterEvent * _dee ) // TODO: Remove the expKnobVals, time should be linear +void EnvelopeAndLfoView::dragEnterEvent( QDragEnterEvent * _dee ) { stringPairDrag::processDragEnterEvent( _dee, QString( "samplefile,tco_%1" ).arg(