Make Bundles work a bit better. A few include optimisations.

[ardour.git] / gtk2_ardour / marker_time_axis_view.h

diff --git a/gtk2_ardour/marker_time_axis_view.h b/gtk2_ardour/marker_time_axis_view.h
index 5d3f76ad8ec3bc06a2efdc665a5bce5c8fccf02b..fd23c1de878e1ed689ba4ab349cca91a07796a60 100644 (file)
--- a/gtk2_ardour/marker_time_axis_view.h
+++ b/gtk2_ardour/marker_time_axis_view.h
@@ -15,20 +15,18 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #ifndef __ardour_marker_time_axis_view_h__
 #define __ardour_marker_time_axis_view_h__
 
 #include <list>
-
-#include <gtkmm.h>
+#include <gdkmm/color.h>
 #include <libgnomecanvasmm/group.h>
-#include <libgnomecanvasmm/canvas.h>
 
 #include <ardour/location.h>
 #include "simplerect.h"
+#include "canvas.h"
 
 class PublicEditor;
 class MarkerTimeAxis;
@@ -75,7 +73,7 @@ class MarkerTimeAxisView : public sigc::trackable
                /**
                 *
                 */
-               Gnome::Canvas::Item *canvas_item() { return canvas_group; }
+               ArdourCanvas::Item *canvas_item() { return canvas_group; }
                
                
                //---------------------------------------------------------------------------------------//
@@ -132,7 +130,7 @@ class MarkerTimeAxisView : public sigc::trackable
                 * @param duration the duration the new item should be placed upon the timeline
                 * @param src the identity of the object that initiated the change
                 */
-               MarkerView* add_marker_view(ImageFrameView* ifv, std::string mark_type, std::string mark_id, jack_nframes_t start, jack_nframes_t dur, void* src) ;
+               MarkerView* add_marker_view(ImageFrameView* ifv, std::string mark_type, std::string mark_id, nframes_t start, nframes_t dur, void* src) ;
                
                /**
                 * Returns the named MarkerView or 0 if the named marker does not exist
@@ -226,8 +224,8 @@ class MarkerTimeAxisView : public sigc::trackable
                /* the TimeAxisView that this object is acting as the view helper for */
                MarkerTimeAxis& _trackview ;
                
-               Gnome::Canvas::Group *canvas_group ;
-               Gnome::Canvas::SimpleRect *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;