Mostly Cosmetic/Design changes to bring trunk and midi branch closer

[ardour.git] / gtk2_ardour / imageframe_time_axis_group.h

diff --git a/gtk2_ardour/imageframe_time_axis_group.h b/gtk2_ardour/imageframe_time_axis_group.h
index 2eaeb0b66a9fb0d8e1675ed32f0c371aa0943643..1cd62d73f5de022f272e35f1c0a16a36413d1897 100644 (file)
--- a/gtk2_ardour/imageframe_time_axis_group.h
+++ b/gtk2_ardour/imageframe_time_axis_group.h
@@ -24,9 +24,11 @@
 #include <list>
 #include <cmath>
 
-#include <gtkmm.h>
-#include <gtk-canvas.h>
+#include <gdkmm/color.h>
+
+#include <libgnomecanvas/libgnomecanvas.h>
 #include <jack/jack.h>
+#include <ardour/types.h>
 #include "imageframe_time_axis_view.h"
 
 class PublicEditor ;
@@ -52,7 +54,7 @@ class ImageFrameTimeAxisGroup : public sigc::trackable
                 * @param iftav the parent ImageFrameTimeAxis of this view helper
                 * @param group_id the unique name/id of this group
                 */
-               ImageFrameTimeAxisGroup(ImageFrameTimeAxisView& iftav, std::string group_id) ;
+               ImageFrameTimeAxisGroup(ImageFrameTimeAxisView& iftav, const string & group_id) ;
                
                /**
                 * Destructor
@@ -71,7 +73,7 @@ class ImageFrameTimeAxisGroup : public sigc::trackable
                 * @param new_name the new name of this group
                 * @param src the identity of the object that initiated the change
                 */
-               void set_group_name(std::string new_name, void* src) ;
+               void set_group_name(const string & new_name, void* src) ;
 
                /**
                 * Returns the id of this group
@@ -117,7 +119,7 @@ class ImageFrameTimeAxisGroup : public sigc::trackable
                 *
                 * @param color the new base color
                 */
-               void apply_item_color(GdkColor&) ;
+               void apply_item_color(Gdk::Color&) ;
                
                
                //---------------------------------------------------------------------------------------//
@@ -137,7 +139,7 @@ class ImageFrameTimeAxisGroup : public sigc::trackable
                 * @param num_channels the number of channles within the rgb_data
                 * @param src the identity of the object that initiated the change
                 */
-               ImageFrameView* add_imageframe_item(std::string item_id, jack_nframes_t start, jack_nframes_t duration, unsigned char* rgb_data, uint32_t width, uint32_t height, uint32_t num_channels, void* src) ;
+               ImageFrameView* add_imageframe_item(const string & item_id, jack_nframes_t start, jack_nframes_t duration, unsigned char* rgb_data, uint32_t width, uint32_t height, uint32_t num_channels, void* src) ;
                
                /**
                 * Returns the named ImageFrameView or 0 if the named view does not exist on this view helper
@@ -145,7 +147,7 @@ class ImageFrameTimeAxisGroup : public sigc::trackable
                 * @param item_id the unique id of the item to search for
                 * @return the named ImageFrameView, or 0 if it is not held upon this view
                 */
-               ImageFrameView* get_named_imageframe_item(std::string item_id) ;
+               ImageFrameView* get_named_imageframe_item(const string & item_id) ;
                
                /**
                 * Removes the currently selected ImageFrameView
@@ -162,7 +164,7 @@ class ImageFrameTimeAxisGroup : public sigc::trackable
                 * @param src the identity of the object that initiated the change
                 * @see add_imageframe_view
                 */
-               ImageFrameView* remove_named_imageframe_item(std::string item_id, void* src) ;
+               ImageFrameView* remove_named_imageframe_item(const string & item_id, void* src) ;
                
                /**
                 * Removes ifv from the list of ImageFrameViews upon this TimeAxis.
@@ -252,7 +254,7 @@ class ImageFrameTimeAxisGroup : public sigc::trackable
                sigc::signal<void, ImageFrameView*, void*> ImageFrameAdded ;
                
                /** Emitted when an ImageFrameView is removed from this group */
-               sigc::signal<void, std::string&, std::string&, std::string&, void*> ImageFrameRemoved ;
+               sigc::signal<void, const string &, const string &, const string &, void*> ImageFrameRemoved ;
                
        protected:
 
@@ -288,7 +290,7 @@ class ImageFrameTimeAxisGroup : public sigc::trackable
                std::string _group_id ;
                
                /* XXX why are these different? */
-               GdkColor region_color ;
+               Gdk::Color region_color ;
                uint32_t stream_base_color ;
                
                /** indicates if this group is currently selected */