projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use X_() to mark binding names as non-translated
[ardour.git]
/
gtk2_ardour
/
marker.h
diff --git
a/gtk2_ardour/marker.h
b/gtk2_ardour/marker.h
index aa4888fe20e8f3d8dcd6501aeb67c578daa379f4..b769f8d1100fb630dc15319b3998cf7a1de6f892 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;
@@
-38,7
+38,7
@@
namespace ARDOUR {
class PublicEditor;
class PublicEditor;
-class Marker : public sigc::trackable
+class
Ardour
Marker : public sigc::trackable
{
public:
enum Type {
{
public:
enum Type {
@@
-56,12
+56,14
@@
class Marker : public sigc::trackable
};
};
-
Marker (PublicEditor& editor, ArdourCanvas::Group
&, guint32 rgba, const std::string& text, Type,
+
ArdourMarker (PublicEditor& editor, ArdourCanvas::Container
&, guint32 rgba, const std::string& text, Type,
framepos_t frame = 0, bool handle_events = true);
framepos_t frame = 0, bool handle_events = true);
- virtual ~Marker ();
+ virtual ~
Ardour
Marker ();
- static PBD::Signal1<void,Marker*> CatchDeletion;
+ static PBD::Signal1<void,ArdourMarker*> CatchDeletion;
+
+ static void setup_sizes (const double timebar_height);
ArdourCanvas::Item& the_item() const;
ArdourCanvas::Item& the_item() const;
@@
-76,8
+78,8
@@
class Marker : public sigc::trackable
framepos_t position() const { return frame_position; }
framepos_t position() const { return frame_position; }
- ArdourCanvas::
Group
* get_parent() { return _parent; }
- void reparent (ArdourCanvas::
Group
& parent);
+ ArdourCanvas::
Container
* get_parent() { return _parent; }
+ void reparent (ArdourCanvas::
Container
& parent);
void hide ();
void show ();
void hide ();
void show ();
@@
-92,20
+94,19
@@
class Marker : public sigc::trackable
}
bool label_on_left () const;
}
bool label_on_left () const;
-
+
protected:
PublicEditor& editor;
protected:
PublicEditor& editor;
- Pango::FontDescription
*
name_font;
+ Pango::FontDescription name_font;
- ArdourCanvas::
Group
* _parent;
- ArdourCanvas::
Group
*group;
+ ArdourCanvas::
Container
* _parent;
+ ArdourCanvas::
Container
*group;
ArdourCanvas::Polygon *mark;
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* _track_canvas_line;
+ ArdourCanvas::Rectangle* _name_background;
std::string _name;
double unit_position;
std::string _name;
double unit_position;
@@
-128,14
+129,14
@@
class Marker : public sigc::trackable
private:
/* disallow copy construction */
private:
/* disallow copy construction */
-
Marker (
Marker const &);
-
Marker & operator= (
Marker const &);
+
ArdourMarker (Ardour
Marker const &);
+
ArdourMarker & operator= (Ardour
Marker const &);
};
};
-class TempoMarker : public Marker
+class TempoMarker : public
Ardour
Marker
{
public:
{
public:
- TempoMarker (PublicEditor& editor, ArdourCanvas::
Group
&, guint32 rgba, const std::string& text, ARDOUR::TempoSection&);
+ TempoMarker (PublicEditor& editor, ArdourCanvas::
Container
&, guint32 rgba, const std::string& text, ARDOUR::TempoSection&);
~TempoMarker ();
ARDOUR::TempoSection& tempo() const { return _tempo; }
~TempoMarker ();
ARDOUR::TempoSection& tempo() const { return _tempo; }
@@
-144,10
+145,10
@@
class TempoMarker : public Marker
ARDOUR::TempoSection& _tempo;
};
ARDOUR::TempoSection& _tempo;
};
-class MeterMarker : public Marker
+class MeterMarker : public
Ardour
Marker
{
public:
{
public:
- MeterMarker (PublicEditor& editor, ArdourCanvas::
Group
&, guint32 rgba, const std::string& text, ARDOUR::MeterSection&);
+ MeterMarker (PublicEditor& editor, ArdourCanvas::
Container
&, guint32 rgba, const std::string& text, ARDOUR::MeterSection&);
~MeterMarker ();
ARDOUR::MeterSection& meter() const { return _meter; }
~MeterMarker ();
ARDOUR::MeterSection& meter() const { return _meter; }