projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added file
[ardour.git]
/
gtk2_ardour
/
marker_time_axis.h
diff --git
a/gtk2_ardour/marker_time_axis.h
b/gtk2_ardour/marker_time_axis.h
index a46025cd19256f10ffcd5dc67ea36f9f0e4ccf82..a48eec7d5ac40901b39f89284dfb5dd5670af551 100644
(file)
--- a/
gtk2_ardour/marker_time_axis.h
+++ b/
gtk2_ardour/marker_time_axis.h
@@
-21,14
+21,15
@@
#ifndef __ardour_marker_time_axis_h__
#define __ardour_marker_time_axis_h__
#ifndef __ardour_marker_time_axis_h__
#define __ardour_marker_time_axis_h__
-#include <gtk--.h>
-#include <gtk-canvas.h>
+#include <string>
+#include <gtkmm.h>
+#include <libgnomecanvas/libgnomecanvas.h>
#include "ardour_dialog.h"
#include "route_ui.h"
#include "enums.h"
#include "time_axis_view.h"
#include "ardour_dialog.h"
#include "route_ui.h"
#include "enums.h"
#include "time_axis_view.h"
-#include
<string>
+#include
"canvas.h"
#include "visual_time_axis.h"
namespace ARDOUR {
#include "visual_time_axis.h"
namespace ARDOUR {
@@
-63,7
+64,7
@@
class MarkerTimeAxis : public VisualTimeAxis
* @param name the name/id of this time axis
* @param tav the associated track view that this MarkerTimeAxis is marking up
*/
* @param name the name/id of this time axis
* @param tav the associated track view that this MarkerTimeAxis is marking up
*/
- MarkerTimeAxis(PublicEditor& ed, ARDOUR::Session& sess,
Gtk::Widget*
canvas, std::string name, TimeAxisView* tav) ;
+ MarkerTimeAxis(PublicEditor& ed, ARDOUR::Session& sess,
ArdourCanvas::Canvas&
canvas, std::string name, TimeAxisView* tav) ;
/**
* Destructor
/**
* Destructor
@@
-120,13
+121,6
@@
class MarkerTimeAxis : public VisualTimeAxis
TimeAxisView* get_marked_time_axis() ;
TimeAxisView* get_marked_time_axis() ;
- protected:
-
- /**
- * Handle the closing of the renaming dialog during the rename of this item
- */
- virtual void finish_route_rename() ;
-
private:
/**
private:
/**