#ifndef __ardour_imageframe_time_axis_h__
#define __ardour_imageframe_time_axis_h__
-#include <gtk--.h>
-#include <gtk-canvas.h>
+#include <list>
+
+//#include <libgnomecanvas.h>
#include "ardour_dialog.h"
#include "enums.h"
#include "time_axis_view.h"
-#include <list>
+#include "canvas.h"
#include "visual_time_axis.h"
namespace ARDOUR
{
class Session ;
}
+namespace Gtk {
+ class Menu;
+}
class PublicEditor ;
class ImageFrameView ;
* @param sess the current session
* @param canvas the parent canvas item
*/
- ImageFrameTimeAxis(std::string track_id, PublicEditor& ed, ARDOUR::Session& sess, Gtk::Widget *canvas) ;
+ ImageFrameTimeAxis(const string & track_id, PublicEditor& ed, ARDOUR::Session& sess, ArdourCanvas::Canvas& canvas) ;
/**
* Destructor
* @param track_id the track_id of the MarkerTimeAxis to search for
* @return the named markerTimeAxis, or 0 if the named MarkerTimeAxis is not associated with this ImageFrameTimeAxis
*/
- MarkerTimeAxis* get_named_marker_time_axis(std::string track_id) ;
+ MarkerTimeAxis* get_named_marker_time_axis(const string & track_id) ;
/**
* Removes the named markerTimeAxis from those associated with this ImageFrameTimeAxis
* @param src the identity of the object that initiated the change
* @return the removed MarkerTimeAxis
*/
- MarkerTimeAxis* remove_named_marker_time_axis(std::string track_id, void* src) ;
+ MarkerTimeAxis* remove_named_marker_time_axis(const string & track_id, void* src) ;
/**
* Removes tav from the list of MarkerTimaAxis associated with this ImageFrameTimeAxis
// Emitted Signals
/** Emitted when a Marker Time Axis is Added, or associated with, this time axis */
- SigC::Signal2<void,MarkerTimeAxis*,void*> MarkerTimeAxisAdded ;
+ sigc::signal<void,MarkerTimeAxis*,void*> MarkerTimeAxisAdded ;
/** Emitted when a Marker Time Axis is removed, from this time axis */
- SigC::Signal2<void,std::string,void*> MarkerTimeAxisRemoved ;
+ sigc::signal<void,std::string,void*> MarkerTimeAxisRemoved ;
protected: