Make SMFSource suck significantly less.

Read from MidiRingbuffer directly into model, don't read MidiRingBuffer into a new midi buffer, then into the model.
Pass rec data to UI via model instead of a separate buffer.
Read MIDI CC data into MidiModel (though not actually used yet).
Made quantization toggle edited flag so model is saved.


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

1 files changed, 13 insertions, 7 deletions

diff --git a/libs/ardour/ardour/session_object.h b/libs/ardour/ardour/session_object.h
index 9d82b4bba0..bb726cb0d0 100644
--- a/libs/ardour/ardour/session_object.h
+++ b/libs/ardour/ardour/session_object.h
@@ -20,6 +20,7 @@
 #ifndef __ardour_session_object_h__
 #define __ardour_session_object_h__
 
+#include <string>
 #include <pbd/statefuldestructible.h> 
 
 namespace ARDOUR {
@@ -36,22 +37,27 @@ class Session;
 class SessionObject : public PBD::StatefulDestructible
 {
 public:
-	SessionObject(Session& session, const string& name)
+	SessionObject(Session& session, const std::string& name)
 		: _session(session)
 		, _name(name)
 	{}
 	
-	Session&      session() const { return _session; }
-	const string& name() const    { return _name; }
+	Session&           session() const { return _session; }
+	const std::string& name()    const { return _name; }
 	
-	virtual bool set_name (const string& str)
-		{ if (_name != str) { _name = str; NameChanged(); } return true; }
+	virtual bool set_name (const std::string& str) {
+		if (_name != str) {
+			_name = str;
+			NameChanged();
+		}
+		return true;
+	}
 	
 	sigc::signal<void> NameChanged;
 
 protected:
-	Session& _session;
-	string   _name;
+	Session&    _session;
+	std::string _name;
 };
 
 } // namespace ARDOUR