X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftime_axis_view_item.h;h=80d917704187a75cdc7ba9ad2d670d712c36d6d9;hb=f9f5ec85fbfd15d0008f70d4185a84eeadfd3891;hp=b23350eef721f6fa4b1d7053d73436524c7c17cc;hpb=13532c8500dce5f7a4525bcdfc3b44936fbaa5e6;p=ardour.git

diff --git a/gtk2_ardour/time_axis_view_item.h b/gtk2_ardour/time_axis_view_item.h
index b23350eef7..80d9177041 100644
--- a/gtk2_ardour/time_axis_view_item.h
+++ b/gtk2_ardour/time_axis_view_item.h
@@ -48,14 +48,14 @@ class TimeAxisViewItem : public Selectable
      * @param src the identity of the object that initiated the change
      * @return true if the position change was a success, false otherwise
      */
-    virtual bool set_position(jack_nframes_t pos, void* src, double* delta = 0) ;
+    virtual bool set_position(nframes_t pos, void* src, double* delta = 0) ;
     
     /**
      * Return the position of this item upon the timeline
      *
      * @return the position of this item
      */
-    jack_nframes_t get_position() const ; 
+    nframes_t get_position() const ; 
     
     /**
      * Sets the duration of this item
@@ -64,13 +64,13 @@ class TimeAxisViewItem : public Selectable
      * @param src the identity of the object that initiated the change
      * @return true if the duration change was succesful, false otherwise
      */
-    virtual bool set_duration(jack_nframes_t dur, void* src) ;
+    virtual bool set_duration(nframes_t dur, void* src) ;
     
     /**
      * Returns the duration of this item
      *
      */
-    jack_nframes_t get_duration() const ;
+    nframes_t get_duration() const ;
     
     /**
      * Sets the maximum duration that this item make have.
@@ -78,14 +78,14 @@ class TimeAxisViewItem : public Selectable
      * @param dur the new maximum duration
      * @param src the identity of the object that initiated the change
      */
-    virtual void set_max_duration(jack_nframes_t dur, void* src) ;
+    virtual void set_max_duration(nframes_t dur, void* src) ;
     
     /**
      * Returns the maxmimum duration that this item may be set to
      *
      * @return the maximum duration that this item may be set to
      */
-    jack_nframes_t get_max_duration() const ;
+    nframes_t get_max_duration() const ;
     
     /**
      * Sets the minimu duration that this item may be set to
@@ -93,14 +93,14 @@ class TimeAxisViewItem : public Selectable
      * @param the minimum duration that this item may be set to
      * @param src the identity of the object that initiated the change
      */
-    virtual void set_min_duration(jack_nframes_t dur, void* src) ;
+    virtual void set_min_duration(nframes_t dur, void* src) ;
     
     /**
      * Returns the minimum duration that this item mey be set to
      *
      * @return the nimum duration that this item mey be set to
      */
-    jack_nframes_t get_min_duration() const ;
+    nframes_t get_min_duration() const ;
     
     /**
      * Sets whether the position of this Item is locked to its current position
@@ -232,6 +232,11 @@ class TimeAxisViewItem : public Selectable
     ArdourCanvas::Text* get_name_text();
 
 
+    /**
+     * Returns the time axis that this item is upon
+     */
+    TimeAxisView& get_trackview() const { return trackview; }
+
     /**
      * Sets the samples per unit of this item.
      * this item is used to determine the relative visual size and position of this item
@@ -295,19 +300,19 @@ class TimeAxisViewItem : public Selectable
     sigc::signal<void,std::string,std::string,void*> NameChanged ;
     
     /** Emiited when the position of this item changes */
-    sigc::signal<void,jack_nframes_t,void*> PositionChanged ;
+    sigc::signal<void,nframes_t,void*> PositionChanged ;
     
     /** Emitted when the position lock of this item is changed */
     sigc::signal<void,bool,void*> PositionLockChanged ;
     
     /** Emitted when the duration of this item changes */
-    sigc::signal<void,jack_nframes_t,void*> DurationChanged ;
+    sigc::signal<void,nframes_t,void*> DurationChanged ;
     
     /** Emitted when the maximum item duration is changed */
-    sigc::signal<void,jack_nframes_t,void*> MaxDurationChanged ;
+    sigc::signal<void,nframes_t,void*> MaxDurationChanged ;
     
     /** Emitted when the mionimum item duration is changed */
-    sigc::signal<void,jack_nframes_t,void*> MinDurationChanged ;
+    sigc::signal<void,nframes_t,void*> MinDurationChanged ;
     
   protected:
     
@@ -316,9 +321,10 @@ class TimeAxisViewItem : public Selectable
 	    ShowNameHighlight = 0x2,
 	    ShowNameText = 0x4,
 	    ShowHandles = 0x8,
-	    HideFrameLR = 0x10,
-	    HideFrameTB = 0x20,
-	    FullWidthNameHighlight = 0x40
+	    HideFrameLeft = 0x10,
+	    HideFrameRight = 0x20,
+	    HideFrameTB = 0x40,
+	    FullWidthNameHighlight = 0x80
     };
 
     /**
@@ -333,7 +339,7 @@ class TimeAxisViewItem : public Selectable
      * @param duration the duration of this item
      */
     TimeAxisViewItem(const std::string & it_name, ArdourCanvas::Group& parent, TimeAxisView& tv, double spu, Gdk::Color& base_color, 
-		     jack_nframes_t start, jack_nframes_t duration, Visibility v = Visibility (0));
+		     nframes_t start, nframes_t duration, Visibility v = Visibility (0));
     
     /**
      * Calculates some contrasting color for displaying various parts of this item, based upon the base color
@@ -378,16 +384,16 @@ class TimeAxisViewItem : public Selectable
     bool position_locked ;
     
     /** The posotion of this item on the timeline */
-    jack_nframes_t frame_position ;
+    nframes_t frame_position ;
     
     /** the duration of this item upon the timeline */
-    jack_nframes_t item_duration ;
+    nframes_t item_duration ;
     
     /** the maximum duration that we allow this item to take */
-    jack_nframes_t max_item_duration ;
+    nframes_t max_item_duration ;
     
     /** the minimu duration that we allow this item to take */
-    jack_nframes_t min_item_duration ;
+    nframes_t min_item_duration ;
     
     /** indicates whether this Max Duration constraint is active */
     bool max_duration_active ;