X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Futils.h;h=1eab554178d3af1f1f18d88e2c24b1bd3bdf6eb8;hb=ba0458cf1f6c69366e89631d8fff916ad183d768;hp=e68f7a01df5bc012bc6f81e1fd661714051f4ad6;hpb=74933f58659051f6d4ef52d1103b2b7ba4643883;p=ardour.git

diff --git a/libs/ardour/ardour/utils.h b/libs/ardour/ardour/utils.h
index e68f7a01df..1eab554178 100644
--- a/libs/ardour/ardour/utils.h
+++ b/libs/ardour/ardour/utils.h
@@ -32,14 +32,16 @@
 #include <CoreFoundation/CoreFoundation.h>
 #endif
 
-#include "ardour.h"
+bool string_is_affirmative (const std::string&);
+
+#include "ardour/ardour.h"
+#include "ardour/data_type.h"
 
 class XMLNode;
 
-Glib::ustring legalize_for_path (Glib::ustring str);
+std::string legalize_for_path (const std::string& str);
 XMLNode* find_named_node (const XMLNode& node, std::string name);
 std::string bool_as_string (bool);
-bool string_is_affirmative (const std::string&);
 
 static inline float f_max(float x, float a) {
 	x -= a;
@@ -50,15 +52,15 @@ static inline float f_max(float x, float a) {
 	return (x);
 }
 
-std::string bump_name_once(std::string s);
+std::string bump_name_once(const std::string& s, char delimiter);
 
 int cmp_nocase (const std::string& s, const std::string& s2);
 
-int touch_file(Glib::ustring path);
+int touch_file(std::string path);
 
-Glib::ustring path_expand (Glib::ustring);
-Glib::ustring region_name_from_path (Glib::ustring path, bool strip_channels, bool add_channel_suffix = false, uint32_t total = 0, uint32_t this_one = 0);
-bool path_is_paired (Glib::ustring path, Glib::ustring& pair_base);
+std::string path_expand (std::string);
+std::string region_name_from_path (std::string path, bool strip_channels, bool add_channel_suffix = false, uint32_t total = 0, uint32_t this_one = 0);
+bool path_is_paired (std::string path, std::string& pair_base);
 
 void compute_equal_power_fades (ARDOUR::nframes_t nframes, float* in, float* out);
 
@@ -102,6 +104,9 @@ float meter_falloff_to_float (ARDOUR::MeterFalloff);
 ARDOUR::MeterFalloff meter_falloff_from_float (float);
 float meter_falloff_to_db_per_sec (float);
 
+const char* native_header_format_extension (ARDOUR::HeaderFormat, const ARDOUR::DataType& type);
+bool matching_unsuffixed_filename_exists_in (const std::string& dir, const std::string& name);
+
 #if defined(HAVE_COREAUDIO) || defined(HAVE_AUDIOUNITS)
 std::string CFStringRefToStdString(CFStringRef stringRef);
 #endif // HAVE_COREAUDIO