projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
switch to using boost::signals2 instead of sigc++, at least for libardour. not finish...
[ardour.git]
/
gtk2_ardour
/
marker.h
diff --git
a/gtk2_ardour/marker.h
b/gtk2_ardour/marker.h
index 1a53726ede0992833ce38f438a06b335b2dcd0b2..3802348567c7c8b78860fd180ed2c8b229062249 100644
(file)
--- a/
gtk2_ardour/marker.h
+++ b/
gtk2_ardour/marker.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2001 Paul Davis
+ Copyright (C) 2001 Paul Davis
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-22,8
+22,11
@@
#include <string>
#include <glib.h>
#include <string>
#include <glib.h>
-#include <ardour/ardour.h>
-#include <pbd/destructible.h>
+
+#include <libgnomecanvasmm/pixbuf.h>
+
+#include "ardour/ardour.h"
+#include "pbd/destructible.h"
#include "canvas.h"
#include "canvas.h"
@@
-50,7
+53,7
@@
class Marker : public PBD::Destructible
};
};
- Marker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const st
ring& text, Type,
+ Marker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const st
d::string& text, Type,
nframes_t frame = 0, bool handle_events = true);
virtual ~Marker ();
nframes_t frame = 0, bool handle_events = true);
virtual ~Marker ();
@@
-62,15
+65,15
@@
class Marker : public PBD::Destructible
void hide_line ();
void set_line_vpos (double y_origin, double height);
void hide_line ();
void set_line_vpos (double y_origin, double height);
- void set_position (nframes_t);
- void set_name (const string&);
+ void set_position (nframes
64
_t);
+ void set_name (const st
d::st
ring&);
void set_color_rgba (uint32_t rgba);
void set_color_rgba (uint32_t rgba);
-
+
nframes64_t position() const { return frame_position; }
ArdourCanvas::Group * get_parent() { return _parent; }
void reparent (ArdourCanvas::Group & parent);
nframes64_t position() const { return frame_position; }
ArdourCanvas::Group * get_parent() { return _parent; }
void reparent (ArdourCanvas::Group & parent);
-
+
void hide ();
void show ();
void hide ();
void show ();
@@
-79,10
+82,12
@@
class Marker : public PBD::Destructible
protected:
PublicEditor& editor;
protected:
PublicEditor& editor;
+ Pango::FontDescription* name_font;
+
ArdourCanvas::Group * _parent;
ArdourCanvas::Group *group;
ArdourCanvas::Polygon *mark;
ArdourCanvas::Group * _parent;
ArdourCanvas::Group *group;
ArdourCanvas::Polygon *mark;
- ArdourCanvas::
Text *text
;
+ ArdourCanvas::
Pixbuf *name_pixbuf
;
ArdourCanvas::Points *points;
ArdourCanvas::SimpleLine *line;
ArdourCanvas::Points *line_points;
ArdourCanvas::Points *points;
ArdourCanvas::SimpleLine *line;
ArdourCanvas::Points *line_points;
@@
-90,15
+95,16
@@
class Marker : public PBD::Destructible
double unit_position;
nframes64_t frame_position;
unsigned char shift; /* should be double, but its always small and integral */
double unit_position;
nframes64_t frame_position;
unsigned char shift; /* should be double, but its always small and integral */
- Type _type;
-
+ Type _type;
+ int name_height;
+
void reposition ();
};
class TempoMarker : public Marker
{
public:
void reposition ();
};
class TempoMarker : public Marker
{
public:
- TempoMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const string& text, ARDOUR::TempoSection&);
+ TempoMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const st
d::st
ring& text, ARDOUR::TempoSection&);
~TempoMarker ();
ARDOUR::TempoSection& tempo() const { return _tempo; }
~TempoMarker ();
ARDOUR::TempoSection& tempo() const { return _tempo; }
@@
-110,7
+116,7
@@
class TempoMarker : public Marker
class MeterMarker : public Marker
{
public:
class MeterMarker : public Marker
{
public:
- MeterMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const string& text, ARDOUR::MeterSection&);
+ MeterMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const st
d::st
ring& text, ARDOUR::MeterSection&);
~MeterMarker ();
ARDOUR::MeterSection& meter() const { return _meter; }
~MeterMarker ();
ARDOUR::MeterSection& meter() const { return _meter; }