X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fimageframe_time_axis.cc;h=735855421fd347c0c6de3569741efbe992725228;hb=3705a2d6307cf443acbf8419b0e0f560591f2016;hp=5fe195c0430351eb52404c89708410a92b8adafd;hpb=183f69970c6c436b102f8b2fbe1bc6070c9e9bfe;p=ardour.git

diff --git a/gtk2_ardour/imageframe_time_axis.cc b/gtk2_ardour/imageframe_time_axis.cc
index 5fe195c043..735855421f 100644
--- a/gtk2_ardour/imageframe_time_axis.cc
+++ b/gtk2_ardour/imageframe_time_axis.cc
@@ -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$
 */
 
 #include <string>
@@ -23,6 +22,8 @@
 
 #include <pbd/error.h>
 
+#include <gtkmm/menu.h>
+
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/gtk_ui.h>
 
@@ -31,7 +32,7 @@
 
 #include "public_editor.h"
 #include "imageframe_time_axis.h"
-#include "canvas-simplerect.h"
+#include "simplerect.h"
 #include "enums.h"
 #include "imageframe_time_axis_view.h"
 #include "imageframe_time_axis_group.h"
@@ -40,12 +41,14 @@
 #include "marker_time_axis.h"
 #include "marker_view.h"
 #include "gui_thread.h"
+#include "canvas_impl.h"
 
 #include "i18n.h"
 
-using namespace ARDOUR ;
-using namespace sigc ;
-using namespace Gtk ;
+using namespace ARDOUR;
+using namespace PBD;
+using namespace sigc;
+using namespace Gtk;
 
 /**
  * Constructs a new ImageFrameTimeAxis.
@@ -55,21 +58,18 @@ using namespace Gtk ;
  * @param sess the current session
  * @param canvas the parent canvas item
  */
-ImageFrameTimeAxis::ImageFrameTimeAxis(std::string track_id, PublicEditor& ed, ARDOUR::Session& sess, Widget *canvas)
+ImageFrameTimeAxis::ImageFrameTimeAxis(const string & track_id, PublicEditor& ed, ARDOUR::Session& sess, ArdourCanvas::Canvas& canvas)
 	: AxisView(sess),
 	  VisualTimeAxis(track_id, ed, sess, canvas)
 {
 	_color = unique_random_color() ;
 	
-	//GTK2FIX -- how to get the group? is the canvas display really a group?
-	//selection_group = gnome_canvas_item_new (GNOME_CANVAS_GROUP(canvas_display), gnome_canvas_group_get_type (), NULL) ;
-	selection_group = new Gnome::Canvas::Group (GNOME_CANVAS_GROUP(canvas_display));
+	selection_group = new ArdourCanvas::Group (*canvas_display);
 	selection_group->hide();
 
 	// intialize our data items
 	_marked_for_display = true;
 	y_position = -1 ;
-	name_prompter = 0 ;
 
 	/* create our new image frame view */
 	view = new ImageFrameTimeAxisView(*this) ;
@@ -81,7 +81,7 @@ ImageFrameTimeAxis::ImageFrameTimeAxis(std::string track_id, PublicEditor& ed, A
 	label_view() ;
 		
 	// set the initial height of this time axis
-	set_height(Normal) ;
+	set_height(hNormal) ;
 }
 
 /**
@@ -107,38 +107,15 @@ ImageFrameTimeAxis::~ImageFrameTimeAxis ()
 		iter = next ;
 	}
 	
-	if(image_action_menu)
-	{
-		delete image_action_menu ;
-		image_action_menu = 0 ;
-	}
-	
-	for(list<SelectionRect*>::iterator i = free_selection_rects.begin(); i != free_selection_rects.end(); ++i)
-	{
-		gtk_object_destroy (GTK_OBJECT((*i)->rect));
-		gtk_object_destroy (GTK_OBJECT((*i)->start_trim));
-		gtk_object_destroy (GTK_OBJECT((*i)->end_trim));
-	}
-
-	for(list<SelectionRect*>::iterator i = used_selection_rects.begin(); i != used_selection_rects.end(); ++i)
-	{
-		gtk_object_destroy (GTK_OBJECT((*i)->rect));
-		gtk_object_destroy (GTK_OBJECT((*i)->start_trim));
-		gtk_object_destroy (GTK_OBJECT((*i)->end_trim));
-	}
+	delete image_action_menu ;
+	image_action_menu = 0 ;
 	
-	if (selection_group)
-	{
-		gtk_object_destroy (GTK_OBJECT (selection_group));
-		selection_group = 0 ;
-	}
+	delete selection_group;
+	selection_group = 0 ;
 	
 	// Destroy our Axis View helper
-	if(view)
-	{
-		delete view ;
-		view = 0 ;
-	}
+	delete view ;
+	view = 0 ;
 }
 
 //---------------------------------------------------------------------------------------//
@@ -147,10 +124,10 @@ ImageFrameTimeAxis::~ImageFrameTimeAxis ()
 /**
  * Sets the height of this TrackView to one of ths TrackHeghts
  *
- * @param h the TrackHeight value to set
+ * @param h 
  */
 void
-ImageFrameTimeAxis::set_height (TrackHeight h)
+ImageFrameTimeAxis::set_height (uint32_t h)
 {
 	VisualTimeAxis::set_height(h) ;
 	
@@ -244,6 +221,7 @@ void
 ImageFrameTimeAxis::build_display_menu()
 {
 	using namespace Menu_Helpers;
+	using Gtk::Menu;
 
 	/* get the size menu ready */
 
@@ -278,6 +256,7 @@ void
 ImageFrameTimeAxis::create_imageframe_menu()
 {
 	using namespace Menu_Helpers;
+	using Gtk::Menu;
 
 	imageframe_menu = manage(new Menu) ;
 	imageframe_menu->set_name ("ArdourContextMenu");
@@ -360,7 +339,7 @@ ImageFrameTimeAxis::add_marker_time_axis(MarkerTimeAxis* marker_track, void* src
  * @return the named markerTimeAxis, or 0 if the named MarkerTimeAxis is not associated with this ImageFrameTimeAxis
  */
 MarkerTimeAxis*
-ImageFrameTimeAxis::get_named_marker_time_axis(std::string track_id)
+ImageFrameTimeAxis::get_named_marker_time_axis(const string & track_id)
 {
 	MarkerTimeAxis* mta =  0 ;
 	
@@ -383,7 +362,7 @@ ImageFrameTimeAxis::get_named_marker_time_axis(std::string track_id)
  * @return the removed MarkerTimeAxis
  */
 MarkerTimeAxis*
-ImageFrameTimeAxis::remove_named_marker_time_axis(std::string track_id, void* src)
+ImageFrameTimeAxis::remove_named_marker_time_axis(const string & track_id, void* src)
 {
 	MarkerTimeAxis* mta = 0 ;