Change order of midi entries so a new backend will default to a working midi system.

[ardour.git] / gtk2_ardour / automation_time_axis.cc

diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc
index 5a6bf5dbbe0e57d941cdb9e4c286830da2e62073..60552ce14eaafb4d3dbb5742ff4faf7d1a81b84d 100644 (file)
--- a/gtk2_ardour/automation_time_axis.cc
+++ b/gtk2_ardour/automation_time_axis.cc
@@ -43,6 +43,7 @@
 #include "gui_thread.h"
 #include "route_time_axis.h"
 #include "automation_line.h"
+#include "paste_context.h"
 #include "public_editor.h"
 #include "selection.h"
 #include "rgb_macros.h"
@@ -109,6 +110,10 @@ AutomationTimeAxisView::AutomationTimeAxisView (
                _controller = AutomationController::create (_automatable, _control->parameter(), _control->desc(), _control);
        }
 
+       const std::string fill_color_name = (dynamic_cast<MidiTimeAxisView*>(&parent)
+                                            ? "midi automation track fill"
+                                            : "audio automation track fill");
+
        automation_menu = 0;
        auto_off_item = 0;
        auto_touch_item = 0;
@@ -123,7 +128,7 @@ AutomationTimeAxisView::AutomationTimeAxisView (
        CANVAS_DEBUG_NAME (_base_rect, string_compose ("base rect for %1", _name));
        _base_rect->set_x1 (ArdourCanvas::COORD_MAX);
        _base_rect->set_outline (false);
-       _base_rect->set_fill_color (ARDOUR_UI::config()->get_AutomationTrackFill());
+       _base_rect->set_fill_color (ARDOUR_UI::config()->color_mod (fill_color_name, "automation track fill"));
        _base_rect->set_data ("trackview", this);
        _base_rect->Event.connect (sigc::bind (sigc::mem_fun (_editor, &PublicEditor::canvas_automation_track_event), _base_rect, this));
        if (!a) {
@@ -219,7 +224,7 @@ AutomationTimeAxisView::AutomationTimeAxisView (
        hide_button.show ();
 
        if (_controller) {
-               _controller.get()->set_tweaks (PixFader::Tweaks(_controller.get()->tweaks() | PixFader::NoVerticalScroll));
+               _controller->disable_vertical_scroll ();
                controls_table.attach (*_controller.get(), 2, 4, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
        }
 
@@ -256,7 +261,7 @@ AutomationTimeAxisView::AutomationTimeAxisView (
                                )
                        );
 
-               line->set_line_color (ARDOUR_UI::config()->get_ProcessorAutomationLine());
+               line->set_line_color (ARDOUR_UI::config()->color ("processor automation line"));
                line->queue_reset ();
                add_line (line);
        }
@@ -429,7 +434,7 @@ AutomationTimeAxisView::clear_clicked ()
 {
        assert (_line || _view);
 
-       _session->begin_reversible_command (_("clear automation"));
+       _editor.begin_reversible_command (_("clear automation"));
 
        if (_line) {
                _line->clear ();
@@ -437,7 +442,7 @@ AutomationTimeAxisView::clear_clicked ()
                _view->clear ();
        }
 
-       _session->commit_reversible_command ();
+       _editor.commit_reversible_command ();
        _session->set_dirty ();
 }
 
@@ -622,25 +627,31 @@ AutomationTimeAxisView::add_automation_event (GdkEvent* event, framepos_t when,
 
        _editor.snap_to_with_modifier (when, event);
 
-       _session->begin_reversible_command (_("add automation event"));
+       _editor.begin_reversible_command (_("add automation event"));
        XMLNode& before = list->get_state();
 
        list->add (when, y, with_guard_points);
 
        XMLNode& after = list->get_state();
-       _session->commit_reversible_command (new MementoCommand<ARDOUR::AutomationList> (*list, &before, &after));
+       _session->add_command (new MementoCommand<ARDOUR::AutomationList> (*list, &before, &after));
+       _editor.commit_reversible_command ();
        _session->set_dirty ();
 }
 
 bool
-AutomationTimeAxisView::paste (framepos_t pos, unsigned paste_count, float times, const Selection& selection, ItemCounts& counts)
+AutomationTimeAxisView::paste (framepos_t pos, const Selection& selection, PasteContext& ctx)
 {
        if (_line) {
-               return paste_one (pos, paste_count, times, selection, counts);
+               return paste_one (pos, ctx.count, ctx.times, selection, ctx.counts, ctx.greedy);
        } else if (_view) {
-               AutomationSelection::const_iterator l = selection.lines.get_nth(_parameter, counts.n_lines(_parameter));
-               if (l != selection.lines.end() && _view->paste (pos, paste_count, times, *l)) {
-                       counts.increase_n_lines(_parameter);
+               AutomationSelection::const_iterator l = selection.lines.get_nth(_parameter, ctx.counts.n_lines(_parameter));
+               if (l == selection.lines.end()) {
+                       if (ctx.greedy && selection.lines.size() == 1) {
+                               l = selection.lines.begin();
+                       }
+               }
+               if (l != selection.lines.end() && _view->paste (pos, ctx.count, ctx.times, *l)) {
+                       ctx.counts.increase_n_lines(_parameter);
                        return true;
                }
        }
@@ -649,7 +660,7 @@ AutomationTimeAxisView::paste (framepos_t pos, unsigned paste_count, float times
 }
 
 bool
-AutomationTimeAxisView::paste_one (framepos_t pos, unsigned paste_count, float times, const Selection& selection, ItemCounts& counts)
+AutomationTimeAxisView::paste_one (framepos_t pos, unsigned paste_count, float times, const Selection& selection, ItemCounts& counts, bool greedy)
 {
        boost::shared_ptr<AutomationList> alist(_line->the_list());
 
@@ -661,7 +672,11 @@ AutomationTimeAxisView::paste_one (framepos_t pos, unsigned paste_count, float t
        /* Get appropriate list from selection. */
        AutomationSelection::const_iterator p = selection.lines.get_nth(_parameter, counts.n_lines(_parameter));
        if (p == selection.lines.end()) {
-               return false;
+               if (greedy && selection.lines.size() == 1) {
+                       p = selection.lines.begin();
+               } else {
+                       return false;
+               }
        }
        counts.increase_n_lines(_parameter);
 
@@ -678,7 +693,7 @@ AutomationTimeAxisView::paste_one (framepos_t pos, unsigned paste_count, float t
 }
 
 void
-AutomationTimeAxisView::get_selectables (framepos_t start, framepos_t end, double top, double bot, list<Selectable*>& results)
+AutomationTimeAxisView::get_selectables (framepos_t start, framepos_t end, double top, double bot, list<Selectable*>& results, bool /*within*/)
 {
        if (!_line && !_view) {
                return;