X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Futils.h;h=f3767d471a3c4a03a4ce90a7ef01fde5fd7b817f;hb=dbfe991cd862aa1d420c65c9808e5f4e199995ed;hp=6dba01c79754b9782d41956b709a9f8806ae1e20;hpb=e7c47747286c16aa575456b07120e1e8e8271bd5;p=ardour.git

diff --git a/libs/ardour/ardour/utils.h b/libs/ardour/ardour/utils.h
index 6dba01c797..f3767d471a 100644
--- a/libs/ardour/ardour/utils.h
+++ b/libs/ardour/ardour/utils.h
@@ -39,6 +39,8 @@
 
 class XMLNode;
 
+namespace ARDOUR {
+
 LIBARDOUR_API std::string legalize_for_path (const std::string& str);
 LIBARDOUR_API std::string legalize_for_universal_path (const std::string& str);
 LIBARDOUR_API std::string legalize_for_uri (const std::string& str);
@@ -56,12 +58,11 @@ static inline float f_max(float x, float a) {
 }
 
 LIBARDOUR_API std::string bump_name_once(const std::string& s, char delimiter);
+LIBARDOUR_API std::string bump_name_number(const std::string& s);
 
 LIBARDOUR_API int cmp_nocase (const std::string& s, const std::string& s2);
 LIBARDOUR_API int cmp_nocase_utf8 (const std::string& s1, const std::string& s2);
 
-LIBARDOUR_API int touch_file(std::string path);
-
 LIBARDOUR_API 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);
 LIBARDOUR_API bool path_is_paired (std::string path, std::string& pair_base);
 
@@ -92,7 +93,7 @@ gain_to_slider_position (ARDOUR::gain_t g)
 	   K =  7.8990885960495589E+00
 
 	 */
-	
+
 	return 8.2857630370864188E-01 * pow(g,5.1526743785019269E-01) * exp (-g/7.8990885960495589E+00);
 #else
 	return pow((6.0*log(g)/log(2.0)+192.0)/198.0, 8.0);
@@ -109,9 +110,9 @@ slider_position_to_gain (double pos)
 #ifndef OLD_GAIN_MATH
 	/* 5th order polynomial function fit to data from a TC Spectra console
 	   fader (image of fader gradations).
-	 
+
 	   y = a + bx1 + cx2 + dx3 + fx4 + gx5
-	   
+
 	   a = -1.1945480381045521E-02
 	   b =  1.5809476525537265E+00
 	   c = -1.5850710838966151E+01
@@ -158,8 +159,6 @@ LIBARDOUR_API double slider_position_to_gain_with_max (double g, double max_gain
 #define METER_FALLOFF_MODERATE  13.3f // EBU-PPM, IRT PPM-   20dB / 1.5 sec
 #define METER_FALLOFF_MEDIUM    20.0f
 #define METER_FALLOFF_FAST      32.0f
-#define METER_FALLOFF_FASTER    46.0f
-#define METER_FALLOFF_FASTEST   70.0f
 
 LIBARDOUR_API float meter_falloff_to_float (ARDOUR::MeterFalloff);
 LIBARDOUR_API ARDOUR::MeterFalloff meter_falloff_from_float (float);
@@ -174,5 +173,7 @@ LIBARDOUR_API uint32_t how_many_dsp_threads ();
 LIBARDOUR_API std::string CFStringRefToStdString(CFStringRef stringRef);
 #endif // __APPLE__
 
+} //namespave
+
 #endif /* __ardour_utils_h__ */