Remove wrong asserts
[ardour.git] / gtk2_ardour / note_base.cc
index feee7e7d7c09503a86683eaeffd35da0ff9c5980..ff0ec34dfb4b0eaff433974c5b73baf820f4c6a5 100644 (file)
@@ -119,9 +119,9 @@ NoteBase::on_channel_selection_change(uint16_t selection)
 {
        // make note change its color if its channel is not marked active
        if ( (selection & (1 << _note->channel())) == 0 ) {
-               set_fill_color(UIConfiguration::instance().color ("midi note inactive channel"));
-               set_outline_color(calculate_outline(UIConfiguration::instance().color ("midi note inactive channel"),
-                                                   _selected));
+               const ArdourCanvas::Color inactive_ch = UIConfiguration::instance().color ("midi note inactive channel");
+               set_fill_color(inactive_ch);
+               set_outline_color(calculate_outline(inactive_ch, _selected));
        } else {
                // set the color according to the notes selection state
                set_selected(_selected);
@@ -146,9 +146,11 @@ NoteBase::set_selected(bool selected)
        }
 
        _selected = selected;
-       set_fill_color (base_color());
 
-       set_outline_color(calculate_outline(base_color(), _selected));
+       const uint32_t base_col = base_color();
+       set_fill_color (base_col);
+
+       set_outline_color(calculate_outline(base_col, _selected));
 }
 
 #define SCALE_USHORT_TO_UINT8_T(x) ((x) / 257)
@@ -166,8 +168,8 @@ NoteBase::base_color()
        switch (mode) {
        case TrackColor:
        {
-               uint32_t color = _region.midi_stream_view()->get_region_color();
-               return UINT_INTERPOLATE (UINT_RGBA_CHANGE_A (color, opacity),
+               const uint32_t region_color = _region.midi_stream_view()->get_region_color();
+               return UINT_INTERPOLATE (UINT_RGBA_CHANGE_A (region_color, opacity),
                                         UIConfiguration::instance().color ("midi note selected"),
                                         0.5);
        }
@@ -238,14 +240,14 @@ NoteBase::set_mouse_fractions (GdkEvent* ev)
        _mouse_y_fraction = yf;
 
        if (notify) {
-                if (big_enough_to_trim()) {
-                        _region.note_mouse_position (_mouse_x_fraction, _mouse_y_fraction, set_cursor);
-                } else {
-                        /* pretend the mouse is in the middle, because this is not big enough
-                           to trim right now.
-                        */
-                        _region.note_mouse_position (0.5, 0.5, set_cursor);
-                }
+               if (big_enough_to_trim()) {
+                       _region.note_mouse_position (_mouse_x_fraction, _mouse_y_fraction, set_cursor);
+               } else {
+                       /* pretend the mouse is in the middle, because this is not big enough
+                          to trim right now.
+                       */
+                       _region.note_mouse_position (0.5, 0.5, set_cursor);
+               }
        }
 }