From 78b00fa6dc13ed4161b8cd51ad0ee3469dcb39d6 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 22 Oct 2009 21:03:47 +0000 Subject: [PATCH] Actually load MIDI data from disk on session load (kludgey, forces model to always be loaded, this needs fixing later). Fix hilariously braindead non-lock in SMFSource::load_model. git-svn-id: svn://localhost/ardour2/branches/3.0@5869 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/smf_source.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/ardour/smf_source.cc b/libs/ardour/smf_source.cc index f69b1788a0..6e8a0ee052 100644 --- a/libs/ardour/smf_source.cc +++ b/libs/ardour/smf_source.cc @@ -66,7 +66,7 @@ SMFSource::SMFSource (Session& s, const ustring& path, bool embedded, Source::Fl throw failed_constructor (); } - _model = boost::shared_ptr(new MidiModel(this)); // FIXME + load_model(true, true); // FIXME } /** Constructor used for existing internal-to-session files. */ @@ -90,7 +90,7 @@ SMFSource::SMFSource (Session& s, const XMLNode& node, bool must_exist) throw failed_constructor (); } - _model = boost::shared_ptr(new MidiModel(this)); // FIXME + load_model(true, true); // FIXME } SMFSource::~SMFSource () @@ -396,9 +396,9 @@ SMFSource::load_model (bool lock, bool force_reload) return; } - if (lock) { - Glib::Mutex::Lock lm (_lock); - } + boost::shared_ptr lm; + if (lock) + lm = boost::shared_ptr(new Glib::Mutex::Lock(_lock)); if (_model && !force_reload) { return;