X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fimageframe_view.h;h=49b29038c4739f01ca53650c0909691a45a35254;hb=8630fd1703acb2f9a36d6db7e0d18963b461614f;hp=c59908258075e6fa223a1e6baa917eeb1f0396b4;hpb=868f557f2612903f72614a2b3a317c7a528188d1;p=ardour.git diff --git a/gtk2_ardour/imageframe_view.h b/gtk2_ardour/imageframe_view.h index c599082580..49b29038c4 100644 --- a/gtk2_ardour/imageframe_view.h +++ b/gtk2_ardour/imageframe_view.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2003 Paul Davis + Copyright (C) 2003 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -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 __gtk_ardour_imageframe_view_h__ @@ -44,7 +43,7 @@ class ImageFrameView : public TimeAxisViewItem public: //---------------------------------------------------------------------------------------// // Constructor / Desctructor - + /** * Constructs a new ImageFrameView upon the canvas * @@ -66,8 +65,8 @@ class ImageFrameView : public TimeAxisViewItem ImageFrameTimeAxisGroup* group, double spu, Gdk::Color& base_color, - jack_nframes_t start, - jack_nframes_t duration, + framepos_t start, + framecnt_t duration, unsigned char* rgb_data, uint32_t width, uint32_t height, @@ -78,12 +77,12 @@ class ImageFrameView : public TimeAxisViewItem * Reposible for removing and destroying all marker items associated with this item */ ~ImageFrameView() ; - - static sigc::signal GoingAway; - + + static PBD::Signal1 CatchDeletion; + //---------------------------------------------------------------------------------------// // Position and duration Accessors/Mutators - + /** * Set the position of this item to the specified value * @@ -91,8 +90,8 @@ class ImageFrameView : public TimeAxisViewItem * @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(framepos_t pos, void* src, double* delta = 0) ; + /** * Sets the duration of this item * @@ -100,11 +99,11 @@ class ImageFrameView : public TimeAxisViewItem * @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(framepos_t dur, void* src) ; + //---------------------------------------------------------------------------------------// // Parent Component Methods - + /** * Sets the parent ImageFrameTimeAxisGroup of thie item * each Item must be part of exactly one group (or 'scene') upon the timeline @@ -112,25 +111,25 @@ class ImageFrameView : public TimeAxisViewItem * @param group the new parent group */ void set_time_axis_group(ImageFrameTimeAxisGroup* group) ; - + /** * Returns the parent group of this item * * @return the parent group of this item */ ImageFrameTimeAxisGroup* get_time_axis_group() ; - + //---------------------------------------------------------------------------------------// // ui methods - + /** * Set the height of this item * * @param h the new height */ virtual void set_height(gdouble h) ; - - + + //---------------------------------------------------------------------------------------// // MarkerView methods @@ -141,7 +140,7 @@ class ImageFrameView : public TimeAxisViewItem * @param src the identity of the object that initiated the change */ void add_marker_view_item(MarkerView* item, void* src) ; - + /** * Removes the named marker view from the list of marker view associated with this item * The Marker view is not destroyed on removal, so the caller must handle the item themself @@ -151,7 +150,7 @@ class ImageFrameView : public TimeAxisViewItem * @return the removed marker item */ MarkerView* remove_named_marker_view_item(const std::string & markId, void* src) ; - + /** * Removes item from the list of marker views assocaited with this item * This method will do nothing if item if not assiciated with this item @@ -161,7 +160,7 @@ class ImageFrameView : public TimeAxisViewItem * @param src the identity of the object that initiated the change */ void remove_marker_view_item(MarkerView* item, void* src) ; - + /** * Determines if the named marker is one of those associated with this item * @@ -169,13 +168,13 @@ class ImageFrameView : public TimeAxisViewItem */ bool has_marker_view_item(const std::string & markId) ; - + //---------------------------------------------------------------------------------// // Emitted Signals - + /** Emitted when a marker Item is added to this Item */ sigc::signal MarkerViewAdded ; - + /** Emitted when a Marker Item is added to this Item */ sigc::signal MarkerViewRemoved ; @@ -183,31 +182,31 @@ class ImageFrameView : public TimeAxisViewItem /** the list of MarkerViews associated with this item */ typedef std::list MarkerViewList ; MarkerViewList marker_view_list ; - - + + /** The parent group that this item is a member of */ ImageFrameTimeAxisGroup* the_parent_group ; - + // ------- Image data ----------- - + /** the image data that we display */ //unsigned char* the_rgb_data ; - + /** The width of the image contained within the_rgb_data */ uint32_t image_data_width ; - + /** The height of the image contained within the_rgb_data */ uint32_t image_data_height ; - + /** the number of channels contained in the_rgb_data */ uint32_t image_data_num_channels ; - - + + // ------- Our canvas element ----------- - + /** the CanvasImageFrame to display the image */ ArdourCanvas::ImageFrame* imageframe ; - + } ; /* class ImageFrameView */ #endif /* __gtk_ardour_imageframe_view_h__ */