check dependents in Playlist after moving a region to a specific layer; make region...

git-svn-id: svn://localhost/ardour2/branches/3.0@7692 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index aa0a76edcda0759ad9fb2586bf9e2ddfc7cf8c28..816217cf0b7fbe20f9c158745f2d4f0239125377 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -2017,7 +2017,7 @@ Editor::add_region_context_items (StreamView* sv, list<boost::shared_ptr<Region>
 
        edit_items.push_back (MenuElem (menu_item_name, *region_menu));
        if (multiple_regions_at_position && (layering_order_editor == 0 || !layering_order_editor->is_visible ())) {
-               edit_items.push_back (MenuElem (_("Choose top region"), (bind (mem_fun(*this, &Editor::change_region_layering_order), position))));
+               edit_items.push_back (MenuElem (_("Choose Top Region"), (bind (mem_fun(*this, &Editor::change_region_layering_order), position))));
        }
        edit_items.push_back (SeparatorElem());
 }
@@ -5572,17 +5572,13 @@ Editor::show_editor_list (bool yn)
 void
 Editor::change_region_layering_order (framepos_t position)
 {
-       if (!clicked_regionview) {
+        if (!clicked_routeview) {
                 if (layering_order_editor) {
                         layering_order_editor->hide ();
                 }
                return;
        }
 
-        if (!clicked_routeview) {
-               return;
-       }
-
         boost::shared_ptr<Track> track = boost::dynamic_pointer_cast<Track> (clicked_routeview->route());
 
         if (!track) {

diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc
index 3ec82b3746f37d07729e62a855982f21b9678ade..a7468834955f82046fc94d32b7b7a20a1b5b0640 100644 (file)
--- a/gtk2_ardour/editor_canvas_events.cc
+++ b/gtk2_ardour/editor_canvas_events.cc
@@ -518,6 +518,7 @@ Editor::canvas_crossfade_view_event (GdkEvent* event, ArdourCanvas::Item* item,
        case GDK_BUTTON_PRESS:
                clicked_crossfadeview = xfv;
                clicked_axisview = &clicked_crossfadeview->get_time_axis_view();
+               clicked_routeview = dynamic_cast<RouteTimeAxisView*>(clicked_axisview);
                if (event->button.button == 3) {
                        return button_press_handler (item, event, CrossfadeViewItem);
                }

diff --git a/gtk2_ardour/region_layering_order_editor.cc b/gtk2_ardour/region_layering_order_editor.cc
index 6f9ce645dba9174a147e8f11c5159ac46f61b7f7..2f6963d7b7f77dcc00f0ae8e11bb0e5f8d3f6e4c 100644 (file)
--- a/gtk2_ardour/region_layering_order_editor.cc
+++ b/gtk2_ardour/region_layering_order_editor.cc
@@ -219,6 +219,7 @@ RegionLayeringOrderEditor::maybe_present ()
                hide ();
                return;
        }
+
        present ();
 }
 

diff --git a/libs/ardour/audio_playlist.cc b/libs/ardour/audio_playlist.cc
index 30e52fa316bdbaa804db1aeaf25eed74bfeb720d..cfc5a4028adec43358b715fd7ede531425944581 100644 (file)
--- a/libs/ardour/audio_playlist.cc
+++ b/libs/ardour/audio_playlist.cc
@@ -399,7 +399,7 @@ AudioPlaylist::check_dependents (boost::shared_ptr<Region> r, bool norefresh)
                touched_regions = 0;
 
                try {
-                       nframes_t xfade_length;
+                       framecnt_t xfade_length;
                        switch (c) {
                        case OverlapNone:
                                break;

diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc
index 9c980ff73556fff7694fc2850c0cd0de8ddb0579..93a4d520e8b6ce31dd4777650202b7539b1a7bb8 100644 (file)
--- a/libs/ardour/playlist.cc
+++ b/libs/ardour/playlist.cc
@@ -2603,6 +2603,8 @@ Playlist::move_region_to_layer (layer_t target_layer, boost::shared_ptr<Region>
                }
        }
 
+        freeze ();
+
        /* now reset the layers without holding the region lock */
 
        for (list<LayerInfo>::iterator x = layerinfo.begin(); x != layerinfo.end(); ++x) {
@@ -2611,15 +2613,16 @@ Playlist::move_region_to_layer (layer_t target_layer, boost::shared_ptr<Region>
 
        region->set_layer (target_layer);
 
-#if 0
-       /* now check all dependents */
+        /* now check all dependents, since we changed the layering */
 
        for (list<LayerInfo>::iterator x = layerinfo.begin(); x != layerinfo.end(); ++x) {
                check_dependents (x->first, false);
        }
 
        check_dependents (region, false);
-#endif
+        notify_layering_changed ();
+
+        thaw ();
 
        return 0;
 }