diff --git a/gtk2_ardour/canvas-flag.cc b/gtk2_ardour/canvas-flag.cc index f0361c5bf9..199f4d4054 100644 --- a/gtk2_ardour/canvas-flag.cc +++ b/gtk2_ardour/canvas-flag.cc @@ -48,6 +48,5 @@ CanvasFlag::~CanvasFlag() bool CanvasFlag::on_event(GdkEvent* ev) { - cerr << "CanvasFlag::on_event(GdkEvent* ev)" << endl; return false; } diff --git a/gtk2_ardour/canvas-note-event.cc b/gtk2_ardour/canvas-note-event.cc index d89e68786d..cae1d2be83 100644 --- a/gtk2_ardour/canvas-note-event.cc +++ b/gtk2_ardour/canvas-note-event.cc @@ -186,6 +186,7 @@ CanvasNoteEvent::base_color() ColorMode mode = _region.color_mode(); const uint8_t minimal_opaqueness = 15; + uint8_t opaqueness = std::max(minimal_opaqueness, uint8_t(_note->velocity() + _note->velocity())); switch (mode) { case TrackColor: @@ -195,12 +196,12 @@ CanvasNoteEvent::base_color() SCALE_USHORT_TO_UINT8_T(color.get_red()), SCALE_USHORT_TO_UINT8_T(color.get_green()), SCALE_USHORT_TO_UINT8_T(color.get_blue()), - minimal_opaqueness + _note->velocity()); + opaqueness); } case ChannelColors: return UINT_RGBA_CHANGE_A(CanvasNoteEvent::midi_channel_colors[_note->channel()], - minimal_opaqueness + _note->velocity()); + opaqueness); default: return meter_style_fill_color(_note->velocity()); diff --git a/gtk2_ardour/interactive-item.h b/gtk2_ardour/interactive-item.h index 13d224fc72..2b54675c11 100644 --- a/gtk2_ardour/interactive-item.h +++ b/gtk2_ardour/interactive-item.h @@ -52,9 +52,7 @@ public: {} bool on_event(GdkEvent* ev) { - std::cerr << "InteractiveRect::on_event(GdkEvent* ev)" << std::endl; if(_parent_item) { - std::cerr << " parent not null" << std::endl; return _parent_item->on_event(ev); } else { return false; @@ -74,9 +72,7 @@ public: {} bool on_event(GdkEvent* ev) { - std::cerr << "InteractiveRect::on_event(GdkEvent* ev)" << std::endl; if(_parent_item) { - std::cerr << " parent not null" << std::endl; return _parent_item->on_event(ev); } else { return false;