projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refactor MIDISceneChange color property addition by moving it into SceneChange to...
[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 f3541a2e628d28e75a9c65346d581ce484645f72..ab66949326e88360299cc631d87aa62d886454fc 100644
(file)
--- a/
libs/ardour/midi_patch_manager.cc
+++ b/
libs/ardour/midi_patch_manager.cc
@@
-29,11
+29,7
@@
#include "ardour/session_directory.h"
#include "ardour/midi_patch_manager.h"
#include "ardour/session_directory.h"
#include "ardour/midi_patch_manager.h"
-#ifdef SearchPath
-#undef SearchPath
-#endif
-
-#include "ardour/midi_patch_search_path.h"
+#include "ardour/search_paths.h"
#include "i18n.h"
#include "i18n.h"
@@
-54,6
+50,7
@@
void
MidiPatchManager::set_session (Session* s)
{
SessionHandlePtr::set_session (s);
MidiPatchManager::set_session (Session* s)
{
SessionHandlePtr::set_session (s);
+ refresh ();
add_session_patches ();
}
add_session_patches ();
}
@@
-72,10
+69,9
@@
MidiPatchManager::add_session_patches ()
assert (Glib::file_test (path_to_patches, Glib::FILE_TEST_IS_DIR));
assert (Glib::file_test (path_to_patches, Glib::FILE_TEST_IS_DIR));
- Glib::PatternSpec pattern(string("*.midnam"));
vector<std::string> result;
vector<std::string> result;
- find_
matching_files_in_directory (path_to_patches, pattern, result
);
+ find_
files_matching_pattern (result, path_to_patches, "*.midnam"
);
info << "Loading " << result.size() << " MIDI patches from " << path_to_patches << endmsg;
info << "Loading " << result.size() << " MIDI patches from " << path_to_patches << endmsg;
@@
-107,11
+103,10
@@
MidiPatchManager::refresh()
_master_devices_by_model.clear();
_all_models.clear();
_master_devices_by_model.clear();
_all_models.clear();
- SearchPath search_path = midi_patch_search_path ();
- Glib::PatternSpec pattern (string("*.midnam"));
+ Searchpath search_path = midi_patch_search_path ();
vector<std::string> result;
vector<std::string> result;
- find_
matching_files_in_search_path (search_path, pattern, result
);
+ find_
files_matching_pattern (result, search_path, "*.midnam"
);
info << "Loading " << result.size() << " MIDI patches from " << search_path.to_string() << endmsg;
info << "Loading " << result.size() << " MIDI patches from " << search_path.to_string() << endmsg;
@@
-150,5
+145,7
@@
void
MidiPatchManager::session_going_away ()
{
SessionHandlePtr::session_going_away ();
MidiPatchManager::session_going_away ()
{
SessionHandlePtr::session_going_away ();
- refresh ();
+ _documents.clear();
+ _master_devices_by_model.clear();
+ _all_models.clear();
}
}