Make sure we don't deactivate un-activated plugins or re-activate already activated...

[ardour.git] / gtk2_ardour / marker.h

diff --git a/gtk2_ardour/marker.h b/gtk2_ardour/marker.h
index 13e80ef51279d411bf31e67c05194fc0a1677489..7865004d54e15de0a509f1fad2b397014e07ee8f 100644 (file)
--- a/gtk2_ardour/marker.h
+++ b/gtk2_ardour/marker.h
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #ifndef __gtk_ardour_marker_h__
@@ -52,13 +51,13 @@ class Marker : public sigc::trackable
 
 
        Marker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const string& text, Type, 
-               jack_nframes_t frame = 0, bool handle_events = true);
+               nframes_t frame = 0, bool handle_events = true);
 
        virtual ~Marker ();
 
        ArdourCanvas::Item& the_item() const;
 
-       void set_position (jack_nframes_t);
+       void set_position (nframes_t);
        void set_name (const string&);
        void set_color_rgba (uint32_t rgba);
 
@@ -76,7 +75,7 @@ class Marker : public sigc::trackable
        ArdourCanvas::Points *points;
 
        double    unit_position;
-       jack_nframes_t frame_position;
+       nframes_t frame_position;
        unsigned char      shift; /* should be double, but its always small and integral */
        Type      _type;