the Properties & 64bit region commit

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

diff --git a/libs/ardour/ardour/audioplaylist.h b/libs/ardour/ardour/audioplaylist.h
index 341b08930ce470f159f49a7aa7c3c73c7fc1d137..b5df4cfabb5e1d5feb8df98061bd5c9f554adc4d 100644 (file)
--- 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,52 @@ class Source;
 class AudioPlaylist : public ARDOUR::Playlist
 {
   public:
-       typedef std::list<Crossfade*> Crossfades;
+       typedef std::list<boost::shared_ptr<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&, nframes_t start, nframes_t cnt, string name, bool hidden = false);
+       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);
 
-       void clear (bool with_save = true);
+       ~AudioPlaylist ();
 
-        nframes_t read (Sample *dst, Sample *mixdown, float *gain_buffer, nframes_t start, nframes_t cnt, uint32_t chan_n=0);
+       void clear (bool with_signals=true);
 
-       int set_state (const XMLNode&);
-       UndoAction get_memento() const;
+        nframes_t read (Sample *dst, Sample *mixdown, float *gain_buffer, nframes_t start, nframes_t cnt, uint32_t chan_n=0);
 
-       sigc::signal<void,Crossfade *> NewCrossfade; 
+       int set_state (const XMLNode&, int version);
 
-       template<class T> void foreach_crossfade (T *t, void (T::*func)(Crossfade *));
+       PBD::Signal1<void,boost::shared_ptr<Crossfade> >  NewCrossfade;
+       
+       void foreach_crossfade (boost::function<void (boost::shared_ptr<Crossfade>)>);
        void crossfades_at (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 (boost::shared_ptr<Region>);
 
-       void drop_all_states ();
-
     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 (boost::shared_ptr<Region> orig, boost::shared_ptr<Region> left, boost::shared_ptr<Region> right);
-       
+
         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      _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, boost::shared_ptr<Region>);
-       void crossfade_changed (Change);
-       void add_crossfade (Crossfade&);
+       bool region_changed (PBD::PropertyChange, boost::shared_ptr<Region>);
+       void crossfade_changed (PBD::PropertyChange);
+       void add_crossfade (boost::shared_ptr<Crossfade>);
 
        void source_offset_changed (boost::shared_ptr<AudioRegion> region);
 };