projects / ardour.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Disallow rename for plugin inserts. Fixes #3048.
[ardour.git] / gtk2_ardour / editor_mouse.cc
diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index dc5b0cd3ff9f91bbcd6967744f8988f6b267240f..a67406f93c5d48ec4cf12ff956df25849811b486 100644 (file)
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -31,6 +31,7 @@
 #include <gtkmm2ext/tearoff.h>
 #include "pbd/memento_command.h"
 #include "pbd/basename.h"
+#include "pbd/stateful_diff_command.h"
 
 #include "ardour_ui.h"
 #include "actions.h"
@@ -616,6 +617,11 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
 
        Editing::MouseMode eff = effective_mouse_mode ();
 
+       /* special case: allow drag of region fade in/out in object mode with join object/range enabled */
+       if (item_type == FadeInHandleItem || item_type == FadeOutHandleItem) {
+               eff = MouseObject;
+       }
+
        switch (eff) {
        case MouseRange:
                switch (item_type) {
@@ -629,10 +635,10 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
 
                case SelectionItem:
                        if (Keyboard::modifier_state_contains
-                           (event->button.state, Keyboard::ModifierMask(Keyboard::SecondaryModifier))) {
+                           (event->button.state, Keyboard::ModifierMask(Keyboard::PrimaryModifier))) {
                                // contains and not equals because I can't use alt as a modifier alone.
                                start_selection_grab (item, event);
-                       } else if (Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) {
+                       } else if (Keyboard::modifier_state_equals (event->button.state, Keyboard::SecondaryModifier)) {
                                /* grab selection for moving */
                                _drags->set (new SelectionDrag (this, item, SelectionDrag::SelectionMove), event);
                        } else {
@@ -682,14 +688,14 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
                        switch (item_type) {
                        case FadeInHandleItem:
                        {
-                               RegionSelection s = get_equivalent_regions (selection->regions, RouteGroup::Edit);
+                               RegionSelection s = get_equivalent_regions (selection->regions, Properties::edit.property_id);
                                _drags->set (new FadeInDrag (this, item, reinterpret_cast<RegionView*> (item->get_data("regionview")), s), event);
                                return true;
                        }
 
                        case FadeOutHandleItem:
                        {
-                               RegionSelection s = get_equivalent_regions (selection->regions, RouteGroup::Edit);
+                               RegionSelection s = get_equivalent_regions (selection->regions, Properties::edit.property_id);
                                _drags->set (new FadeOutDrag (this, item, reinterpret_cast<RegionView*> (item->get_data("regionview")), s), event);
                                return true;
                        }
@@ -712,7 +718,7 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
 
                        case RegionViewNameHighlight:
                        {
-                               RegionSelection s = get_equivalent_regions (selection->regions, RouteGroup::Edit);
+                               RegionSelection s = get_equivalent_regions (selection->regions, Properties::edit.property_id);
                                _drags->set (new TrimDrag (this, item, clicked_regionview, s.by_layer()), event);
                                return true;
                                break;
@@ -721,7 +727,7 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
                        case RegionViewName:
                        {
                                /* rename happens on edit clicks */
-                               RegionSelection s = get_equivalent_regions (selection->regions, RouteGroup::Edit);
+                               RegionSelection s = get_equivalent_regions (selection->regions, Properties::edit.property_id);
                                _drags->set (new TrimDrag (this, clicked_regionview->get_name_highlight(), clicked_regionview, s.by_layer()), event);
                                return true;
                                break;
@@ -773,7 +779,8 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
                                                        if (t) {
                                                                boost::shared_ptr<Playlist> pl = t->diskstream()->playlist ();
                                                                if (pl) {
-                                                                       boost::shared_ptr<Region> r = pl->top_region_at (unit_to_frame (event->button.x));
+                                                                       
+                                                                       boost::shared_ptr<Region> r = pl->top_region_at (event_frame (event));
                                                                        if (r) {
                                                                                RegionView* rv = rtv->view()->find_view (r);
                                                                                clicked_selection = select_range_around_region (rv);
@@ -1541,6 +1548,7 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_
                                rect->property_fill_color_rgba() = 0;
                                rect->property_outline_pixels() = 1;
                        }
+                       track_canvas->get_window()->set_cursor (*grabber_cursor);
                }
                break;
 
@@ -1675,6 +1683,7 @@ Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_
                                rect->property_outline_pixels() = 0;
                        }
                }
+               track_canvas->get_window()->set_cursor (*current_canvas_cursor);
                break;
 
        case AutomationTrackItem:
@@ -2143,7 +2152,7 @@ Editor::single_contents_trim (RegionView& rv, nframes64_t frame_delta, bool left
                snap_to (new_bound);
        }
        region->trim_start ((nframes64_t) (new_bound * speed), this);
-       rv.region_changed (StartChanged);
+       rv.region_changed (PropertyChange (ARDOUR::Properties::start));
 }
 
 void
@@ -2198,7 +2207,7 @@ Editor::single_start_trim (RegionView& rv, nframes64_t frame_delta, bool left_di
                }
        }
 
-       rv.region_changed (Change (LengthChanged|PositionChanged|StartChanged));
+       rv.region_changed (ARDOUR::bounds_change);
 }
 
 void
@@ -2252,10 +2261,10 @@ Editor::single_end_trim (RegionView& rv, nframes64_t frame_delta, bool left_dire
                        region_right->trim_front(region->last_frame() + 1, this);
                }
 
-               rv.region_changed (Change (LengthChanged|PositionChanged|StartChanged));
-       }
-       else {
-               rv.region_changed (LengthChanged);
+               rv.region_changed (ARDOUR::bounds_change);
+                       
+       } else {
+               rv.region_changed (PropertyChange (ARDOUR::Properties::length));
        }
 }
 
