From 06fe0a51723aa7970347e0e2d478344ebefb084f Mon Sep 17 00:00:00 2001 From: John Emmas Date: Mon, 10 Mar 2014 13:47:00 +0000 Subject: Create 'libs/ardour/search_paths.cc/.h' and transfer backend_search_path() to it --- libs/ardour/ardour/backend_search_path.h | 39 --------------------------- libs/ardour/ardour/search_paths.h | 41 ++++++++++++++++++++++++++++ libs/ardour/audioengine.cc | 2 +- libs/ardour/backend_search_path.cc | 45 ------------------------------- libs/ardour/search_paths.cc | 46 ++++++++++++++++++++++++++++++++ libs/ardour/test/audio_engine_test.cc | 2 +- 6 files changed, 89 insertions(+), 86 deletions(-) delete mode 100644 libs/ardour/ardour/backend_search_path.h create mode 100644 libs/ardour/ardour/search_paths.h delete mode 100644 libs/ardour/backend_search_path.cc create mode 100644 libs/ardour/search_paths.cc (limited to 'libs') diff --git a/libs/ardour/ardour/backend_search_path.h b/libs/ardour/ardour/backend_search_path.h deleted file mode 100644 index e8a5082c71..0000000000 --- a/libs/ardour/ardour/backend_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_backend_search_path_h__ -#define __ardour_backend_search_path_h__ - -#include "pbd/search_path.h" - -namespace ARDOUR { - - /** - * return a SearchPath containing directories in which to look for - * backend plugins. - * - * If ARDOUR_BACKEND_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 audio/MIDI - * backends. - */ - PBD::Searchpath backend_search_path (); - -} // namespace ARDOUR - -#endif /* __ardour_backend_search_path_h__ */ diff --git a/libs/ardour/ardour/search_paths.h b/libs/ardour/ardour/search_paths.h new file mode 100644 index 0000000000..4f1bf13796 --- /dev/null +++ b/libs/ardour/ardour/search_paths.h @@ -0,0 +1,41 @@ +/* + Copyright (C) 2011 Tim Mayberry + Copyright (C) 2013 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 __libardour_search_paths_h__ +#define __libardour_search_paths_h__ + +#include "pbd/search_path.h" + +namespace ARDOUR { + + /** + * return a SearchPath containing directories in which to look for + * backend plugins. + * + * If ARDOUR_BACKEND_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 audio/MIDI + * backends. + */ + LIBARDOUR_API PBD::Searchpath backend_search_path (); + +} // namespace ARDOUR + +#endif /* __libardour_search_paths_h__ */ diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc index 0cb1a1e112..d6a511fdad 100644 --- a/libs/ardour/audioengine.cc +++ b/libs/ardour/audioengine.cc @@ -41,7 +41,7 @@ #include "ardour/audio_port.h" #include "ardour/audio_backend.h" #include "ardour/audioengine.h" -#include "ardour/backend_search_path.h" +#include "ardour/search_paths.h" #include "ardour/buffer.h" #include "ardour/cycle_timer.h" #include "ardour/internal_send.h" diff --git a/libs/ardour/backend_search_path.cc b/libs/ardour/backend_search_path.cc deleted file mode 100644 index 4c5ff40e7d..0000000000 --- a/libs/ardour/backend_search_path.cc +++ /dev/null @@ -1,45 +0,0 @@ -/* - Copyright (C) 2013 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. - -*/ - -#include - -#include "ardour/backend_search_path.h" -#include "ardour/directory_names.h" -#include "ardour/filesystem_paths.h" - -namespace { - const char * const backend_env_variable_name = "ARDOUR_BACKEND_PATH"; -} // anonymous - -using namespace PBD; - -namespace ARDOUR { - -Searchpath -backend_search_path () -{ - Searchpath spath(user_config_directory ()); - spath += ardour_dll_directory (); - spath.add_subdirectory_to_paths(backend_dir_name); - - spath += Searchpath(Glib::getenv(backend_env_variable_name)); - return spath; -} - -} // namespace ARDOUR diff --git a/libs/ardour/search_paths.cc b/libs/ardour/search_paths.cc new file mode 100644 index 0000000000..243e520776 --- /dev/null +++ b/libs/ardour/search_paths.cc @@ -0,0 +1,46 @@ +/* + Copyright (C) 2011 Tim Mayberry + Copyright (C) 2013 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. + +*/ + +#include + +#include "ardour/search_paths.h" +#include "ardour/directory_names.h" +#include "ardour/filesystem_paths.h" + +namespace { + const char * const backend_env_variable_name = "ARDOUR_BACKEND_PATH"; +} // anonymous + +using namespace PBD; + +namespace ARDOUR { + +Searchpath +backend_search_path () +{ + Searchpath spath(user_config_directory ()); + spath += ardour_dll_directory (); + spath.add_subdirectory_to_paths(backend_dir_name); + + spath += Searchpath(Glib::getenv(backend_env_variable_name)); + return spath; +} + +} // namespace ARDOUR diff --git a/libs/ardour/test/audio_engine_test.cc b/libs/ardour/test/audio_engine_test.cc index b992caf73e..0bed81f8a6 100644 --- a/libs/ardour/test/audio_engine_test.cc +++ b/libs/ardour/test/audio_engine_test.cc @@ -2,7 +2,7 @@ #include "ardour/audioengine.h" #include "ardour/audio_backend.h" -#include "ardour/backend_search_path.h" +#include "ardour/search_paths.h" #include "audio_engine_test.h" #include "test_common.h" -- cgit v1.2.3