X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fimageframe_view.cc;h=ac17a7cc1a2bf8d13b1b0739c053289450d5406e;hb=0a24970b4eeb84a3313755266872b1981c708d95;hp=4870c53849c4e9f940cbaa03ddfeaf4bd0ad48e0;hpb=183f69970c6c436b102f8b2fbe1bc6070c9e9bfe;p=ardour.git

diff --git a/gtk2_ardour/imageframe_view.cc b/gtk2_ardour/imageframe_view.cc
index 4870c53849..ac17a7cc1a 100644
--- a/gtk2_ardour/imageframe_view.cc
+++ b/gtk2_ardour/imageframe_view.cc
@@ -31,11 +31,13 @@
 #include "public_editor.h"
 #include "utils.h"
 #include "imageframe_view.h"
-#include "canvas-imageframe.h"
+#include "imageframe.h"
+#include "canvas_impl.h"
 #include "gui_thread.h"
 
 using namespace sigc ;
 using namespace ARDOUR ;
+using namespace Gtk;
 
 sigc::signal<void,ImageFrameView*> ImageFrameView::GoingAway;
 
@@ -54,8 +56,8 @@ sigc::signal<void,ImageFrameView*> ImageFrameView::GoingAway;
  * @param height the width of the origianl rgb_data image data
  * @param num_channels the number of color channels within rgb_data
  */
