From aa7c2ab5c23700b1ddc8bceec494dfe5393f0314 Mon Sep 17 00:00:00 2001 From: John Emmas Date: Mon, 10 Mar 2014 14:54:29 +0000 Subject: Transfer 'midi_patch_search_path()' into 'libs/ardour/search_paths.cc' --- libs/ardour/ardour/midi_patch_search_path.h | 39 ---------------------- libs/ardour/ardour/search_paths.h | 11 +++++++ libs/ardour/midi_patch_manager.cc | 2 +- libs/ardour/midi_patch_search_path.cc | 50 ----------------------------- libs/ardour/search_paths.cc | 17 ++++++++++ libs/ardour/test/plugins_test.cc | 2 +- 6 files changed, 30 insertions(+), 91 deletions(-) delete mode 100644 libs/ardour/ardour/midi_patch_search_path.h delete mode 100644 libs/ardour/midi_patch_search_path.cc (limited to 'libs') diff --git a/libs/ardour/ardour/midi_patch_search_path.h b/libs/ardour/ardour/midi_patch_search_path.h deleted file mode 100644 index 168e75af4a..0000000000 --- a/libs/ardour/ardour/midi_patch_search_path.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - Copyright (C) 2011 Paul Davis - - 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 - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ - -#ifndef __ardour_midi_patch_search_path_h__ -#define __ardour_midi_patch_search_path_h__ - -#include "pbd/search_path.h" - -namespace ARDOUR { - - /** - * return a Searchpath containing directories in which to look for - * MIDI patch files ("*.midnam") aka MIDNAM files - * - * If ARDOUR_MIDI_PATCH_PATH is defined then the Searchpath returned - * will contain only those directories specified in it, otherwise it will - * contain the user and system directories which may contain control - * surface plugins. - */ - PBD::Searchpath midi_patch_search_path (); - -} // namespace ARDOUR - -#endif /* __ardour_midi_patch_search_path_h__ */ diff --git a/libs/ardour/ardour/search_paths.h b/libs/ardour/ardour/search_paths.h index 9deaecddff..808d33ae2a 100644 --- a/libs/ardour/ardour/search_paths.h +++ b/libs/ardour/ardour/search_paths.h @@ -69,6 +69,17 @@ namespace ARDOUR { */ LIBARDOUR_API PBD::Searchpath lv2_bundled_search_path (); + /** + * return a Searchpath containing directories in which to look for + * MIDI patch files ("*.midnam") aka MIDNAM files + * + * If ARDOUR_MIDI_PATCH_PATH is defined then the Searchpath returned + * will contain only those directories specified in it, otherwise it will + * contain the user and system directories which may contain control + * surface plugins. + */ + LIBARDOUR_API PBD::Searchpath midi_patch_search_path (); + } // namespace ARDOUR #endif /* __libardour_search_paths_h__ */ diff --git a/libs/ardour/midi_patch_manager.cc b/libs/ardour/midi_patch_manager.cc index f2d964bb77..4587b1aad9 100644 --- a/libs/ardour/midi_patch_manager.cc +++ b/libs/ardour/midi_patch_manager.cc @@ -29,7 +29,7 @@ #include "ardour/session_directory.h" #include "ardour/midi_patch_manager.h" -#include "ardour/midi_patch_search_path.h" +#include "ardour/search_paths.h" #include "i18n.h" diff --git a/libs/ardour/midi_patch_search_path.cc b/libs/ardour/midi_patch_search_path.cc deleted file mode 100644 index c099c379e9..0000000000 --- a/libs/ardour/midi_patch_search_path.cc +++ /dev/null @@ -1,50 +0,0 @@ -/* - Copyright (C) 2007 Tim Mayberry - - 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 - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -*/ - -#include - -#include "ardour/midi_patch_search_path.h" -#include "ardour/directory_names.h" -#include "ardour/filesystem_paths.h" - -namespace { - const char * const midi_patch_env_variable_name = "ARDOUR_MIDI_PATCH_PATH"; -} // anonymous - -using namespace PBD; - -namespace ARDOUR { - -Searchpath -midi_patch_search_path () -{ - Searchpath spath (ardour_data_search_path()); - spath.add_subdirectory_to_paths(midi_patch_dir_name); - - bool midi_patch_path_defined = false; - Searchpath spath_env (Glib::getenv(midi_patch_env_variable_name, midi_patch_path_defined)); - - if (midi_patch_path_defined) { - spath += spath_env; - } - - return spath; -} - -} // namespace ARDOUR diff --git a/libs/ardour/search_paths.cc b/libs/ardour/search_paths.cc index 0fc9f0c4f5..ca489063d3 100644 --- a/libs/ardour/search_paths.cc +++ b/libs/ardour/search_paths.cc @@ -31,6 +31,7 @@ namespace { const char * const surfaces_env_variable_name = "ARDOUR_SURFACES_PATH"; const char * const export_env_variable_name = "ARDOUR_EXPORT_FORMATS_PATH"; const char * const ladspa_env_variable_name = "LADSPA_PATH"; + const char * const midi_patch_env_variable_name = "ARDOUR_MIDI_PATCH_PATH"; } // anonymous using namespace PBD; @@ -109,4 +110,20 @@ lv2_bundled_search_path () return spath; } +Searchpath +midi_patch_search_path () +{ + Searchpath spath (ardour_data_search_path()); + spath.add_subdirectory_to_paths(midi_patch_dir_name); + + bool midi_patch_path_defined = false; + Searchpath spath_env (Glib::getenv(midi_patch_env_variable_name, midi_patch_path_defined)); + + if (midi_patch_path_defined) { + spath += spath_env; + } + + return spath; +} + } // namespace ARDOUR diff --git a/libs/ardour/test/plugins_test.cc b/libs/ardour/test/plugins_test.cc index 0e4bddcda6..c769bdaac0 100644 --- a/libs/ardour/test/plugins_test.cc +++ b/libs/ardour/test/plugins_test.cc @@ -1,7 +1,7 @@ #include #include "ardour/plugin_manager.h" -#include "ardour/ladspa_search_path.h" +#include "ardour/search_paths.h" #include "plugins_test.h" #include "test_common.h" -- cgit v1.2.3