r229@gwythaint (orig r769): fugalh | 2006-08-09 08:15:05 -0600

  r283@gandalf:  fugalh | 2006-08-09 08:13:37 -0600
  Save state basics, including adding PBD::ID to the delinquents. Compiles but needs to be tested (because I can't get the whole thing to compile on OSX due to the Rect problem).
 


git-svn-id: svn://localhost/ardour2/trunk@772 d708f5d6-7413-0410-9779-e7cbd77b26cf

5 files changed, 12 insertions, 0 deletions

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index e5367d6280..d18756fb7f 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -1298,6 +1298,7 @@ ARDOUR_UI::start_engine ()
 			   settings for a new session 
 			*/
 			session->save_state ("");
+                        session->save_history ();
 		}
 
 		/* there is too much going on, in too many threads, for us to 
@@ -1471,6 +1472,7 @@ ARDOUR_UI::save_state_canfail (string name)
 		}
 
 		if ((ret = session->save_state (name)) != 0) {
+                        session->save_history();
 			return ret;
 		}
 	}
diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc
index 25f3068a81..d2cc3e1e1c 100644
--- a/gtk2_ardour/ardour_ui_dialogs.cc
+++ b/gtk2_ardour/ardour_ui_dialogs.cc
@@ -156,6 +156,7 @@ ARDOUR_UI::unload_session ()
 			
 		case 1:
 			session->save_state ("");
+                        session->save_history();
 			break;
 		}
 	}
diff --git a/gtk2_ardour/automation_line.h b/gtk2_ardour/automation_line.h
index 9c6b932dfd..ec86b7455f 100644
--- a/gtk2_ardour/automation_line.h
+++ b/gtk2_ardour/automation_line.h
@@ -161,7 +161,9 @@ class AutomationLine : public sigc::trackable, public Stateful
 	XMLNode& get_state (void);
 	int set_state (const XMLNode&);
 
+        PBD::ID id() { return _id; }
   protected:
+        PBD::ID _id;
 	string _name;
 	guint32 _height;
 	uint32_t _line_color;
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index c31dfd5ede..5ddb2b0d2e 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -143,6 +143,8 @@ class Editor : public PublicEditor
 	XMLNode& get_state ();
 	int set_state (const XMLNode& );
 
+        PBD::ID id() { return _id; }
+
 	void set_mouse_mode (Editing::MouseMode, bool force=true);
 	void step_mouse_mode (bool next);
 	Editing::MouseMode current_mouse_mode () { return mouse_mode; }
@@ -347,6 +349,8 @@ class Editor : public PublicEditor
 	ARDOUR::AudioEngine& engine;
 	bool                 constructed;
 
+        PBD::ID _id;
+
 	PlaylistSelector* _playlist_selector;
 
 	void          set_frames_per_unit (double);
diff --git a/gtk2_ardour/region_gain_line.h b/gtk2_ardour/region_gain_line.h
index bf6de0d810..02340c8bae 100644
--- a/gtk2_ardour/region_gain_line.h
+++ b/gtk2_ardour/region_gain_line.h
@@ -26,6 +26,7 @@ class AudioRegionGainLine : public AutomationLine
 
 	void remove_point (ControlPoint&);
 
+        PBD::ID id() { return _id; }
 
 
   private:
@@ -33,6 +34,8 @@ class AudioRegionGainLine : public AutomationLine
 	AudioRegionView& rv;
 
 	UndoAction get_memento();
+
+        PBD::ID _id;
 };