projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove references to connection manager from the build.
[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 56f8fc809d9f29594a5b2af7b412d7ca97ab97b1..56856d3bd30bf4a43bce59c77c707ca621afe667 100644
(file)
--- a/
gtk2_ardour/marker_time_axis.h
+++ b/
gtk2_ardour/marker_time_axis.h
@@
-15,25
+15,27
@@
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 __ardour_marker_time_axis_h__
#define __ardour_marker_time_axis_h__
*/
#ifndef __ardour_marker_time_axis_h__
#define __ardour_marker_time_axis_h__
-#include <
gtkmm.h
>
-#include <
gtk-
canvas.h>
+#include <
string
>
+#include <
libgnomecanvas/libgnome
canvas.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 {
class Session;
}
#include "visual_time_axis.h"
namespace ARDOUR {
class Session;
}
+namespace ARDOUR {
+ class Menu;
+}
class PublicEditor;
class ImageFrameView ;
class PublicEditor;
class ImageFrameView ;
@@
-63,7
+65,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, const string &
name, TimeAxisView* tav) ;
/**
* Destructor
/**
* Destructor
@@
-78,9
+80,9
@@
class MarkerTimeAxis : public VisualTimeAxis
/**
* Sets the height of this TrackView to one of the defined TrackHeights
*
/**
* Sets the height of this TrackView to one of the defined TrackHeights
*
- * @param h the
TrackHeight value to set
+ * @param h the
number of pixels to set the height to
*/
*/
- virtual void set_height(
TimeAxisView::TrackHeigh
t h) ;
+ virtual void set_height(
uint32_
t h) ;
/**
* Sets the number of samples per unit that are used.
/**
* Sets the number of samples per unit that are used.
@@
-120,13
+122,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:
/**