next modifier, and remove color 102 since nothing uses it

[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 61c5d28e19b183d66e21be03caf09ba0dbc5ac3c..cd57387ac4760fb9d752e757c229705ff7ccbc07 100644 (file)
--- a/gtk2_ardour/automation_time_axis.cc
+++ b/gtk2_ardour/automation_time_axis.cc
@@ -23,6 +23,7 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/lexical_cast.hpp>
 
+#include "pbd/error.h"
 #include "pbd/memento_command.h"
 #include "pbd/stacktrace.h"
 
@@ -42,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"
@@ -122,7 +124,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 ("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) {
@@ -218,7 +220,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);
        }
 
@@ -255,7 +257,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);
        }
@@ -632,14 +634,19 @@ AutomationTimeAxisView::add_automation_event (GdkEvent* event, framepos_t when,
 }
 
 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;
                }
        }
@@ -648,7 +655,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());
 
@@ -660,7 +667,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);
 
@@ -876,15 +887,17 @@ AutomationTimeAxisView::lines () const
 string
 AutomationTimeAxisView::state_id() const
 {
-       if (_control) {
+       if (_automatable != _route && _control) {
                return string_compose ("automation %1", _control->id().to_s());
-       } else {
-               assert (_parameter);
+       } else if (_parameter) {
                return string_compose ("automation %1 %2/%3/%4", 
                                       _route->id(), 
                                       _parameter.type(),
                                       _parameter.id(),
                                       (int) _parameter.channel());
+       } else {
+               error << "Automation time axis has no state ID" << endmsg;
+               return "";
        }
 }