Merge branch 'master' into windows

[ardour.git] / libs / ardour / test / test_common.cc

diff --git a/libs/ardour/test/test_common.cc b/libs/ardour/test/test_common.cc
index 8364d91be17dd47344c001fb2be1db193dedff0b..71eba65bbbc23104866a71c2304ec1013b69b91e 100644 (file)
--- a/libs/ardour/test/test_common.cc
+++ b/libs/ardour/test/test_common.cc
@@ -25,10 +25,10 @@
 
 using namespace std;
 
-PBD::SearchPath
+PBD::Searchpath
 test_search_path ()
 {
-#ifdef WIN32
+#ifdef PLATFORM_WINDOWS
        std::string wsp(g_win32_get_package_installation_directory_of_module(NULL));
        return Glib::build_filename (wsp, "ardour_testdata");
 #else
@@ -37,13 +37,14 @@ test_search_path ()
 }
 
 std::string
-new_test_output_dir ()
+new_test_output_dir (std::string prefix)
 {
        std::string tmp_dir = Glib::build_filename (g_get_tmp_dir(), "ardour_test");
        std::string dir_name;
        std::string new_test_dir;
        do {
                ostringstream oss;
+               oss << prefix;
                oss << g_random_int ();
                dir_name = oss.str();
                new_test_dir = Glib::build_filename (tmp_dir, dir_name);
@@ -51,3 +52,9 @@ new_test_output_dir ()
        } while (g_mkdir_with_parents (new_test_dir.c_str(), 0755) != 0);
        return new_test_dir;
 }
+
+int
+get_test_sample_rate ()
+{
+       return 44100;
+}