summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2010-11-28 20:32:58 +0000
committerCarl Hetherington <carl@carlh.net>2010-11-28 20:32:58 +0000
commitad4e0cd2d1ae55fc2c459486c8e048a15cfa50f0 (patch)
treefe36a3624ce6f382bcc4bc2ead6d7f5ed87885c3 /libs
parentab61e8de4a6131b7b9bda6835eb1d66eae9c319a (diff)
Fix non-update of session range marker in some cases.
git-svn-id: svn://localhost/ardour2/branches/3.0@8120 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
-rw-r--r--libs/ardour/ardour/session.h1
-rw-r--r--libs/ardour/session.cc9
2 files changed, 2 insertions, 8 deletions
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index 1f2e2f9c93..acdeee8cd4 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -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 */
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index c44db41553..28aebb9387 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -757,12 +757,6 @@ Session::hookup_io ()
}
void
-Session::playlist_length_changed ()
-{
- update_session_range_location_marker ();
-}
-
-void
Session::track_playlist_changed (boost::weak_ptr<Track> wp)
{
boost::shared_ptr<Track> track = wp.lock ();
@@ -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 ();