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 20badf5ea1c9248bb18ca12cb2fe32ef0ad54dc1..eecde2e85f0bc37c80bad475955bcbab6b1f9fc3 100644 (file)
--- a/libs/ardour/ardour/utils.h
+++ b/libs/ardour/ardour/utils.h
@@ -32,7 +32,6 @@
 
 class XMLNode;
 
-void elapsed_time_to_str (char *buf, uint32_t seconds);
 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);
@@ -46,14 +45,14 @@ static inline float f_max(float x, float a) {
        return (x);
 }
 
-int cmp_nocase (const std::string& s, const std::string& s2);
+std::string bump_name_once(std::string s);
 
-int tokenize_fullpath (std::string fullpath, std::string& path, std::string& name);
+int cmp_nocase (const std::string& s, const std::string& s2);
 
 int touch_file(Glib::ustring path);
 
 Glib::ustring path_expand (Glib::ustring);
-Glib::ustring region_name_from_path (Glib::ustring path, bool strip_channels);
+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);