X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fimageframe_time_axis_group.h;h=147e6b52951efd211316e8baa348d33cef707059;hb=b034d9d05a64bf7f9f8a6465dee5441388fce6c5;hp=e258a400476d840cd420bc037ff7b1e4301d5b42;hpb=14d43ca9fe28a8309b4a52fa85e2b0c64a92248b;p=ardour.git

diff --git a/gtk2_ardour/imageframe_time_axis_group.h b/gtk2_ardour/imageframe_time_axis_group.h
index e258a40047..147e6b5295 100644
--- a/gtk2_ardour/imageframe_time_axis_group.h
+++ b/gtk2_ardour/imageframe_time_axis_group.h
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #ifndef __ardour_imageframe_time_axis_group_h__
@@ -24,9 +23,11 @@
 #include <list>
 #include <cmath>
 
-#include <gtkmm.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 +53,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 +72,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 +118,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 +138,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, nframes_t start, 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 +146,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 +163,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 +253,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 +289,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 */