From 8a80325f51ea29e1ca03d615fe68e0ed23292c4b Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Mon, 30 Jun 2008 16:52:55 +0000 Subject: [PATCH] do not duplicate constants git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1233 0778d3d1-df1d-0410-868b-ea421aaaa00d --- src/core/envelope_and_lfo_parameters.cpp | 4 ++-- src/gui/widgets/envelope_and_lfo_view.cpp | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/core/envelope_and_lfo_parameters.cpp b/src/core/envelope_and_lfo_parameters.cpp index 7735c000a..846ac3d86 100644 --- a/src/core/envelope_and_lfo_parameters.cpp +++ b/src/core/envelope_and_lfo_parameters.cpp @@ -38,9 +38,9 @@ // how long should be each envelope-segment maximal (e.g. attack)? -const float SECS_PER_ENV_SEGMENT = 5.0f; +extern const float SECS_PER_ENV_SEGMENT = 5.0f; // how long should be one LFO-oscillation maximal? -const float SECS_PER_LFO_OSCILLATION = 20.0f; +extern const float SECS_PER_LFO_OSCILLATION = 20.0f; QVector envelopeAndLFOParameters::s_EaLParametersInstances; diff --git a/src/gui/widgets/envelope_and_lfo_view.cpp b/src/gui/widgets/envelope_and_lfo_view.cpp index 52852f200..5815fcad6 100644 --- a/src/gui/widgets/envelope_and_lfo_view.cpp +++ b/src/gui/widgets/envelope_and_lfo_view.cpp @@ -50,10 +50,8 @@ -// how long should be each envelope-segment maximal (e.g. attack)? -const float SECS_PER_ENV_SEGMENT = 5.0f; -// how long should be one LFO-oscillation maximal? -const float SECS_PER_LFO_OSCILLATION = 20.0f; +extern const float SECS_PER_ENV_SEGMENT; +extern const float SECS_PER_LFO_OSCILLATION; const int ENV_GRAPH_X = 6;