X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fsession.h;h=cdc79164e6184cc5724667092b1eac6653464c11;hb=1bd4c5b3a212460eed1773f6b049d18c89625565;hp=ca7c38b2814e2b91905dc909e08e30e2bee0c121;hpb=ffdf5ada616d285fafb58f45c2e3d37b212a328a;p=ardour.git

diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index ca7c38b281..cdc79164e6 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -103,7 +103,7 @@ using std::string;
 using std::map;
 using std::set;
 
-class Session : public sigc::trackable, public PBD::StatefulDestructible
+class Session : public PBD::StatefulDestructible
 
 {
   private:
@@ -162,7 +162,6 @@ class Session : public sigc::trackable, public PBD::StatefulDestructible
 			void*                ptr;
 			bool                 yes_or_no;
 			SlaveSource slave;
-			Route*               route;
 	    };
 
 	    boost::shared_ptr<Region>   region;
@@ -243,6 +242,7 @@ class Session : public sigc::trackable, public PBD::StatefulDestructible
 	void set_dirty ();
 	void set_clean ();
 	bool dirty() const { return _state_of_the_state & Dirty; }
+	bool deletion_in_progress() const { return _state_of_the_state & Deletion; }
 	sigc::signal<void> DirtyChanged;
 
 	std::string sound_dir (bool with_path = true) const;
@@ -756,11 +756,11 @@ class Session : public sigc::trackable, public PBD::StatefulDestructible
 		current_trans->add_command (cmd);
 	}
 
-	std::map<PBD::ID, PBD::StatefulDestructible*> registry;
+	std::map<PBD::ID, PBD::StatefulThingWithGoingAway*> registry;
 
         // these commands are implemented in libs/ardour/session_command.cc
 	Command *memento_command_factory(XMLNode *n);
-        void register_with_memento_command_factory(PBD::ID, PBD::StatefulDestructible *);
+        void register_with_memento_command_factory(PBD::ID, PBD::StatefulThingWithGoingAway *);
 
         class GlobalSoloStateCommand : public Command
         {
@@ -1434,10 +1434,9 @@ class Session : public sigc::trackable, public PBD::StatefulDestructible
 	typedef map<PBD::ID,boost::shared_ptr<AudioRegion> > AudioRegionList;
 	AudioRegionList audio_regions;
 	
-	void region_renamed (boost::shared_ptr<Region>);
-	void region_changed (Change, boost::shared_ptr<Region>);
 	void add_region (boost::shared_ptr<Region>);
-	void remove_region (boost::shared_ptr<Region>);
+	void region_changed (Change, boost::weak_ptr<Region>);
+	void remove_region (boost::weak_ptr<Region>);
 
 	int load_regions (const XMLNode& node);