better handling of the inverse-push of solo-by-upstream. still not quite right, but...

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

diff --git a/libs/ardour/midi_patch_manager.cc b/libs/ardour/midi_patch_manager.cc
index b555c12934497c50302d071c2b24cc570292a87a..a2522fe997099ba2fec55a04ef15156f070632c5 100644 (file)
--- 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,7 +18,6 @@
     $Id$
 */
 
-#include <sigc++/sigc++.h>
 #include <boost/shared_ptr.hpp>
 
 #include "pbd/compose.h"
@@ -32,7 +31,6 @@
 #include "i18n.h"
 
 using namespace std;
-using namespace sigc;
 using namespace ARDOUR;
 using namespace MIDI;
 using namespace MIDI::Name;
@@ -42,11 +40,9 @@ using namespace PBD::sys;
 MidiPatchManager* MidiPatchManager::_manager = 0;
 
 void
-MidiPatchManager::set_session (Session& s)
+MidiPatchManager::set_session (Session* s)
 {
-       _session = &s;
-       _session->GoingAway.connect (mem_fun (*this, &MidiPatchManager::drop_session));
-       
+       SessionHandlePtr::set_session (s);
        refresh();
 }
 
@@ -56,29 +52,31 @@ MidiPatchManager::refresh()
        _documents.clear();
        _master_devices_by_model.clear();
        _all_models.clear();
-       
+
+       if (!_session) {
+               return;
+       }
+
        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)) {
                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);
 
-       cerr << "Loading " << result.size() << " MIDI patches from " << path_to_patches.to_string() << endl;
-       
+       info << "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 = 
+               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
@@ -86,7 +84,7 @@ MidiPatchManager::refresh()
                        // build a list of all master devices from all documents
                        _master_devices_by_model[device->first] = device->second;
                        _all_models.push_back(device->first);
-                       
+
                        // make sure there are no double model names
                        // TODO: handle this gracefully.
                        assert(_documents.count(device->first) == 1);
@@ -96,10 +94,8 @@ MidiPatchManager::refresh()
 }
 
 void
-MidiPatchManager::drop_session ()
+MidiPatchManager::session_going_away ()
 {
-       _session = 0;
-       _documents.clear();
-       _master_devices_by_model.clear();
-       _all_models.clear();
+       SessionHandlePtr::session_going_away ();
+       refresh ();
 }