diff options
| author | Tim Mayberry <mojofunk@gmail.com> | 2014-06-19 21:23:12 +1000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-25 12:40:10 -0400 |
| commit | cd12698b9caff8a7fc0006f409cbf317e67fec82 (patch) | |
| tree | c83f8972f58c2315423ff58655ec67e16d0f5db6 /libs/ardour | |
| parent | 8d0cba3384d862f5df9d5ce0675123c144579cd3 (diff) | |
Rename PBD::find_file_in_search_path to just PBD::find_file
saves a bit of typing and not necessary if you look at how it is used.
Diffstat (limited to 'libs/ardour')
| -rw-r--r-- | libs/ardour/plugin_manager.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/rc_configuration.cc | 4 | ||||
| -rw-r--r-- | libs/ardour/system_exec.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/test/resampled_source_test.cc | 2 |
4 files changed, 5 insertions, 5 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); |