projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add back definition of 2ndary clock delta text color
[ardour.git]
/
gtk2_ardour
/
marker.h
diff --git
a/gtk2_ardour/marker.h
b/gtk2_ardour/marker.h
index fbc7e18a50d77724a43dea7d8412d9161b4f84f4..6bf6d08f5132a6bb697ff36bbf4bba073e51fb18 100644
(file)
--- a/
gtk2_ardour/marker.h
+++ b/
gtk2_ardour/marker.h
@@
-56,7
+56,7
@@
class Marker : public sigc::trackable
};
};
- Marker (PublicEditor& editor, ArdourCanvas::Group &,
ArdourCanvas::Group &,
guint32 rgba, const std::string& text, Type,
+ Marker (PublicEditor& editor, ArdourCanvas::Group &, guint32 rgba, const std::string& text, Type,
framepos_t frame = 0, bool handle_events = true);
virtual ~Marker ();
framepos_t frame = 0, bool handle_events = true);
virtual ~Marker ();
@@
-92,14
+92,13
@@
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* _parent;
- ArdourCanvas::Group* _line_parent;
ArdourCanvas::Group *group;
ArdourCanvas::Polygon *mark;
ArdourCanvas::Pixbuf *name_pixbuf;
ArdourCanvas::Group *group;
ArdourCanvas::Polygon *mark;
ArdourCanvas::Pixbuf *name_pixbuf;
@@
-126,12
+125,17
@@
class Marker : public sigc::trackable
void reposition ();
void setup_line_x ();
void setup_name_display ();
void reposition ();
void setup_line_x ();
void setup_name_display ();
+
+private:
+ /* disallow copy construction */
+ Marker (Marker const &);
+ Marker & operator= (Marker const &);
};
class TempoMarker : public Marker
{
public:
};
class TempoMarker : public Marker
{
public:
- TempoMarker (PublicEditor& editor, ArdourCanvas::Group &,
ArdourCanvas::Group &,
guint32 rgba, const std::string& text, ARDOUR::TempoSection&);
+ TempoMarker (PublicEditor& editor, ArdourCanvas::Group &, guint32 rgba, const std::string& text, ARDOUR::TempoSection&);
~TempoMarker ();
ARDOUR::TempoSection& tempo() const { return _tempo; }
~TempoMarker ();
ARDOUR::TempoSection& tempo() const { return _tempo; }
@@
-143,7
+147,7
@@
class TempoMarker : public Marker
class MeterMarker : public Marker
{
public:
class MeterMarker : public Marker
{
public:
- MeterMarker (PublicEditor& editor, ArdourCanvas::Group &,
ArdourCanvas::Group &,
guint32 rgba, const std::string& text, ARDOUR::MeterSection&);
+ MeterMarker (PublicEditor& editor, ArdourCanvas::Group &, guint32 rgba, const std::string& text, ARDOUR::MeterSection&);
~MeterMarker ();
ARDOUR::MeterSection& meter() const { return _meter; }
~MeterMarker ();
ARDOUR::MeterSection& meter() const { return _meter; }