X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Faudioplaylist.h;h=383ec73531bc9b505b4022af3c5fe5182639bcc7;hb=1bd4c5b3a212460eed1773f6b049d18c89625565;hp=5a77067f8fd76f95b2d127bae9e120ffb9e9f127;hpb=6f4a92f740b2fd75794489ce58f9348f8adf6bf4;p=ardour.git

diff --git a/libs/ardour/ardour/audioplaylist.h b/libs/ardour/ardour/audioplaylist.h
index 5a77067f8f..383ec73531 100644
--- a/libs/ardour/ardour/audioplaylist.h
+++ b/libs/ardour/ardour/audioplaylist.h
@@ -38,79 +38,54 @@ class AudioPlaylist : public ARDOUR::Playlist
 {
   public:
 	typedef std::list<Crossfade*> Crossfades;
-
-  private:
-	
-	struct State : public ARDOUR::StateManager::State {
-	    RegionList regions;
-	    std::list<UndoAction> region_states;
-	    
-	    Crossfades crossfades;
-	    std::list<UndoAction> crossfade_states;
-	    
-	    State (std::string why) : ARDOUR::StateManager::State (why) {}
-	    ~State ();
-	};
 	
    public:
 	AudioPlaylist (Session&, const XMLNode&, bool hidden = false);
 	AudioPlaylist (Session&, string name, bool hidden = false);
 	AudioPlaylist (const AudioPlaylist&, string name, bool hidden = false);
-	AudioPlaylist (const AudioPlaylist&, jack_nframes_t start, jack_nframes_t cnt, string name, bool hidden = false);
+	AudioPlaylist (const AudioPlaylist&, nframes_t start, nframes_t cnt, string name, bool hidden = false);
 
-	void clear (bool with_delete = false, bool with_save = true);
+	void clear (bool with_signals=true);
 
-        jack_nframes_t read (Sample *dst, Sample *mixdown, float *gain_buffer, char * workbuf, jack_nframes_t start, jack_nframes_t cnt, uint32_t chan_n=0);
+        nframes_t read (Sample *dst, Sample *mixdown, float *gain_buffer, nframes_t start, nframes_t cnt, uint32_t chan_n=0);
 
 	int set_state (const XMLNode&);
-	UndoAction get_memento() const;
 
 	sigc::signal<void,Crossfade *> NewCrossfade; 
 
 	template<class T> void foreach_crossfade (T *t, void (T::*func)(Crossfade *));
-	void crossfades_at (jack_nframes_t frame, Crossfades&);
-
-	template<class T> void apply_to_history (T& obj, void (T::*method)(const ARDOUR::StateManager::StateMap&, state_id_t)) {
-		RegionLock rlock (this);
-		(obj.*method) (states, _current_state_id);
-	}
-
-	bool destroy_region (Region*);
+	void crossfades_at (nframes_t frame, Crossfades&);
 
-	void drop_all_states ();
+	bool destroy_region (boost::shared_ptr<Region>);
 
     protected:
 
-	/* state management */
-
-	StateManager::State* state_factory (std::string) const;
-	Change restore_state (StateManager::State&);
-	void send_state_change (Change);
-
 	/* playlist "callbacks" */
 	void notify_crossfade_added (Crossfade *);
 	void flush_notifications ();
 
-		void finalize_split_region (Region *orig, Region *left, Region *right);
+	void finalize_split_region (boost::shared_ptr<Region> orig, boost::shared_ptr<Region> left, boost::shared_ptr<Region> right);
 	
-        void refresh_dependents (Region& region);
-        void check_dependents (Region& region, bool norefresh);
-        void remove_dependents (Region& region);
+        void refresh_dependents (boost::shared_ptr<Region> region);
+        void check_dependents (boost::shared_ptr<Region> region, bool norefresh);
+        void remove_dependents (boost::shared_ptr<Region> region);
 
     protected:
        ~AudioPlaylist (); /* public should use unref() */
 
     private:
-       Crossfades      _crossfades;
+       Crossfades      _crossfades;    /* xfades currently in use */
        Crossfades      _pending_xfade_adds;
 
        void crossfade_invalidated (Crossfade*);
        XMLNode& state (bool full_state);
        void dump () const;
 
-       bool region_changed (Change, Region*);
+       bool region_changed (Change, boost::shared_ptr<Region>);
        void crossfade_changed (Change);
        void add_crossfade (Crossfade&);
+
+       void source_offset_changed (boost::shared_ptr<AudioRegion> region);
 };
 
 } /* namespace ARDOUR */