@@ -2279,23 +2288,17 @@ Editor::point_trim (GdkEvent* event, nframes64_t new_bound)
                                }
 
                                if (!(*i)->region()->locked()) {
-                                       boost::shared_ptr<Playlist> pl = (*i)->region()->playlist();
-                                       XMLNode &before = pl->get_state();
-
+                                       (*i)->region()->clear_history ();
                                        (*i)->region()->trim_front (new_bound, this);
-
-                                       XMLNode &after = pl->get_state();
-                                       _session->add_command(new MementoCommand<Playlist>(*pl.get(), &before, &after));
+                                       _session->add_command(new StatefulDiffCommand ((*i)->region()));
                                }
                        }
 
                } else {
                        if (!rv->region()->locked()) {
-                               boost::shared_ptr<Playlist> pl = rv->region()->playlist();
-                               XMLNode &before = pl->get_state();
+                               rv->region()->clear_history ();
                                rv->region()->trim_front (new_bound, this);
-                               XMLNode &after = pl->get_state();
-                               _session->add_command(new MementoCommand<Playlist>(*pl.get(), &before, &after));
+                               _session->add_command(new StatefulDiffCommand (rv->region()));
                        }
                }
 
@@ -2310,22 +2313,18 @@ Editor::point_trim (GdkEvent* event, nframes64_t new_bound)
                        for (list<RegionView*>::const_iterator i = selection->regions.by_layer().begin(); i != selection->regions.by_layer().end(); ++i)
                        {
                                if (!(*i)->region()->locked()) {
-                                       boost::shared_ptr<Playlist> pl = (*i)->region()->playlist();
-                                       XMLNode &before = pl->get_state();
+                                       (*i)->region()->clear_history();
                                        (*i)->region()->trim_end (new_bound, this);
-                                       XMLNode &after = pl->get_state();
-                                       _session->add_command(new MementoCommand<Playlist>(*pl.get(), &before, &after));
+                                       _session->add_command(new StatefulDiffCommand ((*i)->region()));
                                }
                        }
 
                } else {
 
                        if (!rv->region()->locked()) {
-                               boost::shared_ptr<Playlist> pl = rv->region()->playlist();
-                               XMLNode &before = pl->get_state();
+                               rv->region()->clear_history ();
                                rv->region()->trim_end (new_bound, this);
-                               XMLNode &after = pl->get_state();
-                               _session->add_command (new MementoCommand<Playlist>(*pl.get(), &before, &after));
+                               _session->add_command (new StatefulDiffCommand (rv->region()));
                        }
                }
 
