Re-assign timeline tracks when things are moved about.

diff --git a/ChangeLog b/ChangeLog
index da705b387382314e81ae8b392fb08bf7e918feaa..714a8516c9881d6c5021f2d62109ac1a1faa9544 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-24  Carl Hetherington  <cth@carlh.net>
+
+       * Fix some madness when dragging things around
+       on the timeline.
+
 2014-06-23  Carl Hetherington  <cth@carlh.net>
 
        * Try harder to cope with DCP names specified

diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc
index d4df6d8b2be2b246005b6c543d3ec8d5eeab3f60..eba12c47faff1421269b2f42067ec09ce90c8d6a 100644 (file)
--- a/src/wx/timeline.cc
+++ b/src/wx/timeline.cc
@@ -123,6 +123,10 @@ public:
                _track = t;
        }
 
+       void unset_track () {
+               _track = boost::optional<int> ();
+       }
+
        optional<int> track () const {
                return _track;
        }
@@ -362,7 +366,8 @@ Timeline::Timeline (wxWindow* parent, FilmEditor* ed, shared_ptr<Film> film)
 
        SetMinSize (wxSize (640, tracks() * track_height() + 96));
 
-       _playlist_connection = film->playlist()->Changed.connect (bind (&Timeline::playlist_changed, this));
+       _playlist_changed_connection = film->playlist()->Changed.connect (bind (&Timeline::playlist_changed, this));
+       _playlist_content_changed_connection = film->playlist()->ContentChanged.connect (bind (&Timeline::playlist_content_changed, this, _2));
 }
 
 void
@@ -413,19 +418,38 @@ Timeline::playlist_changed ()
        Refresh ();
 }
 
+void
+Timeline::playlist_content_changed (int property)
+{
+       ensure_ui_thread ();
+
+       if (property == ContentProperty::POSITION) {
+               assign_tracks ();
+               setup_pixels_per_time_unit ();
+               Refresh ();
+       }
+}
+
 void
 Timeline::assign_tracks ()
 {
+       for (ViewList::iterator i = _views.begin(); i != _views.end(); ++i) {
+               shared_ptr<ContentView> c = dynamic_pointer_cast<ContentView> (*i);
+               if (c) {
+                       c->unset_track ();
+               }
+       }
+
        for (ViewList::iterator i = _views.begin(); i != _views.end(); ++i) {
                shared_ptr<ContentView> cv = dynamic_pointer_cast<ContentView> (*i);
                if (!cv) {
                        continue;
                }
-       
+
                shared_ptr<Content> content = cv->content();
 
                int t = 0;
-               while (1) {
+               while (true) {
                        ViewList::iterator j = _views.begin();
                        while (j != _views.end()) {
                                shared_ptr<ContentView> test = dynamic_pointer_cast<ContentView> (*j);
@@ -650,7 +674,7 @@ Timeline::set_position_from_event (wxMouseEvent& ev)
        if (new_position < 0) {
                new_position = 0;
        }
-       
+
        _down_view->content()->set_position (new_position);
        
        shared_ptr<Film> film = _film.lock ();

diff --git a/src/wx/timeline.h b/src/wx/timeline.h
index 7b4d75d091d7397e37be13476264977133402206..fafb09c0e5aa0dc56b9c830131ae899a5c4616f7 100644 (file)
--- a/src/wx/timeline.h
+++ b/src/wx/timeline.h
@@ -79,6 +79,7 @@ private:
        void right_down (wxMouseEvent &);
        void mouse_moved (wxMouseEvent &);
        void playlist_changed ();
+       void playlist_content_changed (int);
        void resized ();
        void assign_tracks ();
        void set_position_from_event (wxMouseEvent &);
@@ -105,5 +106,6 @@ private:
        ContentMenu _menu;
        bool _snap;
 
-       boost::signals2::scoped_connection _playlist_connection;
+       boost::signals2::scoped_connection _playlist_changed_connection;
+       boost::signals2::scoped_connection _playlist_content_changed_connection;
 };