Various color tweaks.

[ardour.git] / gtk2_ardour / automation_streamview.cc

diff --git a/gtk2_ardour/automation_streamview.cc b/gtk2_ardour/automation_streamview.cc
index 53c643c0270ff4990007fccc00f27b855ef64081..89ae7fa07980336203681efb56aaf1ed104599b1 100644 (file)
--- a/gtk2_ardour/automation_streamview.cc
+++ b/gtk2_ardour/automation_streamview.cc
@@ -16,8 +16,9 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <cmath>
 #include <cassert>
+#include <cmath>
+#include <list>
 #include <utility>
 
 #include <gtkmm.h>
@@ -30,19 +31,21 @@
 #include "ardour/midi_region.h"
 #include "ardour/midi_source.h"
 
-#include "automation_streamview.h"
-#include "region_view.h"
+#include "ardour_ui.h"
 #include "automation_region_view.h"
+#include "automation_streamview.h"
 #include "automation_time_axis.h"
-#include "region_selection.h"
-#include "selection.h"
+#include "global_signals.h"
+#include "gui_thread.h"
 #include "public_editor.h"
-#include "ardour_ui.h"
+#include "region_selection.h"
+#include "region_view.h"
 #include "rgb_macros.h"
-#include "gui_thread.h"
+#include "selection.h"
 
 using namespace std;
 using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
 using namespace PBD;
 using namespace Editing;
 
@@ -55,8 +58,9 @@ AutomationStreamView::AutomationStreamView (AutomationTimeAxisView& tv)
        CANVAS_DEBUG_NAME (_canvas_group, string_compose ("SV canvas group auto %1", tv.name()));
        CANVAS_DEBUG_NAME (canvas_rect, string_compose ("SV canvas rectangle auto %1", tv.name()));
 
-       canvas_rect->set_fill (false);
-       canvas_rect->set_outline_color (RGBA_BLACK);
+       color_handler ();
+
+       ColorsChanged.connect(sigc::mem_fun(*this, &AutomationStreamView::color_handler));
 }
 
 AutomationStreamView::~AutomationStreamView ()
@@ -191,13 +195,11 @@ AutomationStreamView::setup_rec_box ()
 void
 AutomationStreamView::color_handler ()
 {
-       /*if (_trackview.is_midi_track()) {
-               canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->get_canvasvar_MidiTrackBase();
+       if (_trackview.is_midi_track()) {
+               canvas_rect->set_fill_color (ARDOUR_UI::config()->color_mod ("midi track base", "midi track base"));
+       } else {
+               canvas_rect->set_fill_color (ARDOUR_UI::config()->color ("midi bus base"));
        }
-
-       if (!_trackview.is_midi_track()) {
-               canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->get_canvasvar_MidiBusBase();;
-       }*/
 }
 
 AutoState
@@ -277,6 +279,9 @@ AutomationStreamView::clear ()
 void
 AutomationStreamView::get_selectables (framepos_t start, framepos_t end, double botfrac, double topfrac, list<Selectable*>& results)
 {
+       if (!_trackview.editor().internal_editing()) {
+               return;  // TODO: selection of automation regions
+       }
        for (list<RegionView*>::iterator i = region_views.begin(); i != region_views.end(); ++i) {
                AutomationRegionView* arv = dynamic_cast<AutomationRegionView*> (*i);
                assert (arv);
@@ -315,16 +320,16 @@ struct RegionPositionSorter {
 };
 
 
-/** @param pos Position, in session frames.
- *  @return AutomationLine to paste to for that position, or 0 if there is none appropriate.
- */
-boost::shared_ptr<AutomationLine>
-AutomationStreamView::paste_line (framepos_t pos)
+bool
+AutomationStreamView::paste (framepos_t                                pos,
+                             unsigned                                  paste_count,
+                             float                                     times,
+                             boost::shared_ptr<ARDOUR::AutomationList> alist)
 {
        /* XXX: not sure how best to pick this; for now, just use the last region which starts before pos */
 
        if (region_views.empty()) {
-               return boost::shared_ptr<AutomationLine> ();
+               return false;
        }
 
        region_views.sort (RegionPositionSorter ());
@@ -342,11 +347,9 @@ AutomationStreamView::paste_line (framepos_t pos)
 
        /* If *prev doesn't cover pos, it's no good */
        if (r->position() > pos || ((r->position() + r->length()) < pos)) {
-               return boost::shared_ptr<AutomationLine> ();
+               return false;
        }
 
        AutomationRegionView* arv = dynamic_cast<AutomationRegionView*> (*prev);
-       assert (arv);
-
-       return arv->line ();
+       return arv ? arv->paste(pos, paste_count, times, alist) : false;
 }