@@ -2346,7 +2345,7 @@ Editor::thaw_region_after_trim (RegionView& rv)
                return;
        }
 
-       region->thaw (_("trimmed region"));
+       region->resume_property_changes ();
 
        AudioRegionView* arv = dynamic_cast<AudioRegionView*>(&rv);
 
@@ -2445,14 +2444,14 @@ Editor::mouse_brush_insert_region (RegionView* rv, nframes64_t pos)
        boost::shared_ptr<Playlist> playlist = rtv->playlist();
        double speed = rtv->get_diskstream()->speed();
 
-       XMLNode &before = playlist->get_state();
-       playlist->add_region (RegionFactory::create (rv->region()), (nframes64_t) (pos * speed));
-       XMLNode &after = playlist->get_state();
-       _session->add_command(new MementoCommand<Playlist>(*playlist.get(), &before, &after));
+        playlist->clear_history ();
+       boost::shared_ptr<Region> new_region (RegionFactory::create (rv->region()));
+        playlist->add_region (new_region, (nframes64_t) (pos * speed));
+       _session->add_command (new StatefulDiffCommand (playlist));
 
-       // playlist is frozen, so we have to update manually
+       // playlist is frozen, so we have to update manually XXX this is disgusting
 
-       playlist->Modified(); /* EMIT SIGNAL */
+       playlist->RegionAdded (new_region); /* EMIT SIGNAL */
 }
 
 gint
@@ -2475,12 +2474,10 @@ Editor::add_region_drag (ArdourCanvas::Item* item, GdkEvent* event, RegionView*
        if (Config->get_edit_mode() == Splice) {
                _drags->add (new RegionSpliceDrag (this, item, region_view, selection->regions.by_layer()));
        } else {
-               RegionSelection s = get_equivalent_regions (selection->regions, RouteGroup::Edit);
+               RegionSelection s = get_equivalent_regions (selection->regions, ARDOUR::Properties::edit.property_id);
                _drags->add (new RegionMoveDrag (this, item, region_view, s.by_layer(), false, false));
        }
 
-       begin_reversible_command (_("move region(s)"));
-
        /* sync the canvas to what we think is its current state */
        update_canvas_now();
 }
@@ -2492,7 +2489,7 @@ Editor::add_region_copy_drag (ArdourCanvas::Item* item, GdkEvent* event, RegionV
 
        _region_motion_group->raise_to_top ();
 
-       RegionSelection s = get_equivalent_regions (selection->regions, RouteGroup::Edit);
+       RegionSelection s = get_equivalent_regions (selection->regions, ARDOUR::Properties::edit.property_id);
        _drags->add (new RegionMoveDrag (this, item, region_view, s.by_layer(), false, true));
 }
 
@@ -2505,7 +2502,7 @@ Editor::add_region_brush_drag (ArdourCanvas::Item* item, GdkEvent* event, Region
                return;
        }
 
-       RegionSelection s = get_equivalent_regions (selection->regions, RouteGroup::Edit);
+       RegionSelection s = get_equivalent_regions (selection->regions, ARDOUR::Properties::edit.property_id);
        _drags->add (new RegionMoveDrag (this, item, region_view, s.by_layer(), true, false));
 
        begin_reversible_command (_("Drag region brush"));
@@ -2553,10 +2550,9 @@ Editor::start_selection_grab (ArdourCanvas::Item* /*item*/, GdkEvent* event)
 
        boost::shared_ptr<Playlist> playlist = clicked_axisview->playlist();
 
-       XMLNode *before = &(playlist->get_state());
+        playlist->clear_history ();
        clicked_routeview->playlist()->add_region (region, selection->time[clicked_selection].start);
-       XMLNode *after = &(playlist->get_state());
-       _session->add_command(new MementoCommand<Playlist>(*playlist, before, after));
+       _session->add_command(new StatefulDiffCommand (playlist));
 
        commit_reversible_command ();
 
Unnamed repository; edit this file 'description' to name the repository.