ardour/livetrax
13
0
Fork 0
Code

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

Browse Source
This commit is contained in:
Paul Davis 2020-01-05 17:51:18 -07:00
parent 5ff8e260ff
commit ece18d3083
2 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/ardour/ardour/midi_patch_manager.h
View File

@ -53,7 +53,7 @@ public:
typedef std::map<std::string, boost::shared_ptr<MIDINameDocument> > MidiNameDocuments; typedef std::map<std::string, boost::shared_ptr<MIDINameDocument> > MidiNameDocuments;
typedef std::map<std::string, MIDINameDocument::MasterDeviceNamesList> DeviceNamesByMaker; typedef std::map<std::string, MIDINameDocument::MasterDeviceNamesList> DeviceNamesByMaker;
virtual ~MidiPatchManager() { _manager = 0; } ~MidiPatchManager();
static MidiPatchManager& instance() { static MidiPatchManager& instance() {
if (_manager == 0) { if (_manager == 0) {
@ -172,8 +172,8 @@ private:
Glib::Threads::Mutex _lock; Glib::Threads::Mutex _lock;
bool no_patch_changed_messages; bool no_patch_changed_messages;
pthread_t _midnam_load_thread; bool stop_thread;
static void* _midnam_load (void *); Glib::Threads::Thread* _midnam_load_thread;
void load_midnams (); void load_midnams ();
}; };

22
libs/ardour/midi_patch_manager.cc
View File

@ -45,10 +45,19 @@ MidiPatchManager* MidiPatchManager::_manager = 0;
MidiPatchManager::MidiPatchManager () MidiPatchManager::MidiPatchManager ()
: no_patch_changed_messages (false) : no_patch_changed_messages (false)
, stop_thread (false)
{ {
add_search_path (midi_patch_search_path ()); add_search_path (midi_patch_search_path ());
} }
MidiPatchManager::~MidiPatchManager ()
{
_manager = 0;
stop_thread = true;
_midnam_load_thread->join ();
}
void void
MidiPatchManager::add_search_path (const Searchpath& search_path) 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; 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) { for (vector<std::string>::const_iterator i = result.begin(); i != result.end(); ++i) {
if (stop_thread) {
break;
}
load_midi_name_document (*i); load_midi_name_document (*i);
} }
} }
@ -254,14 +266,6 @@ MidiPatchManager::remove_midi_name_document (const std::string& file_path, bool
return removed; return removed;
} }
void*
MidiPatchManager::_midnam_load (void* arg)
{
MidiPatchManager* mpm = (MidiPatchManager *) arg;
mpm->load_midnams ();
return 0;
}
void void
MidiPatchManager::load_midnams () MidiPatchManager::load_midnams ()
{ {
@ -285,7 +289,7 @@ MidiPatchManager::load_midnams ()
void void
MidiPatchManager::load_midnams_in_thread () 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 void