projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix some capitalisation in the preferences dialog.
[ardour.git]
/
gtk2_ardour
/
marker.h
diff --git
a/gtk2_ardour/marker.h
b/gtk2_ardour/marker.h
index 6bf6d08f5132a6bb697ff36bbf4bba073e51fb18..b3a85294ea20e4cf56a4e5223ca1d9d36561d2c8 100644
(file)
--- a/
gtk2_ardour/marker.h
+++ b/
gtk2_ardour/marker.h
@@
-23,13
+23,13
@@
#include <string>
#include <glib.h>
#include <string>
#include <glib.h>
-#include <libgnomecanvasmm/pixbuf.h>
#include <sigc++/signal.h>
#include "ardour/ardour.h"
#include "pbd/signals.h"
#include <sigc++/signal.h>
#include "ardour/ardour.h"
#include "pbd/signals.h"
-#include "canvas.h"
+#include "canvas/fwd.h"
+#include "canvas/types.h"
namespace ARDOUR {
class TempoSection;
namespace ARDOUR {
class TempoSection;
@@
-101,11
+101,11
@@
class Marker : public sigc::trackable
ArdourCanvas::Group* _parent;
ArdourCanvas::Group *group;
ArdourCanvas::Polygon *mark;
ArdourCanvas::Group* _parent;
ArdourCanvas::Group *group;
ArdourCanvas::Polygon *mark;
-
ArdourCanvas::Pixbuf *name_pixbuf
;
+
ArdourCanvas::Text *_name_item
;
ArdourCanvas::Points *points;
ArdourCanvas::Points *points;
- ArdourCanvas::
SimpleLine*
_line;
- ArdourCanvas::
Points *line_points
;
- ArdourCanvas::
SimpleRect
* _name_background;
+ ArdourCanvas::
Line* _time_bars
_line;
+ ArdourCanvas::
Line* _track_canvas_line
;
+ ArdourCanvas::
Rectangle
* _name_background;
std::string _name;
double unit_position;
std::string _name;
double unit_position;