projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make Bundles work a bit better. A few include optimisations.
[ardour.git]
/
gtk2_ardour
/
imageframe_view.h
diff --git
a/gtk2_ardour/imageframe_view.h
b/gtk2_ardour/imageframe_view.h
index 6a6aa3d33ac7b7928d5ad23d124b21c6b3483b4e..db83264e46764061a3efbc383f3da05cb2780713 100644
(file)
--- a/
gtk2_ardour/imageframe_view.h
+++ b/
gtk2_ardour/imageframe_view.h
@@
-15,18
+15,18
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
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__
#define __gtk_ardour_imageframe_view_h__
#include <string>
*/
#ifndef __gtk_ardour_imageframe_view_h__
#define __gtk_ardour_imageframe_view_h__
#include <string>
-#include <g
tk--
.h>
-#include <
gtk-
canvas.h>
-#include <sigc++/signal
_system
.h>
+#include <g
dkmm/color
.h>
+#include <
libgnomecanvas/libgnome
canvas.h>
+#include <sigc++/signal.h>
#include <list>
#include <list>
+#include "canvas.h"
#include "enums.h"
#include "time_axis_view_item.h"
#include "marker_view.h"
#include "enums.h"
#include "time_axis_view_item.h"
#include "marker_view.h"
@@
-59,14
+59,14
@@
class ImageFrameView : public TimeAxisViewItem
* @param height the width of the origianl rgb_data image data
* @param num_channels the number of color channels within rgb_data
*/
* @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,
-
GtkCanvas
Group *parent,
+ ImageFrameView(
const std::string &
item_id,
+
ArdourCanvas::
Group *parent,
ImageFrameTimeAxis *tv,
ImageFrameTimeAxisGroup* group,
double spu,
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,
unsigned char* rgb_data,
uint32_t width,
uint32_t height,
@@
-78,7
+78,7
@@
class ImageFrameView : public TimeAxisViewItem
*/
~ImageFrameView() ;
*/
~ImageFrameView() ;
- static
SigC::Signal1
<void,ImageFrameView*> GoingAway;
+ static
sigc::signal
<void,ImageFrameView*> GoingAway;
//---------------------------------------------------------------------------------------//
// Position and duration Accessors/Mutators
//---------------------------------------------------------------------------------------//
// Position and duration Accessors/Mutators
@@
-90,7
+90,7
@@
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
*/
* @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
/**
* Sets the duration of this item
@@
-99,7
+99,7
@@
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
*/
* @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
//---------------------------------------------------------------------------------------//
// Parent Component Methods
@@
-149,7
+149,7
@@
class ImageFrameView : public TimeAxisViewItem
* @param src the identity of the object that initiated the change
* @return the removed marker item
*/
* @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
/**
* Removes item from the list of marker views assocaited with this item
@@
-166,17
+166,17
@@
class ImageFrameView : public TimeAxisViewItem
*
* @param markId the id/name of the item to search for
*/
*
* @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 */
//---------------------------------------------------------------------------------//
// 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 */
/** 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 */
private:
/** the list of MarkerViews associated with this item */
@@
-205,7
+205,7
@@
class ImageFrameView : public TimeAxisViewItem
// ------- Our canvas element -----------
/** the CanvasImageFrame to display the image */
// ------- Our canvas element -----------
/** the CanvasImageFrame to display the image */
-
GtkCanvasItem
* imageframe ;
+
ArdourCanvas::ImageFrame
* imageframe ;
} ; /* class ImageFrameView */
} ; /* class ImageFrameView */