diff options
| author | Tim Mayberry <mojofunk@gmail.com> | 2013-08-15 20:04:08 +1000 |
|---|---|---|
| committer | Tim Mayberry <mojofunk@gmail.com> | 2013-09-06 14:31:11 +1000 |
| commit | 8ddd12a60d08d895cb5400013cdda2e893fb81bb (patch) | |
| tree | 84c0082083295835e33c38c12acc5e21cb9b7c7e /gtk2_ardour/transcode_ffmpeg.cc | |
| parent | e6c7ecf0e369ba886a7dc57a195226921f0f11f1 (diff) | |
Rename SearchPath class Searchpath
Windows headers define SearchPath which means we have to undefine it
where necessary. This is a pain and can be tricksy, so I feel renaming
the class slightly is the easiest solution.
Diffstat (limited to 'gtk2_ardour/transcode_ffmpeg.cc')
| -rw-r--r-- | gtk2_ardour/transcode_ffmpeg.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/gtk2_ardour/transcode_ffmpeg.cc b/gtk2_ardour/transcode_ffmpeg.cc index 0a7bf64ecd..08060b6a51 100644 --- a/gtk2_ardour/transcode_ffmpeg.cc +++ b/gtk2_ardour/transcode_ffmpeg.cc @@ -32,10 +32,6 @@ #include "i18n.h" -#ifdef SearchPath -#undef SearchPath -#endif - using namespace PBD; using namespace VideoUtils; @@ -55,7 +51,7 @@ TranscodeFfmpeg::TranscodeFfmpeg (std::string f) #endif std::string ff_file_path; - if (find_file_in_search_path (SearchPath(Glib::getenv("PATH")), X_("ffmpeg_harvid"), ff_file_path)) { ffmpeg_exe = ff_file_path; } + if (find_file_in_search_path (Searchpath(Glib::getenv("PATH")), X_("ffmpeg_harvid"), ff_file_path)) { ffmpeg_exe = ff_file_path; } else if (Glib::file_test(X_("C:\\Program Files\\harvid\\ffmpeg.exe"), Glib::FILE_TEST_EXISTS)) { ffmpeg_exe = X_("C:\\Program Files\\ffmpeg\\ffmpeg.exe"); } @@ -63,7 +59,7 @@ TranscodeFfmpeg::TranscodeFfmpeg (std::string f) ffmpeg_exe = X_("C:\\Program Files\\ffmpeg\\ffmpeg.exe"); } - if (find_file_in_search_path (SearchPath(Glib::getenv("PATH")), X_("ffprobe_harvid"), ff_file_path)) { ffprobe_exe = ff_file_path; } + if (find_file_in_search_path (Searchpath(Glib::getenv("PATH")), X_("ffprobe_harvid"), ff_file_path)) { ffprobe_exe = ff_file_path; } else if (Glib::file_test(X_("C:\\Program Files\\harvid\\ffprobe.exe"), Glib::FILE_TEST_EXISTS)) { ffprobe_exe = X_("C:\\Program Files\\ffmpeg\\ffprobe.exe"); } |