make middle-click on piano roll track header more usefully select/unselect notes

[ardour.git] / gtk2_ardour / audio_region_view.cc

diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc
index 7a509cd1d82984799579d2f907ef377f5af3a716..0159022f87c0276999dc3f8783a2f1e69153bbbc 100644 (file)
--- a/gtk2_ardour/audio_region_view.cc
+++ b/gtk2_ardour/audio_region_view.cc
@@ -43,6 +43,7 @@
 #include "canvas/line.h"
 #include "canvas/text.h"
 #include "canvas/debug.h"
+#include "canvas/utils.h"
 
 #include "streamview.h"
 #include "audio_region_view.h"
@@ -232,10 +233,13 @@ AudioRegionView::init (Gdk::Color const & basic_color, bool wfd)
 
        setup_waveform_visibility ();
        setup_waveform_shape ();
-       setup_waveform_scale ();
 
-       frame_handle_start->raise_to_top ();
-       frame_handle_end->raise_to_top ();
+       if (frame_handle_start) {
+               frame_handle_start->raise_to_top ();
+       }
+       if (frame_handle_end) {
+               frame_handle_end->raise_to_top ();
+       }
 
        /* XXX sync mark drag? */
 }
@@ -1175,24 +1179,11 @@ AudioRegionView::create_one_wave (uint32_t which, bool /*direct*/)
        WaveView *wave = new WaveView (group, audio_region ());
        CANVAS_DEBUG_NAME (wave, string_compose ("wave view for chn %1 of %2", which, get_item_name()));
        
-       wave->lower_to_bottom ();
        wave->set_channel (which);
        wave->set_y_position (yoff);
        wave->set_height (ht);
        wave->set_samples_per_pixel (samples_per_pixel);
-
-       if (_recregion) {
-               wave->set_outline_color (_region->muted() ? UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_canvasvar_RecWaveForm(), MUTED_ALPHA) : ARDOUR_UI::config()->get_canvasvar_RecWaveForm());
-               wave->set_fill_color (ARDOUR_UI::config()->get_canvasvar_RecWaveFormFill());
-       } else {
-               wave->set_outline_color (_region->muted() ? UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_canvasvar_WaveForm(), MUTED_ALPHA) : ARDOUR_UI::config()->get_canvasvar_WaveForm());
-               wave->set_fill_color (ARDOUR_UI::config()->get_canvasvar_WaveFormFill());
-       }
-
-       wave->set_clip_color (ARDOUR_UI::config()->get_canvasvar_WaveFormClip());
-       wave->set_zero_color (ARDOUR_UI::config()->get_canvasvar_ZeroLine());
-       // CAIROCANVAS
-       // wave->property_zero_line() = true;
+       wave->set_show_zero_line (true);
 
        switch (Config->get_waveform_shape()) {
        case Rectified:
@@ -1328,11 +1319,14 @@ AudioRegionView::setup_waveform_shape ()
 void
 AudioRegionView::setup_waveform_scale ()
 {
-       for (vector<WaveView *>::iterator wave = waves.begin(); wave != waves.end() ; ++wave) {
-               (*wave)->set_logscaled (Config->get_waveform_scale() == Logarithmic);
-       }
+       WaveView::set_global_logscaled (Config->get_waveform_scale() == Logarithmic);
 }
 
+void
+AudioRegionView::setup_waveform_clipping ()
+{
+       WaveView::set_global_show_waveform_clipping (ARDOUR_UI::config()->get_show_waveform_clipping());
+}
 
 GhostRegion*
 AudioRegionView::add_ghost (TimeAxisView& tv)
@@ -1434,42 +1428,54 @@ AudioRegionView::color_handler ()
 void
 AudioRegionView::set_waveform_colors ()
 {
-       ArdourCanvas::Color fill, outline, clip, zero;
+        for (vector<ArdourCanvas::WaveView*>::iterator w = waves.begin(); w != waves.end(); ++w) {
+               set_one_waveform_color (*w);
+       }
+}
+
+void
+AudioRegionView::set_one_waveform_color (ArdourCanvas::WaveView* wave)
+{
+       ArdourCanvas::Color fill;
+       ArdourCanvas::Color outline;
        
        if (_selected) {
-                if (_region->muted()) {
-                        outline = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_canvasvar_SelectedWaveForm(), MUTED_ALPHA);
-                } else {
-                        outline = ARDOUR_UI::config()->get_canvasvar_SelectedWaveForm();
-                }
-                fill = ARDOUR_UI::config()->get_canvasvar_SelectedWaveFormFill();
+               if (_region->muted()) {
+                       outline = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_canvasvar_SelectedWaveForm(), MUTED_ALPHA);
+               } else {
+                       outline = ARDOUR_UI::config()->get_canvasvar_SelectedWaveForm();
+               }
+               fill = ARDOUR_UI::config()->get_canvasvar_SelectedWaveFormFill();
        } else {
                if (_recregion) {
-                        if (_region->muted()) {
-                                outline = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_canvasvar_RecWaveForm(), MUTED_ALPHA);
-                        } else {
-                                outline = ARDOUR_UI::config()->get_canvasvar_RecWaveForm();
-                        }
-                        fill = ARDOUR_UI::config()->get_canvasvar_RecWaveFormFill();
+                       outline = ARDOUR_UI::config()->get_canvasvar_RecWaveForm();
+                       fill = ARDOUR_UI::config()->get_canvasvar_RecWaveFormFill();
                } else {
-                        if (_region->muted()) {
-                                outline = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_canvasvar_WaveForm(), MUTED_ALPHA);
-                        } else {
-                                outline = ARDOUR_UI::config()->get_canvasvar_WaveForm();
-                        }
-                        fill = ARDOUR_UI::config()->get_canvasvar_WaveFormFill();
+                       if (_region->muted()) {
+                               outline = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_canvasvar_WaveForm(), MUTED_ALPHA);
+                       } else {
+                               outline = ARDOUR_UI::config()->get_canvasvar_WaveForm();
+                       }
+                       fill = ARDOUR_UI::config()->get_canvasvar_WaveFormFill();
                }
        }
 
