X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidi_patch_manager.cc;h=591c0cae40909743725d10976dc00bc0508db9c3;hb=cb3a60493620e5965de72d34fe0c0d2cce7ec037;hp=b555c12934497c50302d071c2b24cc570292a87a;hpb=7183242b8c8d9296f94a035fb66b1eae06fd3496;p=ardour.git

diff --git a/libs/ardour/midi_patch_manager.cc b/libs/ardour/midi_patch_manager.cc
index b555c12934..591c0cae40 100644
--- a/libs/ardour/midi_patch_manager.cc
+++ b/libs/ardour/midi_patch_manager.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2008 Hans Baier 
+    Copyright (C) 2008 Hans Baier
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -18,10 +18,10 @@
     $Id$
 */
 
-#include <sigc++/sigc++.h>
 #include <boost/shared_ptr.hpp>
 
-#include "pbd/compose.h"
+#include <glibmm/fileutils.h>
+
 #include "pbd/file_utils.h"
 #include "pbd/error.h"
 
@@ -29,64 +29,64 @@
 #include "ardour/session_directory.h"
 #include "ardour/midi_patch_manager.h"
 
+#include "ardour/search_paths.h"
+
 #include "i18n.h"
 
 using namespace std;
-using namespace sigc;
 using namespace ARDOUR;
 using namespace MIDI;
 using namespace MIDI::Name;
 using namespace PBD;
-using namespace PBD::sys;
 
 MidiPatchManager* MidiPatchManager::_manager = 0;
 
+MidiPatchManager::MidiPatchManager ()
+{
+	refresh ();
+}
+
 void
-MidiPatchManager::set_session (Session& s)
+MidiPatchManager::set_session (Session* s)
 {
-	_session = &s;
-	_session->GoingAway.connect (mem_fun (*this, &MidiPatchManager::drop_session));
-	
-	refresh();
+	SessionHandlePtr::set_session (s);
+	add_session_patches ();
 }
 
 void
-MidiPatchManager::refresh()
+MidiPatchManager::add_session_patches ()
 {
-	_documents.clear();
-	_master_devices_by_model.clear();
-	_all_models.clear();
-	
-	path path_to_patches = _session->session_directory().midi_patch_path();
-	
-	info << string_compose(_("looking for MIDI patches in %1"), path_to_patches.to_string()) << endmsg;
-	
-	if (!exists(path_to_patches)) {
+	if (!_session) {
 		return;
 	}
 	
-	assert(is_directory(path_to_patches));
-	
-	Glib::PatternSpec pattern(Glib::ustring("*.midnam"));
-	vector<path> result;
-	
-	find_matching_files_in_directory(path_to_patches, pattern, result);
+	std::string path_to_patches = _session->session_directory().midi_patch_path();
 
-	cerr << "Loading " << result.size() << " MIDI patches from " << path_to_patches.to_string() << endl;
-	
-	for (vector<path>::iterator i = result.begin(); i != result.end(); ++i) {
-		boost::shared_ptr<MIDINameDocument> document(new MIDINameDocument(i->to_string()));
-		for (MIDINameDocument::MasterDeviceNamesList::const_iterator device = 
+	if (!Glib::file_test (path_to_patches, Glib::FILE_TEST_EXISTS)) {
+		return;
+	}
+
+	assert (Glib::file_test (path_to_patches, Glib::FILE_TEST_IS_DIR));
+
+	vector<std::string> result;
+
+	find_files_matching_pattern (result, path_to_patches, "*.midnam");
+
+	info << "Loading " << result.size() << " MIDI patches from " << path_to_patches << endmsg;
+
+	for (vector<std::string>::iterator i = result.begin(); i != result.end(); ++i) {
+		boost::shared_ptr<MIDINameDocument> document(new MIDINameDocument(*i));
+		for (MIDINameDocument::MasterDeviceNamesList::const_iterator device =
 					document->master_device_names_by_model().begin();
-			 	device != document->master_device_names_by_model().end();
+				device != document->master_device_names_by_model().end();
 				++device) {
 			//cerr << "got model " << device->first << endl;
 			// have access to the documents by model name
 			_documents[device->first] = document;
 			// build a list of all master devices from all documents
 			_master_devices_by_model[device->first] = device->second;
-			_all_models.push_back(device->first);
-			
+			_all_models.insert(device->first);
+
 			// make sure there are no double model names
 			// TODO: handle this gracefully.
 			assert(_documents.count(device->first) == 1);
@@ -96,10 +96,53 @@ MidiPatchManager::refresh()
 }
 
 void
-MidiPatchManager::drop_session ()
+MidiPatchManager::refresh()
 {
-	_session = 0;
 	_documents.clear();
 	_master_devices_by_model.clear();
 	_all_models.clear();
+
+	Searchpath search_path = midi_patch_search_path ();
+	vector<std::string> result;
+
+	find_files_matching_pattern (result, search_path, "*.midnam");
+
+	info << "Loading " << result.size() << " MIDI patches from " << search_path.to_string() << endmsg;
+
+	for (vector<std::string>::iterator i = result.begin(); i != result.end(); ++i) {
+		boost::shared_ptr<MIDINameDocument> document;
+		try {
+			document = boost::shared_ptr<MIDINameDocument>(new MIDINameDocument(*i));
+		} catch (...) {
+			error << "Error parsing MIDI patch file " << *i << endmsg;
+			continue;
+		}
+		for (MIDINameDocument::MasterDeviceNamesList::const_iterator device =
+			     document->master_device_names_by_model().begin();
+		     device != document->master_device_names_by_model().end();
+		     ++device) {
+			if (_documents.find(device->first) != _documents.end()) {
+				warning << string_compose(_("Duplicate MIDI device `%1' in `%2' ignored"),
+				                          device->first, *i)
+				        << endmsg;
+				continue;
+			}
+				                      
+			_documents[device->first]               = document;
+			_master_devices_by_model[device->first] = device->second;
+
+			_all_models.insert(device->first);
+		}
+	}
+
+	if (_session) {
+		add_session_patches ();
+	}
+}
+
+void
+MidiPatchManager::session_going_away ()
+{
+	SessionHandlePtr::session_going_away ();
+	refresh ();
 }