new tempo handling from drmoore; don't follow playhead when doing requested_return...

[ardour.git] / libs / ardour / ardour / region.h

diff --git a/libs/ardour/ardour/region.h b/libs/ardour/ardour/region.h
index b27fef48a32c99b65517302ba6d19b4ff1238256..3aae8c47677fd826e14caa9b1a2b8612049d2b75 100644 (file)
--- a/libs/ardour/ardour/region.h
+++ b/libs/ardour/ardour/region.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 __ardour_region_h__
@@ -89,8 +88,20 @@ class Region : public PBD::StatefulDestructible, public boost::enable_shared_fro
        nframes_t position () const { return _position; }
        nframes_t start ()    const { return _start; }
        nframes_t length()    const { return _length; }
-       layer_t        layer ()    const { return _layer; }
-       
+       layer_t   layer ()    const { return _layer; }
+
+       /* these two are valid ONLY during a StateChanged signal handler */
+
+       nframes_t last_position() const { return _last_position; }
+       nframes_t last_length() const { return _last_length; }
+
+       nframes64_t ancestral_start () const { return _ancestral_start; }
+       nframes64_t ancestral_length () const { return _ancestral_length; }
+       float stretch() const { return _stretch; }
+       float shift() const { return _shift; }
+
+       void set_ancestral_data (nframes64_t start, nframes64_t length, float stretch, float shift);
+
        nframes_t sync_offset(int& dir) const;
        nframes_t sync_position() const;
 
@@ -115,7 +126,7 @@ class Region : public PBD::StatefulDestructible, public boost::enable_shared_fro
        void thaw (const string& why);
 
        bool covers (nframes_t frame) const {
-               return first_frame() <= frame && frame < last_frame();
+               return first_frame() <= frame && frame <= last_frame();
        }
 
        OverlapType coverage (nframes_t start, nframes_t end) const {
@@ -137,7 +148,7 @@ class Region : public PBD::StatefulDestructible, public boost::enable_shared_fro
        void set_position (nframes_t, void *src);
        void set_position_on_top (nframes_t, void *src);
        void special_set_position (nframes_t);
-       void nudge_position (long, void *src);
+       void nudge_position (nframes64_t, void *src);
 
        bool at_natural_position () const;
        void move_to_natural_position (void *src);
@@ -157,14 +168,13 @@ class Region : public PBD::StatefulDestructible, public boost::enable_shared_fro
        void clear_sync_position ();
        void set_hidden (bool yn);
        void set_muted (bool yn);
-       void set_opaque (bool yn);
+        void set_opaque (bool yn);
        void set_locked (bool yn);
 
        virtual uint32_t read_data_count() const { return _read_data_count; }
 
-       ARDOUR::Playlist* playlist() const { return _playlist; }
-
-       virtual void set_playlist (ARDOUR::Playlist*);
+       boost::shared_ptr<ARDOUR::Playlist> playlist() const { return _playlist.lock(); }
+       virtual void set_playlist (boost::weak_ptr<ARDOUR::Playlist>);
 
        /* serialization */
        
@@ -200,27 +210,33 @@ class Region : public PBD::StatefulDestructible, public boost::enable_shared_fro
        void first_edit ();
        
        virtual bool verify_start (nframes_t) = 0;
-       virtual bool verify_start_and_length (nframes_t, nframes_t) = 0;
+       virtual bool verify_start_and_length (nframes_t, nframes_t&) = 0;
        virtual bool verify_start_mutable (nframes_t&_start) = 0;
-       virtual bool verify_length (nframes_t) = 0;
+       virtual bool verify_length (nframes_t&) = 0;
        virtual void recompute_at_start () = 0;
        virtual void recompute_at_end () = 0;
        
        
-       nframes_t          _start;
-       nframes_t          _length;
-       nframes_t          _position;
-       Flag                     _flags;
-       nframes_t          _sync_position;
+       nframes_t               _start;
+       nframes_t               _length;
+       nframes_t               _last_length;
+       nframes_t               _position;
+       nframes_t               _last_position;
+       Flag                    _flags;
+       nframes_t               _sync_position;
        layer_t                 _layer;
        string                  _name;        
        mutable RegionEditState _first_edit;
        int                     _frozen;
        Glib::Mutex             lock;
-       ARDOUR::Playlist*       _playlist;
+       boost::weak_ptr<ARDOUR::Playlist> _playlist;
        mutable uint32_t        _read_data_count; // modified in read()
        Change                   pending_changed;
        uint64_t                _last_layer_op; // timestamp
+       nframes64_t             _ancestral_start;
+       nframes64_t             _ancestral_length;
+       float                   _stretch;
+       float                   _shift;
 };
 
 } /* namespace ARDOUR */