#define __gtk_ardour_imageframe_view_h__
#include <string>
-#include <gtk--.h>
-#include <gtk-canvas.h>
-#include <sigc++/signal_system.h>
+#include <gdkmm/color.h>
+#include <libgnomecanvas/libgnomecanvas.h>
+#include <sigc++/signal.h>
#include <list>
+#include "canvas.h"
#include "enums.h"
#include "time_axis_view_item.h"
#include "marker_view.h"
* @param height the width of the origianl rgb_data image data
* @param num_channels the number of color channels within rgb_data
*/
- ImageFrameView(std::string item_id,
- GtkCanvasGroup *parent,
+ ImageFrameView(const std::string & item_id,
+ ArdourCanvas::Group *parent,
ImageFrameTimeAxis *tv,
ImageFrameTimeAxisGroup* group,
double spu,
- GdkColor& base_color,
- jack_nframes_t start,
- jack_nframes_t duration,
+ Gdk::Color& base_color,
+ nframes_t start,
+ nframes_t duration,
unsigned char* rgb_data,
uint32_t width,
uint32_t height,
*/
~ImageFrameView() ;
- static SigC::Signal1<void,ImageFrameView*> GoingAway;
+ static sigc::signal<void,ImageFrameView*> GoingAway;
//---------------------------------------------------------------------------------------//
// Position and duration Accessors/Mutators
* @param src the identity of the object that initiated the change
* @return true if the position change was a success, false otherwise
*/
- virtual bool set_position(jack_nframes_t pos, void* src) ;
+ virtual bool set_position(nframes_t pos, void* src, double* delta = 0) ;
/**
* Sets the duration of this item
* @param src the identity of the object that initiated the change
* @return true if the duration change was succesful, false otherwise
*/
- virtual bool set_duration(jack_nframes_t dur, void* src) ;
+ virtual bool set_duration(nframes_t dur, void* src) ;
//---------------------------------------------------------------------------------------//
// Parent Component Methods
* @param src the identity of the object that initiated the change
* @return the removed marker item
*/
- MarkerView* remove_named_marker_view_item(std::string markId, void* src) ;
+ MarkerView* remove_named_marker_view_item(const std::string & markId, void* src) ;
/**
* Removes item from the list of marker views assocaited with this item
*
* @param markId the id/name of the item to search for
*/
- bool has_marker_view_item(std::string markId) ;
+ bool has_marker_view_item(const std::string & markId) ;
//---------------------------------------------------------------------------------//
// Emitted Signals
/** Emitted when a marker Item is added to this Item */
- SigC::Signal2<void,MarkerView*,void*> MarkerViewAdded ;
+ sigc::signal<void,MarkerView*,void*> MarkerViewAdded ;
/** Emitted when a Marker Item is added to this Item */
- SigC::Signal2<void,MarkerView*,void*> MarkerViewRemoved ;
+ sigc::signal<void,MarkerView*,void*> MarkerViewRemoved ;
private:
/** the list of MarkerViews associated with this item */
// ------- Our canvas element -----------
/** the CanvasImageFrame to display the image */
- GtkCanvasItem* imageframe ;
+ ArdourCanvas::ImageFrame* imageframe ;
} ; /* class ImageFrameView */