Merge pull request #411 from zonkmachine/Envelope_time

Envelope time
LMMS · Mar 5, 2014 · 10b1f12 · 10b1f12
2 parents 4fb81c1 + 5d2100c
commit 10b1f12
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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;