diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index d6b35aa998..25b7b72fe4 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -560,12 +560,6 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi /* Curves and AutomationLists (TODO when they go away) */ void add_automation_list(AutomationList*); - /* fade curves */ - - float get_default_fade_length () const { return default_fade_msecs; } - float get_default_fade_steepness () const { return default_fade_steepness; } - void set_default_fade (float steepness, float msecs); - /* auditioning */ boost::shared_ptr the_auditioner() { return auditioner; } diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index 9b461d8c69..4c25989c0a 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -1256,43 +1256,6 @@ Session::set_block_size (pframes_t nframes) } } -void -Session::set_default_fade (float /*steepness*/, float /*fade_msecs*/) -{ -#if 0 - framecnt_t fade_frames; - - /* Don't allow fade of less 1 frame */ - - if (fade_msecs < (1000.0 * (1.0/_current_frame_rate))) { - - fade_msecs = 0; - fade_frames = 0; - - } else { - - fade_frames = (framecnt_t) floor (fade_msecs * _current_frame_rate * 0.001); - - } - - default_fade_msecs = fade_msecs; - default_fade_steepness = steepness; - - { - // jlc, WTF is this! - Glib::RWLock::ReaderLock lm (route_lock); - AudioRegion::set_default_fade (steepness, fade_frames); - } - - set_dirty(); - - /* XXX have to do this at some point */ - /* foreach region using default fade, reset, then - refill_all_diskstream_buffers (); - */ -#endif -} - struct RouteSorter { /** @return true to run r1 before r2, otherwise false */ bool operator() (boost::shared_ptr r1, boost::shared_ptr r2) { diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index 05fdb13bec..675c7e679c 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -258,8 +258,6 @@ Session::first_stage_init (string fullpath, string snapshot_name) last_rr_session_dir = session_dirs.begin(); refresh_disk_space (); - // set_default_fade (0.2, 5.0); /* steepness, millisecs */ - /* default: assume simple stereo speaker configuration */ _speakers->setup_default_speakers (2);