-       clip = ARDOUR_UI::config()->get_canvasvar_WaveFormClip();
-       zero = ARDOUR_UI::config()->get_canvasvar_ZeroLine();
+       if (ARDOUR_UI::config()->get_color_regions_using_track_color()) {
 
-        for (vector<ArdourCanvas::WaveView*>::iterator w = waves.begin(); w != waves.end(); ++w) {
-               (*w)->set_outline_color (outline);
-               (*w)->set_fill_color (fill);
-               (*w)->set_clip_color (clip);
-               (*w)->set_zero_color (zero);
+               /* just use a slightly transparent version of the selected
+                * color so that some of the track color bleeds through
+                */
+
+               double r, g, b, a;
+               ArdourCanvas::color_to_rgba (fill, r, g, b, a);
+               fill = ArdourCanvas::rgba_to_color (r, g, b, 0.85); /* magic number, not user controllable */
+               
        }
+               
+       wave->set_fill_color (fill);
+       wave->set_outline_color (outline);
+       wave->set_clip_color (ARDOUR_UI::config()->get_canvasvar_WaveFormClip());
+       wave->set_zero_color (ARDOUR_UI::config()->get_canvasvar_ZeroLine());
 }
 
 void
@@ -1541,7 +1547,6 @@ AudioRegionView::show_region_editor ()
        }
 
        editor->present ();
-       editor->set_position (Gtk::WIN_POS_MOUSE);
        editor->show_all();
 }
 
@@ -1680,5 +1685,7 @@ AudioRegionView::parameter_changed (string const & p)
                setup_waveform_scale ();
        } else if (p == "waveform-shape") {
                setup_waveform_shape ();
+       } else if (p == "show-waveform-clipping") {
+               setup_waveform_clipping ();
        }
 }