Transfer 'export_formats_search_path()' into 'libs/ardour/search_paths.cc'

diff --git a/libs/ardour/ardour/export_formats_search_path.h b/libs/ardour/ardour/export_formats_search_path.h
deleted file mode 100644 (file)
index 771c6f9..0000000
--- a/libs/ardour/ardour/export_formats_search_path.h
+++ /dev/null
@@ -1,34 +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_export_formats_search_path_h__
-#define __ardour_export_formats_search_path_h__
-
-#include "pbd/search_path.h"
-
-namespace ARDOUR {
-
-       /**
-        * return a Searchpath containing directories in which to look for
-        * export_formats.
-        */
-       PBD::Searchpath export_formats_search_path ();
-
-} // namespace ARDOUR
-
-#endif /* __ardour_export_formats_search_path_h__ */

diff --git a/libs/ardour/ardour/search_paths.h b/libs/ardour/ardour/search_paths.h
index 8367da80ffde7e1ac57ef7fa94739e4ddfcec6ca..149f233f0914b07ec8c7d9d2adec0a1062c1792c 100644 (file)
--- a/libs/ardour/ardour/search_paths.h
+++ b/libs/ardour/ardour/search_paths.h
@@ -47,6 +47,12 @@ namespace ARDOUR {
         */
        LIBARDOUR_API PBD::Searchpath control_protocol_search_path ();
 
+       /**
+        * return a Searchpath containing directories in which to look for
+        * export_formats.
+        */
+       LIBARDOUR_API PBD::Searchpath export_formats_search_path ();
+
 } // namespace ARDOUR
 
 #endif /* __libardour_search_paths_h__ */

diff --git a/libs/ardour/export_formats_search_path.cc b/libs/ardour/export_formats_search_path.cc
deleted file mode 100644 (file)
index ffa096d..0000000
--- a/libs/ardour/export_formats_search_path.cc
+++ /dev/null
@@ -1,51 +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 <iostream>
-#include <glibmm/miscutils.h>
-
-#include "ardour/export_formats_search_path.h"
-#include "ardour/directory_names.h"
-#include "ardour/filesystem_paths.h"
-
-namespace {
-       const char * const export_env_variable_name = "ARDOUR_EXPORT_FORMATS_PATH";
-} // anonymous
-
-using namespace PBD;
-
-namespace ARDOUR {
-
-Searchpath
-export_formats_search_path ()
-{
-       Searchpath spath (ardour_data_search_path());
-       spath.add_subdirectory_to_paths (export_formats_dir_name);
-
-       bool export_formats_path_defined = false;
-       Searchpath spath_env (Glib::getenv(export_env_variable_name, export_formats_path_defined));
-
-       if (export_formats_path_defined) {
-               spath += spath_env;
-       }
-
-       return spath;
-}
-
-} // namespace ARDOUR

diff --git a/libs/ardour/export_profile_manager.cc b/libs/ardour/export_profile_manager.cc
index 8f8fae308e441ccb47e8ac7134abd3ebfe5a74ec..0792232b5fc0edb60e8d45773e51762c5f7760aa 100644 (file)
--- a/libs/ardour/export_profile_manager.cc
+++ b/libs/ardour/export_profile_manager.cc
@@ -34,7 +34,7 @@
 
 #include "ardour/export_profile_manager.h"
 #include "ardour/export_format_specification.h"
-#include "ardour/export_formats_search_path.h"
+#include "ardour/search_paths.h"
 #include "ardour/export_timespan.h"
 #include "ardour/export_channel_configuration.h"
 #include "ardour/export_filename.h"

diff --git a/libs/ardour/search_paths.cc b/libs/ardour/search_paths.cc
index d1627067191e766dd935b7f1ce773f0a4f86e5b7..0e268e03a1de41bb3f44a8cbde080baa46f179f2 100644 (file)
--- a/libs/ardour/search_paths.cc
+++ b/libs/ardour/search_paths.cc
@@ -27,6 +27,7 @@
 namespace {
        const char * const backend_env_variable_name = "ARDOUR_BACKEND_PATH";
        const char * const surfaces_env_variable_name = "ARDOUR_SURFACES_PATH";
+       const char * const export_env_variable_name = "ARDOUR_EXPORT_FORMATS_PATH";
 } // anonymous
 
 using namespace PBD;
@@ -55,4 +56,20 @@ control_protocol_search_path ()
        return spath;
 }
 
+Searchpath
+export_formats_search_path ()
+{
+       Searchpath spath (ardour_data_search_path());
+       spath.add_subdirectory_to_paths (export_formats_dir_name);
+
+       bool export_formats_path_defined = false;
+       Searchpath spath_env (Glib::getenv(export_env_variable_name, export_formats_path_defined));
+
+       if (export_formats_path_defined) {
+               spath += spath_env;
+       }
+
+       return spath;
+}
+
 } // namespace ARDOUR