Move all beats <-> frames time conversion into a single object that can be passed...

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

diff --git a/libs/ardour/ardour/utils.h b/libs/ardour/ardour/utils.h
index ee4482d26061cf8c880862cd7ea4c7b7c7d31b58..eecde2e85f0bc37c80bad475955bcbab6b1f9fc3 100644 (file)
--- a/libs/ardour/ardour/utils.h
+++ b/libs/ardour/ardour/utils.h
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #ifndef __ardour_utils_h__
@@ -25,7 +24,7 @@
 #include <string>
 #include <cmath>
 
-#ifdef HAVE_COREAUDIO
+#if defined(HAVE_COREAUDIO) || defined(HAVE_AUDIOUNITS)
 #include <CoreFoundation/CoreFoundation.h>
 #endif
 
@@ -33,11 +32,9 @@
 
 class XMLNode;
 
-void elapsed_time_to_str (char *buf, uint32_t seconds);
-std::string legalize_for_path (std::string str);
+Glib::ustring legalize_for_path (Glib::ustring str);
 std::ostream& operator<< (std::ostream& o, const ARDOUR::BBT_Time& bbt);
 XMLNode* find_named_node (const XMLNode& node, std::string name);
-std::string placement_as_string (ARDOUR::Placement);
 
 static inline float f_max(float x, float a) {
        x -= a;
@@ -48,17 +45,32 @@ static inline float f_max(float x, float a) {
        return (x);
 }
 
+std::string bump_name_once(std::string s);
+
 int cmp_nocase (const std::string& s, const std::string& s2);
 
-int tokenize_fullpath (std::string fullpath, std::string& path, std::string& name);
+int touch_file(Glib::ustring 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);
+
+void compute_equal_power_fades (nframes_t nframes, float* in, float* out);
 
-int touch_file(std::string path);
+const char* slave_source_to_string (ARDOUR::SlaveSource src);
+ARDOUR::SlaveSource string_to_slave_source (std::string str);
 
-std::string region_name_from_path (std::string path);
-std::string path_expand (std::string);
+const char* edit_mode_to_string (ARDOUR::EditMode);
+ARDOUR::EditMode string_to_edit_mode (std::string);
 
-#ifdef HAVE_COREAUDIO
+float meter_falloff_to_float (ARDOUR::MeterFalloff);
+ARDOUR::MeterFalloff meter_falloff_from_float (float);
+float meter_falloff_to_db_per_sec (float);
+float meter_hold_to_float (ARDOUR::MeterHold);
+
+#if defined(HAVE_COREAUDIO) || defined(HAVE_AUDIOUNITS)
 std::string CFStringRefToStdString(CFStringRef stringRef);
 #endif // HAVE_COREAUDIO
 
 #endif /* __ardour_utils_h__ */
+