use glibmm threads for the midnam load thread, instead of raw pthreads (for portability)

diff --git a/libs/ardour/ardour/midi_patch_manager.h b/libs/ardour/ardour/midi_patch_manager.h
index 1e1d2624393a47ac28bdea12809e59ad786a306c..148a946c3a5ac99255a38ca3ee21a24f16c9c66d 100644 (file)
--- a/libs/ardour/ardour/midi_patch_manager.h
+++ b/libs/ardour/ardour/midi_patch_manager.h
@@ -53,7 +53,7 @@ public:
        typedef std::map<std::string, boost::shared_ptr<MIDINameDocument> >    MidiNameDocuments;
        typedef std::map<std::string, MIDINameDocument::MasterDeviceNamesList> DeviceNamesByMaker;
 
-       virtual ~MidiPatchManager() { _manager = 0; }
+        ~MidiPatchManager();
 
        static MidiPatchManager& instance() {
                if (_manager == 0) {
@@ -172,8 +172,8 @@ private:
 
        Glib::Threads::Mutex _lock;
        bool no_patch_changed_messages;
-       pthread_t _midnam_load_thread;
-       static void* _midnam_load (void *);
+       bool stop_thread;
+       Glib::Threads::Thread* _midnam_load_thread;
        void load_midnams ();
 };
 

diff --git a/libs/ardour/midi_patch_manager.cc b/libs/ardour/midi_patch_manager.cc
index 9a5f45029be1897037849e2cbd9feaecc7f2c250..b208920603d10ed506a6f0bc049cecf95ac17a09 100644 (file)
--- a/libs/ardour/midi_patch_manager.cc
+++ b/libs/ardour/midi_patch_manager.cc
@@ -45,10 +45,19 @@ MidiPatchManager* MidiPatchManager::_manager = 0;
 
 MidiPatchManager::MidiPatchManager ()
        : no_patch_changed_messages (false)
+       , stop_thread (false)
 {
        add_search_path (midi_patch_search_path ());
 }
 
+MidiPatchManager::~MidiPatchManager ()
+{
+       _manager = 0;
+
+       stop_thread = true;
+       _midnam_load_thread->join ();
+}
+
 void
 MidiPatchManager::add_search_path (const Searchpath& search_path)
 {
@@ -116,6 +125,9 @@ MidiPatchManager::add_midnam_files_from_directory(const std::string& directory_p
        info << string_compose (P_("Loading %1 MIDI patch from %2", "Loading %1 MIDI patches from %2", result.size()), result.size(), directory_path) << endmsg;
 
        for (vector<std::string>::const_iterator i = result.begin(); i != result.end(); ++i) {
+               if (stop_thread) {
+                       break;
+               }
                load_midi_name_document (*i);
        }
 }
@@ -142,8 +154,8 @@ MidiPatchManager::remove_midnam_files_from_directory(const std::string& director
        find_files_matching_pattern (result, directory_path, "*.midnam");
 
        info << string_compose(
-                       P_("Unloading %1 MIDI patch from %2", "Unloading %1 MIDI patches from %2", result.size()),
-                       result.size(), directory_path)
+               P_("Unloading %1 MIDI patch from %2", "Unloading %1 MIDI patches from %2", result.size()),
+               result.size(), directory_path)
             << endmsg;
 
        for (vector<std::string>::const_iterator i = result.begin(); i != result.end(); ++i) {
@@ -181,7 +193,7 @@ MidiPatchManager::add_midi_name_document (boost::shared_ptr<MIDINameDocument> do
 {
        bool added = false;
        for (MIDINameDocument::MasterDeviceNamesList::const_iterator device =
-                document->master_device_names_by_model().begin();
+                    document->master_device_names_by_model().begin();
             device != document->master_device_names_by_model().end();
             ++device) {
                if (_documents.find(device->first) != _documents.end()) {
@@ -202,7 +214,7 @@ MidiPatchManager::add_midi_name_document (boost::shared_ptr<MIDINameDocument> do
                        _devices_by_manufacturer.insert(std::make_pair(manufacturer, empty));
                }
                _devices_by_manufacturer[manufacturer].insert(
-                   std::make_pair(device->first, device->second));
+                       std::make_pair(device->first, device->second));
 
                added = true;
                // TODO: handle this gracefully.
@@ -231,7 +243,7 @@ MidiPatchManager::remove_midi_name_document (const std::string& file_path, bool
                        _documents.erase(i++);
 
                        for (MIDINameDocument::MasterDeviceNamesList::const_iterator device =
-                                document->master_device_names_by_model().begin();
+                                    document->master_device_names_by_model().begin();
                             device != document->master_device_names_by_model().end();
                             ++device) {
 
@@ -254,14 +266,6 @@ MidiPatchManager::remove_midi_name_document (const std::string& file_path, bool
        return removed;
 }
 
-void*
-MidiPatchManager::_midnam_load (void* arg)
-{
-       MidiPatchManager* mpm = (MidiPatchManager *) arg;
-       mpm->load_midnams ();
-       return 0;
-}
-
 void
 MidiPatchManager::load_midnams ()
 {
@@ -278,14 +282,14 @@ MidiPatchManager::load_midnams ()
                        add_midnam_files_from_directory (*i);
                }
        }
-       
+
        PatchesChanged (); /* EMIT SIGNAL */
 }
 
 void
 MidiPatchManager::load_midnams_in_thread ()
 {
-       pthread_create_and_store (X_("midnam"), &_midnam_load_thread, _midnam_load, this);
+       _midnam_load_thread = Glib::Threads::Thread::create (sigc::mem_fun (*this, &MidiPatchManager::load_midnams));
 }
 
 void