X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Faudioplaylist.h;h=277fe5a8e194b33d0b943f61f2e1873e7a2f3a62;hb=afd9fc30e51c41fb42b34d74d6043c2e0e3d1a13;hp=bd76c3028976456eeaf82c93403062c8c3758f4f;hpb=30c08ba655330232767554c48bda1975bfb5628c;p=ardour.git

diff --git a/libs/ardour/ardour/audioplaylist.h b/libs/ardour/ardour/audioplaylist.h
index bd76c30289..277fe5a8e1 100644
--- a/libs/ardour/ardour/audioplaylist.h
+++ b/libs/ardour/ardour/audioplaylist.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2003 Paul Davis 
+    Copyright (C) 2003 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -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_audio_playlist_h__
@@ -24,8 +23,8 @@
 #include <vector>
 #include <list>
 
-#include <ardour/ardour.h>
-#include <ardour/playlist.h>
+#include "ardour/ardour.h"
+#include "ardour/playlist.h"
 
 namespace ARDOUR  {
 
@@ -37,80 +36,54 @@ class Source;
 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 ();
-	};
-	
+	typedef std::list<boost::shared_ptr<Crossfade> > Crossfades;
+
    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);
-
-	void clear (bool with_delete = false, bool with_save = true);
+	AudioPlaylist (Session&, std::string name, bool hidden = false);
+	AudioPlaylist (boost::shared_ptr<const AudioPlaylist>, std::string name, bool hidden = false);
+	AudioPlaylist (boost::shared_ptr<const AudioPlaylist>, nframes_t start, nframes_t cnt, std::string name, bool hidden = false);
 
-        jack_nframes_t read (Sample *dst, Sample *mixdown, float *gain_buffer, jack_nframes_t start, jack_nframes_t cnt, uint32_t chan_n=0);
+	~AudioPlaylist ();
 
-	int set_state (const XMLNode&);
-	UndoAction get_memento() const;
+	void clear (bool with_signals=true);
 
-	sigc::signal<void,Crossfade *> NewCrossfade; 
+        nframes_t read (Sample *dst, Sample *mixdown, float *gain_buffer, nframes_t start, nframes_t cnt, uint32_t chan_n=0);
 
-	template<class T> void foreach_crossfade (T *t, void (T::*func)(Crossfade *));
-	void crossfades_at (jack_nframes_t frame, Crossfades&);
+	int set_state (const XMLNode&, int version);
 
-	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);
-	}
+	sigc::signal<void,boost::shared_ptr<Crossfade> > NewCrossfade;
 
-	bool destroy_region (Region*);
+	void foreach_crossfade (sigc::slot<void, boost::shared_ptr<Crossfade> >);
+	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 notify_crossfade_added (boost::shared_ptr<Crossfade>);
 	void flush_notifications ();
 
-		void finalize_split_region (Region *orig, Region *left, Region *right);
-	
-        void refresh_dependents (Region& region);
-        void check_dependents (Region& region, bool norefresh);
-        void remove_dependents (Region& region);
+	void finalize_split_region (boost::shared_ptr<Region> orig, boost::shared_ptr<Region> left, boost::shared_ptr<Region> right);
 
-    protected:
-       ~AudioPlaylist (); /* public should use unref() */
+        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);
 
     private:
        Crossfades      _crossfades;
        Crossfades      _pending_xfade_adds;
 
-       void crossfade_invalidated (Crossfade*);
+       void crossfade_invalidated (boost::shared_ptr<Region>);
        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 add_crossfade (boost::shared_ptr<Crossfade>);
+
+       void source_offset_changed (boost::shared_ptr<AudioRegion> region);
 };
 
 } /* namespace ARDOUR */