part-way through getting the audioengine changes to compile

[ardour.git] / libs / ardour / midi_region.cc

diff --git a/libs/ardour/midi_region.cc b/libs/ardour/midi_region.cc
index d52d661c1a5972b897f05e4ccd179cb6dded6611..8509e55f97017a06597897bbdcc92e5615edd4d9 100644 (file)
--- a/libs/ardour/midi_region.cc
+++ b/libs/ardour/midi_region.cc
@@ -24,9 +24,10 @@
 
 #include <set>
 
-#include <glibmm/thread.h>
+#include <glibmm/threads.h>
 
 #include "pbd/xml++.h"
+#include "pbd/basename.h"
 
 #include "ardour/automation_control.h"
 #include "ardour/midi_model.h"
@@ -134,7 +135,7 @@ MidiRegion::clone (string path) const
 
        PropertyList plist;
 
-       plist.add (Properties::name, ms->name());
+       plist.add (Properties::name, PBD::basename_nosuffix (ms->name()));
        plist.add (Properties::whole_file, true);
        plist.add (Properties::start, _start);
        plist.add (Properties::start_beats, _start_beats);
@@ -406,7 +407,7 @@ MidiRegion::model_automation_state_changed (Evoral::Parameter const & p)
           for a given set of filtered_parameters, so now that we've changed that list we must invalidate
           the iterator.
        */
-       Glib::Mutex::Lock lm (midi_source(0)->mutex());
+       Glib::Threads::Mutex::Lock lm (midi_source(0)->mutex());
        midi_source(0)->invalidate ();
 }