Fix non-update of session range marker in some cases.
authorCarl Hetherington <carl@carlh.net>
Sun, 28 Nov 2010 20:32:58 +0000 (20:32 +0000)
committerCarl Hetherington <carl@carlh.net>
Sun, 28 Nov 2010 20:32:58 +0000 (20:32 +0000)
git-svn-id: svn://localhost/ardour2/branches/3.0@8120 d708f5d6-7413-0410-9779-e7cbd77b26cf

libs/ardour/ardour/session.h
libs/ardour/session.cc

index 1f2e2f9c934adef81218ad96fe733097a70986cf..acdeee8cd443b25ef218fbaad3a302b0c84ecc5e 100644 (file)
@@ -1270,7 +1270,6 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
        /* PLAYLISTS */
 
        void remove_playlist (boost::weak_ptr<Playlist>);
-       void playlist_length_changed ();
        void track_playlist_changed (boost::weak_ptr<Track>);
 
        /* NAMED SELECTIONS */
index c44db415532d8a24c9ec7d360a3038d8df3c8c1b..28aebb93877ad330f44f2f08d1fecf6dc3b63f57 100644 (file)
@@ -756,12 +756,6 @@ Session::hookup_io ()
        update_route_solo_state ();
 }
 
-void
-Session::playlist_length_changed ()
-{
-       update_session_range_location_marker ();
-}
-
 void
 Session::track_playlist_changed (boost::weak_ptr<Track> wp)
 {
@@ -773,7 +767,8 @@ Session::track_playlist_changed (boost::weak_ptr<Track> wp)
        boost::shared_ptr<Playlist> playlist;
 
        if ((playlist = track->playlist()) != 0) {
-               playlist->LengthChanged.connect_same_thread (*this, boost::bind (&Session::playlist_length_changed, this));
+               playlist->LengthChanged.connect_same_thread (*this, boost::bind (&Session::update_session_range_location_marker, this));
+               playlist->RangesMoved.connect_same_thread (*this, boost::bind (&Session::update_session_range_location_marker, this));
        }
 
        update_session_range_location_marker ();