Merged with trunk R1612.

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

diff --git a/libs/ardour/ardour/location.h b/libs/ardour/ardour/location.h
index 75f4c5d12aa83b0fac9033263487fdbafdd2a0c7..6625b7dbf5b384307a5954952a86814aa4f1fbc6 100644 (file)
--- a/libs/ardour/ardour/location.h
+++ b/libs/ardour/ardour/location.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_location_h__
@@ -32,16 +31,16 @@
 #include <glibmm/thread.h>
 
 #include <pbd/undo.h>
+#include <pbd/stateful.h> 
+#include <pbd/statefuldestructible.h> 
 
-#include "ardour.h"
-#include "stateful.h"
-#include "state_manager.h"
+#include <ardour/ardour.h>
 
 using std::string;
 
 namespace ARDOUR {
 
-class Location : public Stateful, public sigc::trackable
+class Location : public PBD::StatefulDestructible
 {
   public:
        enum Flags {
@@ -55,8 +54,8 @@ class Location : public Stateful, public sigc::trackable
                IsStart = 0x80
        };
 
-       Location (jack_nframes_t sample_start,
-                 jack_nframes_t sample_end,
+       Location (nframes_t sample_start,
+                 nframes_t sample_end,
                  const string &name,
                  Flags bits = Flags(0))                
                
@@ -68,19 +67,20 @@ class Location : public Stateful, public sigc::trackable
        Location () {
                _start = 0;
                _end = 0;
-               _flags = 0;     
+               _flags = Flags (0);
        }
 
        Location (const Location& other);
+       Location (const XMLNode&);
        Location* operator= (const Location& other);
 
-       jack_nframes_t start() { return _start; }
-       jack_nframes_t end() { return _end; }
-       jack_nframes_t length() { return _end - _start; }
+       nframes_t start() { return _start; }
+       nframes_t end() { return _end; }
+       nframes_t length() { return _end - _start; }
 
-       int set_start (jack_nframes_t s);
-       int set_end (jack_nframes_t e);
-       int set (jack_nframes_t start, jack_nframes_t end);
+       int set_start (nframes_t s);
+       int set_end (nframes_t e);
+       int set (nframes_t start, nframes_t end);
 
        const string& name() { return _name; }
        void set_name (const string &str) { _name = str; name_changed(this); }
@@ -121,15 +121,15 @@ class Location : public Stateful, public sigc::trackable
 
   private:
        string        _name;
-       jack_nframes_t     _start;
-       jack_nframes_t     _end;
-       uint32_t _flags;
+       nframes_t     _start;
+       nframes_t     _end;
+       Flags         _flags;
 
        void set_mark (bool yn);
        bool set_flag_internal (bool yn, Flags flag);
 };
 
-class Locations : public Stateful, public StateManager
+class Locations : public PBD::StatefulDestructible
 {
   public:
        typedef std::list<Location *> LocationList;
@@ -145,27 +145,30 @@ class Locations : public Stateful, public StateManager
 
        XMLNode& get_state (void);
        int set_state (const XMLNode&);
+        Location *get_location_by_id(PBD::ID);
 
        Location* auto_loop_location () const;
        Location* auto_punch_location () const;
        Location* end_location() const;
        Location* start_location() const;
 
+       int next_available_name(string& result,string base);
        uint32_t num_range_markers() const;
 
        int set_current (Location *, bool want_lock = true);
        Location *current () const { return current_location; }
 
-       Location *first_location_before (jack_nframes_t);
-       Location *first_location_after (jack_nframes_t);
+       Location *first_location_before (nframes_t, bool include_special_ranges = false);
+       Location *first_location_after (nframes_t, bool include_special_ranges = false);
 
-       jack_nframes_t first_mark_before (jack_nframes_t);
-       jack_nframes_t first_mark_after (jack_nframes_t);
+       nframes_t first_mark_before (nframes_t, bool include_special_ranges = false);
+       nframes_t first_mark_after (nframes_t, bool include_special_ranges = false);
 
        sigc::signal<void,Location*> current_changed;
        sigc::signal<void>           changed;
        sigc::signal<void,Location*> added;
        sigc::signal<void,Location*> removed;
+       sigc::signal<void,Change>    StateChanged;
 
        template<class T> void apply (T& obj, void (T::*method)(LocationList&)) {
                Glib::Mutex::Lock lm (lock);
@@ -177,28 +180,16 @@ class Locations : public Stateful, public StateManager
                (obj.*method)(locations, arg);
        }
 
-       UndoAction get_memento () const;
-
   private:
 
-       struct State : public ARDOUR::StateManager::State {
-           LocationList locations;
-           LocationList states;
-
-           State (std::string why) : ARDOUR::StateManager::State (why) {}
-       };
-
        LocationList       locations;
        Location          *current_location;
        mutable Glib::Mutex  lock;
 
        int set_current_unlocked (Location *);
        void location_changed (Location*);
-
-       Change   restore_state (StateManager::State&);
-       StateManager::State* state_factory (std::string why) const;
 };
 
-}; /* namespace ARDOUR */
+} // namespace ARDOUR
 
 #endif /* __ardour_location_h__ */