fixes for 98% of all the warnings/errors reported by OS X gcc on tiger
[ardour.git] / gtk2_ardour / time_axis_view_item.cc
index 0a2c815c48211415583a82a8f97ba9f9c80f0cd4..d9b0bfa2cf42c972612d6ea9953f7a898df24afa 100644 (file)
@@ -23,7 +23,8 @@
 #include "ardour/types.h"
 #include "ardour/ardour.h"
 
-#include <gtkmm2ext/utils.h>
+#include "gtkmm2ext/utils.h"
+#include "gtkmm2ext/gui_thread.h"
 
 #include "ardour_ui.h"
 /*
@@ -49,7 +50,7 @@ using namespace PBD;
 using namespace ARDOUR;
 using namespace Gtkmm2ext;
 
-Pango::FontDescription* TimeAxisViewItem::NAME_FONT = 0;
+Pango::FontDescription TimeAxisViewItem::NAME_FONT;
 const double TimeAxisViewItem::NAME_X_OFFSET = 15.0;
 const double TimeAxisViewItem::GRAB_HANDLE_LENGTH = 6;
 
@@ -62,18 +63,18 @@ void
 TimeAxisViewItem::set_constant_heights ()
 {
         NAME_FONT = get_font_for_style (X_("TimeAxisViewItemName"));
-        
+
         Gtk::Window win;
         Gtk::Label foo;
         win.add (foo);
-        
+
         Glib::RefPtr<Pango::Layout> layout = foo.create_pango_layout (X_("Hg")); /* ascender + descender */
         int width = 0;
         int height = 0;
-        
-        layout->set_font_description (*NAME_FONT);
+
+        layout->set_font_description (NAME_FONT);
         Gtkmm2ext::get_ink_pixel_size (layout, width, height);
-        
+
         NAME_HEIGHT = height;
         NAME_Y_OFFSET = height + 3;
         NAME_HIGHLIGHT_SIZE = height + 2;
@@ -108,7 +109,7 @@ TimeAxisViewItem::TimeAxisViewItem(
 }
 
 TimeAxisViewItem::TimeAxisViewItem (const TimeAxisViewItem& other)
-       : sigc::trackable(other)
+       : Selectable (other)
        , PBD::ScopedConnectionList()
        , trackview (other.trackview)
        , _recregion (other._recregion)
