From dadee4622d15218e0190b72797897fbb7b247711 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 19 Sep 2010 03:31:03 +0000 Subject: Put images on the fade in/out menus. Fixes #3411. git-svn-id: svn://localhost/ardour2/branches/3.0@7805 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/ardour/audioregion.h | 8 -------- libs/ardour/ardour/types.h | 8 ++++++++ libs/ardour/audioregion.cc | 24 ++++++++++++------------ libs/ardour/enums.cc | 14 +++++++------- libs/ardour/strip_silence.cc | 2 +- 5 files changed, 28 insertions(+), 28 deletions(-) (limited to 'libs/ardour') diff --git a/libs/ardour/ardour/audioregion.h b/libs/ardour/ardour/audioregion.h index b294082273..b919b6572c 100644 --- a/libs/ardour/ardour/audioregion.h +++ b/libs/ardour/ardour/audioregion.h @@ -129,14 +129,6 @@ class AudioRegion : public Region bool fade_in_is_default () const; bool fade_out_is_default () const; - enum FadeShape { - Linear, - Fast, - Slow, - LogA, - LogB - }; - void set_fade_in_active (bool yn); void set_fade_in_shape (FadeShape); void set_fade_in_length (framecnt_t); diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h index cc36941ba8..d452cd6b54 100644 --- a/libs/ardour/ardour/types.h +++ b/libs/ardour/ardour/types.h @@ -495,6 +495,14 @@ namespace ARDOUR { uint32_t requested_physical_out; /* now many of the available physical inputs to consider usable */ }; + enum FadeShape { + FadeLinear, + FadeFast, + FadeSlow, + FadeLogA, + FadeLogB + }; + } // namespace ARDOUR diff --git a/libs/ardour/audioregion.cc b/libs/ardour/audioregion.cc index 214d31165b..afd4456cdd 100644 --- a/libs/ardour/audioregion.cc +++ b/libs/ardour/audioregion.cc @@ -736,12 +736,12 @@ AudioRegion::set_fade_in (FadeShape shape, framecnt_t len) _fade_in->clear (); switch (shape) { - case Linear: + case FadeLinear: _fade_in->fast_simple_add (0.0, 0.0); _fade_in->fast_simple_add (len, 1.0); break; - case Fast: + case FadeFast: _fade_in->fast_simple_add (0, 0); _fade_in->fast_simple_add (len * 0.389401, 0.0333333); _fade_in->fast_simple_add (len * 0.629032, 0.0861111); @@ -751,7 +751,7 @@ AudioRegion::set_fade_in (FadeShape shape, framecnt_t len) _fade_in->fast_simple_add (len, 1); break; - case Slow: + case FadeSlow: _fade_in->fast_simple_add (0, 0); _fade_in->fast_simple_add (len * 0.0207373, 0.197222); _fade_in->fast_simple_add (len * 0.0645161, 0.525); @@ -762,7 +762,7 @@ AudioRegion::set_fade_in (FadeShape shape, framecnt_t len) _fade_in->fast_simple_add (len, 1); break; - case LogA: + case FadeLogA: _fade_in->fast_simple_add (0, 0); _fade_in->fast_simple_add (len * 0.0737327, 0.308333); _fade_in->fast_simple_add (len * 0.246544, 0.658333); @@ -772,7 +772,7 @@ AudioRegion::set_fade_in (FadeShape shape, framecnt_t len) _fade_in->fast_simple_add (len, 1); break; - case LogB: + case FadeLogB: _fade_in->fast_simple_add (0, 0); _fade_in->fast_simple_add (len * 0.304147, 0.0694444); _fade_in->fast_simple_add (len * 0.529954, 0.152778); @@ -804,7 +804,7 @@ AudioRegion::set_fade_out (FadeShape shape, framecnt_t len) _fade_out->clear (); switch (shape) { - case Fast: + case FadeFast: _fade_out->fast_simple_add (len * 0, 1); _fade_out->fast_simple_add (len * 0.023041, 0.697222); _fade_out->fast_simple_add (len * 0.0553, 0.483333); @@ -814,7 +814,7 @@ AudioRegion::set_fade_out (FadeShape shape, framecnt_t len) _fade_out->fast_simple_add (len * 1, 0); break; - case LogA: + case FadeLogA: _fade_out->fast_simple_add (len * 0, 1); _fade_out->fast_simple_add (len * 0.228111, 0.988889); _fade_out->fast_simple_add (len * 0.347926, 0.972222); @@ -824,7 +824,7 @@ AudioRegion::set_fade_out (FadeShape shape, framecnt_t len) _fade_out->fast_simple_add (len * 1, 0); break; - case Slow: + case FadeSlow: _fade_out->fast_simple_add (len * 0, 1); _fade_out->fast_simple_add (len * 0.305556, 1); _fade_out->fast_simple_add (len * 0.548611, 0.991736); @@ -834,7 +834,7 @@ AudioRegion::set_fade_out (FadeShape shape, framecnt_t len) _fade_out->fast_simple_add (len * 1, 0); break; - case LogB: + case FadeLogB: _fade_out->fast_simple_add (len * 0, 1); _fade_out->fast_simple_add (len * 0.080645, 0.730556); _fade_out->fast_simple_add (len * 0.277778, 0.289256); @@ -843,7 +843,7 @@ AudioRegion::set_fade_out (FadeShape shape, framecnt_t len) _fade_out->fast_simple_add (len * 1, 0); break; - case Linear: + case FadeLinear: _fade_out->fast_simple_add (len * 0, 1); _fade_out->fast_simple_add (len * 1, 0); break; @@ -920,14 +920,14 @@ void AudioRegion::set_default_fade_in () { _fade_in_suspended = 0; - set_fade_in (Linear, 64); + set_fade_in (FadeLinear, 64); } void AudioRegion::set_default_fade_out () { _fade_out_suspended = 0; - set_fade_out (Linear, 64); + set_fade_out (FadeLinear, 64); } void diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc index 972ff2efb7..bde6d7a7fe 100644 --- a/libs/ardour/enums.cc +++ b/libs/ardour/enums.cc @@ -82,7 +82,7 @@ setup_enum_writer () SessionEvent::Type _SessionEvent_Type; TimecodeFormat _Session_TimecodeFormat; Session::PullupFormat _Session_PullupFormat; - AudioRegion::FadeShape _AudioRegion_FadeShape; + FadeShape _FadeShape; Panner::LinkDirection _Panner_LinkDirection; IOChange _IOChange; AutomationType _AutomationType; @@ -387,12 +387,12 @@ setup_enum_writer () REGISTER_CLASS_ENUM (Source, Destructive); REGISTER_BITS (_Source_Flag); - REGISTER_CLASS_ENUM (AudioRegion, Linear); - REGISTER_CLASS_ENUM (AudioRegion, Fast); - REGISTER_CLASS_ENUM (AudioRegion, Slow); - REGISTER_CLASS_ENUM (AudioRegion, LogA); - REGISTER_CLASS_ENUM (AudioRegion, LogB); - REGISTER (_AudioRegion_FadeShape); + REGISTER_ENUM (FadeLinear); + REGISTER_ENUM (FadeFast); + REGISTER_ENUM (FadeSlow); + REGISTER_ENUM (FadeLogA); + REGISTER_ENUM (FadeLogB); + REGISTER (_FadeShape); REGISTER_CLASS_ENUM (Diskstream, Recordable); REGISTER_CLASS_ENUM (Diskstream, Hidden); diff --git a/libs/ardour/strip_silence.cc b/libs/ardour/strip_silence.cc index 21faeded68..a7d7ab073f 100644 --- a/libs/ardour/strip_silence.cc +++ b/libs/ardour/strip_silence.cc @@ -111,7 +111,7 @@ StripSilence::run (boost::shared_ptr r) copy->position() << std::endl; copy->set_fade_in_active (true); - copy->set_fade_in (AudioRegion::Linear, _fade_length); + copy->set_fade_in (FadeLinear, _fade_length); results.push_back (copy); } -- cgit v1.2.3