projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mute sends+inserts when a route is not soloed but others are
[ardour.git]
/
gtk2_ardour
/
imageframe_time_axis_view.h
diff --git
a/gtk2_ardour/imageframe_time_axis_view.h
b/gtk2_ardour/imageframe_time_axis_view.h
index f6215236f18f492332010a20f7c154fbc1e31789..d51901d4e08ee4358702f4daa0ea7eb5b3e40e30 100644
(file)
--- a/
gtk2_ardour/imageframe_time_axis_view.h
+++ b/
gtk2_ardour/imageframe_time_axis_view.h
@@
-24,10
+24,15
@@
#include <list>
#include <cmath>
#include <list>
#include <cmath>
-#include <g
tkmm
.h>
-#include <libgnomecanvas/libgnomecanvas.h>
+#include <g
dkmm/color
.h>
+
#include <jack/jack.h>
#include <jack/jack.h>
+#include <libgnomecanvasmm.h>
+#include "canvas.h"
+#include "simplerect.h"
+
+
class PublicEditor ;
class ImageFrameTimeAxis ;
class ImageFrameView ;
class PublicEditor ;
class ImageFrameTimeAxis ;
class ImageFrameView ;
@@
-71,7
+76,7
@@
class ImageFrameTimeAxisView : public sigc::trackable
/**
*
*/
/**
*
*/
-
GnomeCanvasItem* canvas_item() { return
canvas_group; }
+
ArdourCanvas::Group * canvas_item() { return &
canvas_group; }
//---------------------------------------------------------------------------------------//
//---------------------------------------------------------------------------------------//
@@
-256,8
+261,8
@@
class ImageFrameTimeAxisView : public sigc::trackable
/* the TimeAxisView that this object is acting as the view helper for */
ImageFrameTimeAxis& _trackview ;
/* the TimeAxisView that this object is acting as the view helper for */
ImageFrameTimeAxis& _trackview ;
-
GnomeCanvasItem *
canvas_group ;
-
GnomeCanvasItem *
canvas_rect; /* frame around the whole thing */
+
ArdourCanvas::Group
canvas_group ;
+
ArdourCanvas::SimpleRect
canvas_rect; /* frame around the whole thing */
/** the current samples per unit */
double _samples_per_unit ;
/** the current samples per unit */
double _samples_per_unit ;