@@ -141,7 +142,6 @@ TimeAxisViewItem::init (
 {
        item_name = it_name;
        samples_per_unit = spu;
-       should_show_selection = true;
        frame_position = start;
        item_duration = duration;
        name_connected = false;
@@ -156,6 +156,7 @@ TimeAxisViewItem::init (
        last_item_width = 0;
        wide_enough_for_name = wide;
        high_enough_for_name = high;
+        rect_visible = true;
 
        if (duration == 0) {
                warning << "Time Axis Item Duration == 0" << endl;
@@ -169,16 +170,16 @@ TimeAxisViewItem::init (
 
        if (visibility & ShowFrame) {
                frame = new ArdourCanvas::SimpleRect (*group, 0.0, 1.0, trackview.editor().frame_to_pixel(duration), trackview.current_height());
-               
+
                frame->property_outline_pixels() = 1;
                frame->property_outline_what() = 0xF;
-               
+
                if (_recregion) {
                        frame->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_RecordingRect.get();
                } else {
                        frame->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_TimeAxisFrame.get();
                }
-               
+
                frame->property_outline_what() = 0x1|0x2|0x4|0x8;
 
        } else {
@@ -186,13 +187,13 @@ TimeAxisViewItem::init (
        }
 
        if (visibility & ShowNameHighlight) {
-               
+
                if (visibility & FullWidthNameHighlight) {
                        name_highlight = new ArdourCanvas::SimpleRect (*group, 0.0, trackview.editor().frame_to_pixel(item_duration), trackview.current_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE, trackview.current_height());
                } else {
                        name_highlight = new ArdourCanvas::SimpleRect (*group, 1.0, trackview.editor().frame_to_pixel(item_duration) - 1, trackview.current_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE, trackview.current_height());
                }
-               
+
                name_highlight->set_data ("timeaxisviewitem", this);
                 name_highlight->property_outline_what() = 0x4;
                 /* we should really use a canvas color property here */
@@ -225,6 +226,8 @@ TimeAxisViewItem::init (
 
        set_duration (item_duration, this);
        set_position (start, this);
+
+       Config->ParameterChanged.connect (*this, invalidator (*this), ui_bind (&TimeAxisViewItem::parameter_changed, this, _1), gui_context ());
 }
 
 TimeAxisViewItem::~TimeAxisViewItem()
@@ -232,6 +235,30 @@ TimeAxisViewItem::~TimeAxisViewItem()
        delete group;
 }
 
+void
+TimeAxisViewItem::hide_rect ()
+{
+        rect_visible = false;
+        set_frame_color ();
+
+        if (name_highlight) {
+                name_highlight->property_outline_what() = 0x0;
+                name_highlight->property_fill_color_rgba() = UINT_RGBA_CHANGE_A(fill_color,64);
+        }
+}
+
+void
+TimeAxisViewItem::show_rect ()
+{
+        rect_visible = true;
+        set_frame_color ();
+
+        if (name_highlight) {
+                name_highlight->property_outline_what() = 0x4;
+                name_highlight->property_fill_color_rgba() = fill_color;
+        }
+}
+
 
 /**
  * Set the position of this item on the timeline.
@@ -459,21 +486,6 @@ TimeAxisViewItem::set_selected(bool yn)
        }
 }
 
-/**
- * Set whether an item should show its selection status.
- *
- * @param yn true if this item should show its selected status
- */
-
-void
-TimeAxisViewItem::set_should_show_selection (bool yn)
-{
-       if (should_show_selection != yn) {
-               should_show_selection = yn;
-               set_frame_color ();
-       }
-}
-
 /** @return the TimeAxisView that this item is on */
 TimeAxisView&
 TimeAxisViewItem::get_time_axis_view () const
@@ -496,7 +508,7 @@ TimeAxisViewItem::set_name_text(const string& new_name)
        }
 
        last_item_width = trackview.editor().frame_to_pixel(item_duration);
-       name_pixbuf_width = pixel_width (new_name, *NAME_FONT) + 2;
+       name_pixbuf_width = pixel_width (new_name, NAME_FONT) + 2;
        name_pixbuf->property_pixbuf() = pixbuf_from_string(new_name, NAME_FONT, name_pixbuf_width, NAME_HEIGHT, Gdk::Color ("#000000"));
 }
 
@@ -547,6 +559,7 @@ TimeAxisViewItem::set_height (double height)
        vestigial_frame->property_y2() = height - 1;
 
        update_name_pixbuf_visibility ();
+       set_colors ();
 }
 
 void
@@ -694,23 +707,61 @@ TimeAxisViewItem::set_colors()
 void
 TimeAxisViewItem::set_frame_color()
 {
+        uint32_t f = 0;
+
        if (!frame) {
                return;
        }
-       
-       if (_selected && should_show_selection) {
-               frame->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_SelectedFrameBase.get();
+
+       if (_selected) {
+
+                f = ARDOUR_UI::config()->canvasvar_SelectedFrameBase.get();
+
+               if (fill_opacity) {
+                        f = UINT_RGBA_CHANGE_A (f, fill_opacity);
+               }
+
+                if (!rect_visible) {
+                        f = UINT_RGBA_CHANGE_A (f, 0);
+                }
+
        } else {
+
                if (_recregion) {
-                       frame->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_RecordingRect.get();
+                       f = ARDOUR_UI::config()->canvasvar_RecordingRect.get();
                } else {
-                       if (fill_opacity) {
-                               frame->property_fill_color_rgba() = UINT_RGBA_CHANGE_A (ARDOUR_UI::config()->canvasvar_FrameBase.get(), fill_opacity);
+
+                       if (high_enough_for_name && !Config->get_color_regions_using_track_color()) {
+                               f = ARDOUR_UI::config()->canvasvar_FrameBase.get();
                        } else {
-                               frame->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_FrameBase.get();
+                               f = fill_color;
                        }
-               }
+
+                       if (fill_opacity) {
+                               f = UINT_RGBA_CHANGE_A (f, fill_opacity);
+                       }
+
+                        if (!rect_visible) {
+                                f = UINT_RGBA_CHANGE_A (f, 0);
+                        }
+                }
        }
+
+        frame->property_fill_color_rgba() = f;
+
+        if (!_recregion) {
+                if (_selected) {
+                        f = ARDOUR_UI::config()->canvasvar_SelectedTimeAxisFrame.get();
+                } else {
+                        f = ARDOUR_UI::config()->canvasvar_TimeAxisFrame.get();
+                }
+
+                if (!rect_visible) {
+                        f = UINT_RGBA_CHANGE_A (f, 64);
+                }
+
+                frame->property_outline_color_rgba() = f;
+        }
 }
 
 /**
@@ -800,7 +851,7 @@ TimeAxisViewItem::reset_width_dependent_items (double pixel_width)
                                }
                                high_enough_for_name = true;
                        }
-                        
+
                        name_highlight->property_x2() = pixel_width;
                }
 
@@ -819,6 +870,8 @@ TimeAxisViewItem::reset_width_dependent_items (double pixel_width)
                        frame_handle_end->show();
                        frame_handle_end->property_x2() = pixel_width;
                }
+
+               wide_enough_for_name = true;
        }
 
         update_name_pixbuf_visibility ();
@@ -843,16 +896,16 @@ TimeAxisViewItem::reset_name_width (double /*pixel_width*/)
 
        if (pixbuf_holds_full_name && (it_width >= pb_width + NAME_X_OFFSET)) {
                /*
-                 we've previously had the full name length showing 
+                 we've previously had the full name length showing
                  and its still showing.
                */
                return;
        }
-       
+
        if (pb_width > it_width - NAME_X_OFFSET) {
                pb_width = it_width - NAME_X_OFFSET;
        }
-       
+
        if (it_width <= NAME_X_OFFSET) {
                wide_enough_for_name = false;
        } else {
@@ -897,7 +950,7 @@ TimeAxisViewItem::update_name_pixbuf_visibility ()
        if (!name_pixbuf) {
                return;
        }
-       
+
        if (wide_enough_for_name && high_enough_for_name) {
                name_pixbuf->show ();
        } else {
@@ -905,3 +958,10 @@ TimeAxisViewItem::update_name_pixbuf_visibility ()
        }
 }
 
+void
+TimeAxisViewItem::parameter_changed (string p)
+{
+       if (p == "color-regions-using-track-color") {
+               set_frame_color ();
+       }
+}