summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
Diffstat (limited to 'libs')
-rw-r--r--libs/ardour/plugin_manager.cc2
-rw-r--r--libs/ardour/rc_configuration.cc4
-rw-r--r--libs/ardour/system_exec.cc2
-rw-r--r--libs/ardour/test/resampled_source_test.cc2
-rw-r--r--libs/backends/alsa/alsa_audiobackend.cc2
-rw-r--r--libs/canvas/stateful_image.cc2
-rw-r--r--libs/pbd/file_utils.cc6
-rw-r--r--libs/pbd/pbd/file_utils.h8
-rw-r--r--libs/pbd/system_exec.cc2
-rw-r--r--libs/pbd/test/xpath.cc6
-rw-r--r--libs/surfaces/osc/osc.cc2
11 files changed, 19 insertions, 19 deletions
diff --git a/libs/ardour/plugin_manager.cc b/libs/ardour/plugin_manager.cc
index 5c809c213b..e596c67634 100644
--- a/libs/ardour/plugin_manager.cc
+++ b/libs/ardour/plugin_manager.cc
@@ -116,7 +116,7 @@ PluginManager::PluginManager ()
string lrdf_path;
string scan_p = Glib::build_filename(ARDOUR::ardour_dll_directory(), "fst");
- if (!PBD::find_file_in_search_path ( PBD::Searchpath(scan_p), "ardour-vst-scanner", scanner_bin_path)) {
+ if (!PBD::find_file ( PBD::Searchpath(scan_p), "ardour-vst-scanner", scanner_bin_path)) {
PBD::warning << "VST scanner app (ardour-vst-scanner) not found in path " << scan_p << endmsg;
}
diff --git a/libs/ardour/rc_configuration.cc b/libs/ardour/rc_configuration.cc
index 7fe030fb7e..b0be237563 100644
--- a/libs/ardour/rc_configuration.cc
+++ b/libs/ardour/rc_configuration.cc
@@ -76,7 +76,7 @@ RCConfiguration::load_state ()
/* load system configuration first */
- if (find_file_in_search_path (ardour_config_search_path(), "ardour_system.rc", rcfile)) {
+ if (find_file (ardour_config_search_path(), "ardour_system.rc", rcfile)) {
/* stupid XML Parser hates empty files */
@@ -104,7 +104,7 @@ RCConfiguration::load_state ()
/* now load configuration file for user */
- if (find_file_in_search_path (ardour_config_search_path(), "ardour.rc", rcfile)) {
+ if (find_file (ardour_config_search_path(), "ardour.rc", rcfile)) {
/* stupid XML parser hates empty files */
diff --git a/libs/ardour/system_exec.cc b/libs/ardour/system_exec.cc
index d5c3f31903..456f8351f2 100644
--- a/libs/ardour/system_exec.cc
+++ b/libs/ardour/system_exec.cc
@@ -34,7 +34,7 @@ static char *vfork_exec_wrapper_path() {
return NULL;
#else
std::string vfork_exec_wrapper;
- if (!PBD::find_file_in_search_path (
+ if (!PBD::find_file (
PBD::Searchpath(Glib::build_filename(ARDOUR::ardour_dll_directory(), "vfork")),
"ardour-exec-wrapper", vfork_exec_wrapper)) {
PBD::warning << "vfork exec wrapper not found..'" << endmsg;
diff --git a/libs/ardour/test/resampled_source_test.cc b/libs/ardour/test/resampled_source_test.cc
index c8ef0f4a95..9aa8989992 100644
--- a/libs/ardour/test/resampled_source_test.cc
+++ b/libs/ardour/test/resampled_source_test.cc
@@ -19,7 +19,7 @@ ResampledSourceTest::seekTest ()
std::string test_file_path;
const string test_filename = "test.wav";
- CPPUNIT_ASSERT (find_file_in_search_path (test_search_path (), test_filename, test_file_path));
+ CPPUNIT_ASSERT (find_file (test_search_path (), test_filename, test_file_path));
boost::shared_ptr<SndFileImportableSource> s (new SndFileImportableSource (test_file_path));
ResampledImportableSource r (s, 48000, SrcBest);
diff --git a/libs/backends/alsa/alsa_audiobackend.cc b/libs/backends/alsa/alsa_audiobackend.cc
index a411916c68..5afa637bba 100644
--- a/libs/backends/alsa/alsa_audiobackend.cc
+++ b/libs/backends/alsa/alsa_audiobackend.cc
@@ -132,7 +132,7 @@ AlsaAudioBackend::acquire_device(const char* device_name)
_reservation_succeeded = false;
std::string request_device_exe;
- if (!PBD::find_file_in_search_path (
+ if (!PBD::find_file (
PBD::Searchpath(Glib::build_filename(ARDOUR::ardour_dll_directory(), "ardouralsautil")
+ G_SEARCHPATH_SEPARATOR_S + ARDOUR::ardour_dll_directory()),
"ardour-request-device", request_device_exe))
diff --git a/libs/canvas/stateful_image.cc b/libs/canvas/stateful_image.cc
index b372ade7b8..b62da9cc8c 100644
--- a/libs/canvas/stateful_image.cc
+++ b/libs/canvas/stateful_image.cc
@@ -134,7 +134,7 @@ StatefulImage::find_image (const std::string& name)
std::string path;
- if (!find_file_in_search_path (_image_search_path, name, path)) {
+ if (!find_file (_image_search_path, name, path)) {
error << string_compose (_("Image named %1 not found"),
name) << endmsg;
return ImageHandle();
diff --git a/libs/pbd/file_utils.cc b/libs/pbd/file_utils.cc
index bc4ad8ee6d..9db71c25c0 100644
--- a/libs/pbd/file_utils.cc
+++ b/libs/pbd/file_utils.cc
@@ -147,9 +147,9 @@ find_files_matching_pattern (vector<string>& result,
}
bool
-find_file_in_search_path(const Searchpath& search_path,
- const string& filename,
- std::string& result)
+find_file (const Searchpath& search_path,
+ const string& filename,
+ std::string& result)
{
vector<std::string> tmp;
diff --git a/libs/pbd/pbd/file_utils.h b/libs/pbd/pbd/file_utils.h
index 8fef0c4d45..1943790de6 100644
--- a/libs/pbd/pbd/file_utils.h
+++ b/libs/pbd/pbd/file_utils.h
@@ -90,15 +90,15 @@ find_files_matching_pattern (std::vector<std::string>& result,
const std::string& pattern);
/**
- * Takes a search path and a file name and place the full path
+ * Takes a search path and a file name and places the full path
* to that file in result if it is found within the search path.
*
* @return true If file is found within the search path.
*/
LIBPBD_API bool
-find_file_in_search_path (const Searchpath& search_path,
- const std::string& filename,
- std::string& result);
+find_file (const Searchpath& search_path,
+ const std::string& filename,
+ std::string& result);
/**
diff --git a/libs/pbd/system_exec.cc b/libs/pbd/system_exec.cc
index 5d2db21efc..b11ef1ce0e 100644
--- a/libs/pbd/system_exec.cc
+++ b/libs/pbd/system_exec.cc
@@ -195,7 +195,7 @@ SystemExec::SystemExec (std::string command, const std::map<char, std::string> s
{
init ();
make_argp_escaped(command, subs);
- if (!find_file_in_search_path (Searchpath (Glib::getenv ("PATH")), argp[0], cmd)) {
+ if (!find_file (Searchpath (Glib::getenv ("PATH")), argp[0], cmd)) {
// not found in path - use as-is
cmd = argp[0];
}
diff --git a/libs/pbd/test/xpath.cc b/libs/pbd/test/xpath.cc
index 8b80eec2c6..4d6f260c27 100644
--- a/libs/pbd/test/xpath.cc
+++ b/libs/pbd/test/xpath.cc
@@ -18,7 +18,7 @@ XPathTest::testMisc ()
// cout << "Test 1: RosegardenPatchFile.xml: Find all banks in the file" << endl;
std::string testdata_path;
- CPPUNIT_ASSERT (find_file_in_search_path (test_search_path (), "RosegardenPatchFile.xml", testdata_path));
+ CPPUNIT_ASSERT (find_file (test_search_path (), "RosegardenPatchFile.xml", testdata_path));
XMLTree doc(testdata_path);
// "//bank" gives as last element an empty element libxml bug????
@@ -51,7 +51,7 @@ XPathTest::testMisc ()
// We have to allocate a new document here, or we get segfaults
std::string testsession_path;
- CPPUNIT_ASSERT (find_file_in_search_path (test_search_path (), "TestSession.ardour", testsession_path));
+ CPPUNIT_ASSERT (find_file (test_search_path (), "TestSession.ardour", testsession_path));
XMLTree doc2(testsession_path);
result = doc2.find("/Session/Sources/Source[contains(@captured-for, 'Guitar')]");
@@ -77,7 +77,7 @@ XPathTest::testMisc ()
// cout << endl << endl << "Test 5: ProtoolsPatchFile.midnam: Get Banks and Patches for 'Name Set 1'" << endl;
std::string testmidnam_path;
- CPPUNIT_ASSERT (find_file_in_search_path (test_search_path (), "ProtoolsPatchFile.midnam", testmidnam_path));
+ CPPUNIT_ASSERT (find_file (test_search_path (), "ProtoolsPatchFile.midnam", testmidnam_path));
// We have to allocate a new document here, or we get segfaults
XMLTree doc3(testmidnam_path);
diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc
index 8bc791a1ee..648dc4ea19 100644
--- a/libs/surfaces/osc/osc.cc
+++ b/libs/surfaces/osc/osc.cc
@@ -205,7 +205,7 @@ OSC::start ()
std::string url_file;
- if (find_file_in_search_path (ardour_config_search_path(), "osc_url", url_file)) {
+ if (find_file (ardour_config_search_path(), "osc_url", url_file)) {
_osc_url_file = url_file;
ofstream urlfile;
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-24 04:45:16 +0000