-ImageFrameView::ImageFrameView(std::string item_id,
-	Gnome::Canvas::Group *parent,
+ImageFrameView::ImageFrameView(const string & item_id,
+	ArdourCanvas::Group *parent,
 	ImageFrameTimeAxis* tv,
 	ImageFrameTimeAxisGroup* item_group,
 	double spu,
@@ -66,7 +68,7 @@ ImageFrameView::ImageFrameView(std::string item_id,
 	uint32_t width,
 	uint32_t height,
 	uint32_t num_channels)
-  : TimeAxisViewItem(item_id, parent, *tv, spu, basic_color, start, duration,
+  : TimeAxisViewItem(item_id, *parent, *tv, spu, basic_color, start, duration,
 		     TimeAxisViewItem::Visibility (TimeAxisViewItem::ShowNameText|
 						   TimeAxisViewItem::ShowNameHighlight|
 						   TimeAxisViewItem::ShowFrame|
@@ -90,32 +92,14 @@ ImageFrameView::ImageFrameView(std::string item_id,
 	
 	//calculate our image width based on the track height
 	double im_ratio = (double)width/(double)height ;
-	int im_width = (int)((double)(trackview.height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE) * im_ratio) ;
-	
-	imageframe = gnome_canvas_item_new(GNOME_CANVAS_GROUP(group),
-		gnome_canvas_imageframe_get_type(),
-		"pixbuf", pbuf,
-		"x", (gdouble) 1.0,
-		"y", (gdouble) 1.0,
-		"anchor", GTK_ANCHOR_NW,
-		"width", (gdouble) im_width,
-		"height", (gdouble) (trackview.height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE),
-		NULL) ;
-
-
-	gtk_signal_connect (GTK_OBJECT(frame_handle_start), "event",
-						(GtkSignalFunc) PublicEditor::canvas_imageframe_start_handle_event,
-						this);
-	
-	gtk_signal_connect (GTK_OBJECT(frame_handle_end), "event",
-						(GtkSignalFunc) PublicEditor::canvas_imageframe_end_handle_event,
-						this);
-						
-	gtk_signal_connect (GTK_OBJECT(group), "event",
-		(GtkSignalFunc) PublicEditor::canvas_imageframe_item_view_event, this); 
-
-	/* handle any specific details required by the initial start end duration values */
+	double im_width = ((double)(trackview.height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE) * im_ratio) ;
 	
+	imageframe = new ImageFrame (*group, pbuf, 1.0, 1.0, ANCHOR_NW, im_width, (trackview.height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE));
+
+	frame_handle_start->signal_event().connect (bind (mem_fun (trackview.editor, &PublicEditor::canvas_imageframe_start_handle_event), frame_handle_start, this));
+	frame_handle_end->signal_event().connect (bind (mem_fun (trackview.editor, &PublicEditor::canvas_imageframe_end_handle_event), frame_handle_end, this));
+	group->signal_event().connect (bind (mem_fun (trackview.editor, &PublicEditor::canvas_imageframe_item_view_event), imageframe, this));
+
 	frame_handle_start->raise_to_top();
 	frame_handle_end->raise_to_top();
 	
@@ -171,7 +155,7 @@ ImageFrameView::~ImageFrameView()
 
 	if(imageframe)
 	{
-		gtk_object_destroy(GTK_OBJECT(imageframe)) ;
+delete imageframe;
 		imageframe = 0 ;
 	}
 }
@@ -188,16 +172,15 @@ ImageFrameView::~ImageFrameView()
  * @return true if the position change was a success, false otherwise
  */
 bool
-ImageFrameView::set_position(jack_nframes_t pos, void* src)
+ImageFrameView::set_position(jack_nframes_t pos, void* src, double* delta)
 {
 	jack_nframes_t old_pos = frame_position ;
 	
 	// do the standard stuff
-	bool ret = TimeAxisViewItem::set_position(pos, src) ;
+	bool ret = TimeAxisViewItem::set_position(pos, src, delta) ;
 
 	// everything went ok with the standard stuff?
-	if(ret)
-	{
+ 	if (ret) {
 		/* move each of our associated markers with this ImageFrameView */
 		for (MarkerViewList::iterator i = marker_view_list.begin(); i != marker_view_list.end(); ++i)
 		{
@@ -229,7 +212,7 @@ ImageFrameView::set_duration(jack_nframes_t dur, void* src)
 	if(ret)
 	{
 		/* handle setting the sizes of our canvas itesm based on the new duration */
-		gnome_canvas_item_set(imageframe, "drawwidth", (gdouble) trackview.editor.frame_to_pixel(get_duration()), NULL) ;
+		imageframe->property_drawwidth() = trackview.editor.frame_to_pixel(get_duration());
 	}
 	
 	return(ret) ;
@@ -276,23 +259,22 @@ ImageFrameView::set_height (gdouble h)
 	// set the image size
 	// @todo might have to re-get the image data, for a large height...hmmm.
 	double im_ratio = (double)image_data_width/(double)image_data_height ;
-	int im_width = (int)((double)(h - TimeAxisViewItem::NAME_Y_OFFSET) * im_ratio) ;
-	gnome_canvas_item_set(imageframe, "width", (gdouble)im_width, NULL) ;
-	gnome_canvas_item_set(imageframe, "height",(gdouble) (h - TimeAxisViewItem::NAME_Y_OFFSET), NULL) ;
+
+	imageframe->property_width() = (h - TimeAxisViewItem::NAME_Y_OFFSET) * im_ratio;
+	imageframe->property_height() = h - TimeAxisViewItem::NAME_Y_OFFSET;
 
 	frame->raise_to_top();
-	gnome_canvas_item_raise_to_top(imageframe) ;
-	//imageframe->raise_to_top();
+	imageframe->raise_to_top();
 	name_highlight->raise_to_top();
 	name_text->raise_to_top();
 	frame_handle_start->raise_to_top();
 	frame_handle_end->raise_to_top();
  
-	name_text->set_property ("y", h - TimeAxisViewItem::NAME_Y_OFFSET);
-	frame->set_property ("y2", h);
+	name_text->property_y() = h - TimeAxisViewItem::NAME_Y_OFFSET;
+	frame->property_y2() = h;
 
-	name_highlight->set_property ("y1", (gdouble) h - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE);
-	name_highlight->set_property ("y2", (gdouble) h - 1.0);
+	name_highlight->property_y1() = (gdouble) h - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE;
+	name_highlight->property_y2() = (gdouble) h - 1.0;
 }
 
 
@@ -324,7 +306,7 @@ ImageFrameView::add_marker_view_item(MarkerView* item, void* src)
  * @return the removed marker item
  */
 MarkerView*
-ImageFrameView::remove_named_marker_view_item(std::string markerId, void* src)
+ImageFrameView::remove_named_marker_view_item(const string & markerId, void* src)
 {
 	MarkerView* mv = 0 ;
 	MarkerViewList::iterator i = marker_view_list.begin() ;
@@ -376,11 +358,11 @@ ImageFrameView::remove_marker_view_item(MarkerView* mv, void* src)
  * @param markId the id/name of the item to search for
  */
 bool
-ImageFrameView::has_marker_view_item(std::string mname)
+ImageFrameView::has_marker_view_item(const string & mname)
 {
 	bool result = false ;
 	
-	for (MarkerViewList::iterator ci = marker_view_list.begin(); ci != marker_view_list.end(); ++ci)
+	for (MarkerViewList::const_iterator ci = marker_view_list.begin(); ci != marker_view_list.end(); ++ci)
 	{
 		if (((MarkerView*)*ci)->get_item_name() == mname)
 		{