smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-06 05:35:47 +01:00
Code Issues Projects Releases Wiki Activity

advance compiling to the m*.cc point

Browse source 
git-svn-id: svn://localhost/trunk/ardour2@108 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2005-11-24 14:59:36 +00:00
parent 54a8032106
commit 3ff9964885
18 changed files with 123 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

17
gtk2_ardour/marker.h
View file

@ -24,9 +24,6 @@
#include <string>
#include <glib.h>
#include <ardour/ardour.h>
#include <libgnomecanvasmm/group.h>
#include <libgnomecanvasmm/text.h>
#include <libgnomecanvasmm/polygon.h>
#include <sigc++/signal.h>
#include "canvas.h"
@ -53,10 +50,14 @@ class Marker : public sigc::trackable
PunchOut
};
Marker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const string& text, Type,
gint (*callback)(ArdourCanvas::Item *, GdkEvent *, gpointer), jack_nframes_t frame = 0);
jack_nframes_t frame = 0, bool handle_events = true);
virtual ~Marker ();
ArdourCanvas::Item& the_item() const;
void set_position (jack_nframes_t);
void set_name (const string&);
void set_color_rgba (uint32_t rgba);
@ -70,7 +71,7 @@ class Marker : public sigc::trackable
PublicEditor& editor;
ArdourCanvas::Group *group;
ArdourCanvas::Item *mark;
ArdourCanvas::Polygon *mark;
ArdourCanvas::Text *text;
ArdourCanvas::Points *points;
@ -85,8 +86,7 @@ class Marker : public sigc::trackable
class TempoMarker : public Marker
{
public:
TempoMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const string& text, ARDOUR::TempoSection&,
gint (*callback)(ArdourCanvas::Item *, GdkEvent *, gpointer));
TempoMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const string& text, ARDOUR::TempoSection&);
~TempoMarker ();
ARDOUR::TempoSection& tempo() const { return _tempo; }
@ -98,8 +98,7 @@ class TempoMarker : public Marker
class MeterMarker : public Marker
{
public:
MeterMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const string& text, ARDOUR::MeterSection&,
gint (*callback)(ArdourCanvas::Item *, GdkEvent *, gpointer));
MeterMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const string& text, ARDOUR::MeterSection&);
~MeterMarker ();
ARDOUR::MeterSection& meter() const { return _meter; }