From b0e91bfa0899435c7b798ebd35363147eb1b2823 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sun, 3 Jun 2007 20:06:01 +0000
Subject: Fix MIDI region loading. Add model loading and destroying to
 SMFSource. Load and display MIDI region data on session load.

git-svn-id: svn://localhost/ardour2/trunk@1947 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 libs/ardour/midi_playlist.cc | 50 +++++++++++++-------------------------------
 1 file changed, 14 insertions(+), 36 deletions(-)

(limited to 'libs/ardour/midi_playlist.cc')

diff --git a/libs/ardour/midi_playlist.cc b/libs/ardour/midi_playlist.cc
index f99ef299a7..0aa3779034 100644
--- a/libs/ardour/midi_playlist.cc
+++ b/libs/ardour/midi_playlist.cc
@@ -46,9 +46,9 @@ MidiPlaylist::MidiPlaylist (Session& session, const XMLNode& node, bool hidden)
 	const XMLProperty* prop = node.property("type");
 	assert(prop && DataType(prop->value()) == DataType::MIDI);
 
-	in_set_state = true;
+	in_set_state++;
 	set_state (node);
-	in_set_state = false;
+	in_set_state--;
 }
 
 MidiPlaylist::MidiPlaylist (Session& session, string name, bool hidden)
@@ -109,6 +109,10 @@ MidiPlaylist::MidiPlaylist (boost::shared_ptr<const MidiPlaylist> other, nframes
 MidiPlaylist::~MidiPlaylist ()
 {
   	GoingAway (); /* EMIT SIGNAL */
+	
+	/* drop connections to signals */
+	
+	notify_callbacks ();
 }
 
 struct RegionSortByLayer {
@@ -159,26 +163,14 @@ MidiPlaylist::read (MidiRingBuffer& dst, nframes_t start,
 void
 MidiPlaylist::remove_dependents (boost::shared_ptr<Region> region)
 {
+	/* MIDI regions have no dependents (crossfades) */
 }
 
 
-void
-MidiPlaylist::flush_notifications ()
-{
-	Playlist::flush_notifications();
-
-	if (in_flush) {
-		return;
-	}
-
-	in_flush = true;
-
-	in_flush = false;
-}
-
 void
 MidiPlaylist::refresh_dependents (boost::shared_ptr<Region> r)
 {
+	/* MIDI regions have no dependents (crossfades) */
 }
 
 void
@@ -226,38 +218,24 @@ MidiPlaylist::finalize_split_region (boost::shared_ptr<Region> original, boost::
 void
 MidiPlaylist::check_dependents (boost::shared_ptr<Region> r, bool norefresh)
 {
+	/* MIDI regions have no dependents (crossfades) */
 }
 
 
 int
 MidiPlaylist::set_state (const XMLNode& node)
 {
-	if (!in_set_state) {
-		Playlist::set_state (node);
-	}
-
-	// Actually Charles, I don't much care for children
-	
-	/*
-	XMLNodeList nlist = node.children();
-
-	for (XMLNodeConstIterator niter = nlist.begin(); niter != nlist.end(); ++niter) {
+	in_set_state++;
+	freeze ();
 
-		XMLNode* const child = *niter;
+	Playlist::set_state (node);
 
-	}*/
+	thaw();
+	in_set_state--;
 
 	return 0;
 }
 
-XMLNode&
-MidiPlaylist::state (bool full_state)
-{
-	XMLNode& node = Playlist::state (full_state);
-
-	return node;
-}
-
 void
 MidiPlaylist::dump () const
 {
-- 
cgit v1.2.3