major, substantive reworking of how we store GUI information (visibility, height...

[ardour.git] / libs / ardour / ardour / utils.h

diff --git a/libs/ardour/ardour/utils.h b/libs/ardour/ardour/utils.h
index f3f9c4182c0afde8c38ea3ddae7576afa22e50aa..dac4086cba46b9d61c95a51ba8aedc9f13f4f3b4 100644 (file)
--- a/libs/ardour/ardour/utils.h
+++ b/libs/ardour/ardour/utils.h
@@ -28,9 +28,9 @@
 #include <string>
 #include <cmath>
 
-#if defined(HAVE_COREAUDIO) || defined(HAVE_AUDIOUNITS)
+#if __APPLE__
 #include <CoreFoundation/CoreFoundation.h>
-#endif
+#endif /* __APPLE__ */
 
 bool string_is_affirmative (const std::string&);
 
@@ -39,7 +39,7 @@ bool string_is_affirmative (const std::string&);
 
 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);
 
@@ -56,15 +56,15 @@ 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);
+void compute_equal_power_fades (ARDOUR::framecnt_t nframes, float* in, float* out);
 
-const char* sync_source_to_string (ARDOUR::SyncSource src);
+const char* sync_source_to_string (ARDOUR::SyncSource src, bool sh = false);
 ARDOUR::SyncSource string_to_sync_source (std::string str);
 
 const char* edit_mode_to_string (ARDOUR::EditMode);
@@ -107,9 +107,11 @@ 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)
+uint32_t how_many_dsp_threads ();
+
+#if __APPLE__
 std::string CFStringRefToStdString(CFStringRef stringRef);
-#endif // HAVE_COREAUDIO
+#endif // __APPLE__
 
 #endif /* __ardour_utils_h__ */