Save MIDI files to interchange/sessionname/midifiles (instead of audiofiles).

Fix some uninitialized variables in Streamview.
Tempo-based SMF source (internally only).
Horrible crash on MIDI record finish.


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

5 files changed, 14 insertions, 1 deletions

diff --git a/libs/ardour/ardour/directory_names.h b/libs/ardour/ardour/directory_names.h
index ff327e6ad9..c0f1831718 100644
--- a/libs/ardour/ardour/directory_names.h
+++ b/libs/ardour/ardour/directory_names.h
@@ -8,6 +8,7 @@ namespace ARDOUR {
 
 extern const char* const old_sound_dir_name;
 extern const char* const sound_dir_name;
+extern const char* const midi_dir_name;
 extern const char* const dead_sound_dir_name;
 extern const char* const interchange_dir_name;
 extern const char* const peak_dir_name;
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index 80362e45b5..6cf7f9530b 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -256,6 +256,7 @@ class Session : public PBD::StatefulDestructible
 	sigc::signal<void> DirtyChanged;
 
 	std::string sound_dir (bool with_path = true) const;
+	std::string midi_dir (bool with_path = true) const;
 	std::string peak_dir () const;
 	std::string dead_sound_dir () const;
 	std::string automation_dir () const;
diff --git a/libs/ardour/ardour/session_directory.h b/libs/ardour/ardour/session_directory.h
index d23c135e0b..7662894042 100644
--- a/libs/ardour/ardour/session_directory.h
+++ b/libs/ardour/ardour/session_directory.h
@@ -53,6 +53,13 @@ public:
 	 * of root_path()/interchange/session_name/audiofiles
 	 */
 	const path sound_path () const;
+	
+	/**
+	 * @return the absolute path to the directory in which 
+	 * the session stores MIDI files, ie
+	 * root_path()/interchange/session_name/midifiles
+	 */
+	const path midi_path () const;
 
 	/**
 	 * @return The absolute path to the directory in which all
diff --git a/libs/ardour/ardour/smf_source.h b/libs/ardour/ardour/smf_source.h
index ed1a0edb76..b4a0ada555 100644
--- a/libs/ardour/ardour/smf_source.h
+++ b/libs/ardour/ardour/smf_source.h
@@ -91,6 +91,8 @@ class SMFSource : public MidiSource {
 	void load_model(bool lock=true);
 	void destroy_model();
 
+	uint16_t ppqn() const { return _ppqn; }
+
   private:
 
 	int init (string idstr, bool must_exist);
@@ -110,6 +112,8 @@ class SMFSource : public MidiSource {
 	uint32_t read_var_len() const;
 	int      read_event(MidiEvent& ev) const;
 
+	static const uint16_t _ppqn = 19200;
+
 	uint16_t       _channel;
 	string         _path;
 	Flag           _flags;
diff --git a/libs/ardour/ardour/tempo.h b/libs/ardour/ardour/tempo.h
index 5e3e93e48b..2d8462a751 100644
--- a/libs/ardour/ardour/tempo.h
+++ b/libs/ardour/ardour/tempo.h
@@ -195,7 +195,7 @@ class TempoMap : public PBD::StatefulDestructible
 
 	BBTPointList *get_points (nframes_t start, nframes_t end) const;
 
-	void           bbt_time (nframes_t when, BBT_Time&) const;
+	void      bbt_time (nframes_t when, BBT_Time&) const;
 	nframes_t frame_time (const BBT_Time&) const;
 	nframes_t bbt_duration_at (nframes_t, const BBT_Time&, int dir) const;