fix visual focus indication in IOSelector; import pays attention to audio file embedd...

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

diff --git a/libs/ardour/ardour/location.h b/libs/ardour/ardour/location.h
index 2dd49847fb21b444a05f6dbfb36fdf85e377464b..94f70bb4e8ecf02fcf249eeca8f0619883975f48 100644 (file)
--- a/libs/ardour/ardour/location.h
+++ b/libs/ardour/ardour/location.h
@@ -36,13 +36,12 @@
 #include <pbd/statefuldestructible.h> 
 
 #include <ardour/ardour.h>
-#include <ardour/state_manager.h>
 
 using std::string;
 
 namespace ARDOUR {
 
-class Location : public sigc::trackable, public PBD::StatefulDestructible
+class Location : public PBD::StatefulDestructible
 {
   public:
        enum Flags {
@@ -131,7 +130,7 @@ class Location : public sigc::trackable, public PBD::StatefulDestructible
        bool set_flag_internal (bool yn, Flags flag);
 };
 
-class Locations : public StateManager, public PBD::StatefulDestructible
+class Locations : public PBD::StatefulDestructible
 {
   public:
        typedef std::list<Location *> LocationList;
@@ -169,6 +168,7 @@ class Locations : public StateManager, public PBD::StatefulDestructible
        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);
@@ -180,26 +180,14 @@ class Locations : public StateManager, public PBD::StatefulDestructible
                (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