ardour/livetrax
13
0
Fork 0
Code

Actually load MIDI data from disk on session load (kludgey, forces model to always be loaded, this needs fixing later).

Browse Source 
Fix hilariously braindead non-lock in SMFSource::load_model.


git-svn-id: svn://localhost/ardour2/branches/3.0@5869 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2009-10-22 21:03:47 +00:00
parent 11f448917f
commit 78b00fa6dc
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libs/ardour/smf_source.cc
View File

@ -66,7 +66,7 @@ SMFSource::SMFSource (Session& s, const ustring& path, bool embedded, Source::Fl
throw failed_constructor ();
}
_model = boost::shared_ptr<MidiModel>(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<MidiModel>(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<Glib::Mutex::Lock> lm;
if (lock)
lm = boost::shared_ptr<Glib::Mutex::Lock>(new Glib::Mutex::Lock(_lock));
if (_model && !force_reload) {
return;