globally change all use of "frame" to refer to audio into "sample".

[ardour.git] / libs / pbd / convert.cc

diff --git a/libs/pbd/convert.cc b/libs/pbd/convert.cc
index 940aa871899390a5278e3b0c430c71c2cc2501d5..3fdb8af71d5746e8d96b71ada41c1ff787892b9b 100644 (file)
--- a/libs/pbd/convert.cc
+++ b/libs/pbd/convert.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2006 Paul Davis 
+    Copyright (C) 2006 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
 
 #include <cmath>
 #include <algorithm>
-#include <string> 
+#include <string>
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -35,7 +35,7 @@
 
 #include "pbd/convert.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using std::string;
 using std::vector;
@@ -132,7 +132,7 @@ short_version (string orig, string::size_type target_length)
        }
 
        /* whatever the length is now, use it */
-       
+
        return orig;
 }
 
@@ -172,8 +172,8 @@ internationalize (const char *package_name, const char **array)
        return v;
 }
 
-static int32_t 
-int_from_hex (char hic, char loc) 
+static int32_t
+int_from_hex (char hic, char loc)
 {
        int hi;         /* hi byte */
        int lo;         /* low byte */
@@ -187,9 +187,9 @@ int_from_hex (char hic, char loc)
        } else if( ('A'<=hi) && (hi<='F') ) {
                hi -= ('A'-10);
        }
-       
+
        lo = (int) loc;
-       
+
        if( ('0'<=lo) && (lo<='9') ) {
                lo -= '0';
        } else if( ('a'<=lo) && (lo<='f') ) {
@@ -222,17 +222,17 @@ url_decode (string const & url)
 
 #if 0
 string
-length2string (const int32_t frames, const float sample_rate)
+length2string (const int32_t samples, const float sample_rate)
 {
-    int32_t secs = (int32_t) (frames / sample_rate);
+    int32_t secs = (int32_t) (samples / sample_rate);
     int32_t hrs =  secs / 3600;
     secs -= (hrs * 3600);
     int32_t mins = secs / 60;
     secs -= (mins * 60);
 
     int32_t total_secs = (hrs * 3600) + (mins * 60) + secs;
-    int32_t frames_remaining = (int) floor (frames - (total_secs * sample_rate));
-    float fractional_secs = (float) frames_remaining / sample_rate;
+    int32_t samples_remaining = (int) floor (samples - (total_secs * sample_rate));
+    float fractional_secs = (float) samples_remaining / sample_rate;
 
     char duration_str[32];
     sprintf (duration_str, "%02" PRIi32 ":%02" PRIi32 ":%05.2f", hrs, mins, (float) secs + fractional_secs);
@@ -242,25 +242,25 @@ length2string (const int32_t frames, const float sample_rate)
 #endif
 
 string
-length2string (const int64_t frames, const double sample_rate)
+length2string (const int64_t samples, const double sample_rate)
 {
-       int64_t secs = (int64_t) floor (frames / sample_rate);
+       int64_t secs = (int64_t) floor (samples / sample_rate);
        int64_t hrs =  secs / 3600LL;
        secs -= (hrs * 3600LL);
        int64_t mins = secs / 60LL;
        secs -= (mins * 60LL);
-       
+
        int64_t total_secs = (hrs * 3600LL) + (mins * 60LL) + secs;
-       int64_t frames_remaining = (int64_t) floor (frames - (total_secs * sample_rate));
-       float fractional_secs = (float) frames_remaining / sample_rate;
-       
+       int64_t samples_remaining = (int64_t) floor (samples - (total_secs * sample_rate));
+       float fractional_secs = (float) samples_remaining / sample_rate;
+
        char duration_str[64];
        sprintf (duration_str, "%02" PRIi64 ":%02" PRIi64 ":%05.2f", hrs, mins, (float) secs + fractional_secs);
-       
+
        return duration_str;
 }
 
-static bool 
+static bool
 chars_equal_ignore_case(char x, char y)
 {
        /* app should have called setlocale() if its wants this comparison to be
@@ -269,7 +269,7 @@ chars_equal_ignore_case(char x, char y)
        return toupper (x) == toupper (y);
 }
 
-bool 
+bool
 strings_equal_ignore_case (const string& a, const string& b)
 {
        if (a.length() == b.length()) {
@@ -278,26 +278,6 @@ strings_equal_ignore_case (const string& a, const string& b)
        return false;
 }
 
-bool
-string_is_affirmative (const std::string& str)
-{
-       /* to be used only with XML data - not intended to handle user input */
-
-       if (str.empty ()) {
-               return false;
-       }
-
-       /* the use of g_ascii_strncasecmp() is solely to get around issues with
-        * charsets posed by trying to use C++ for the same
-        * comparison. switching a std::string to its lower- or upper-case
-        * version has several issues, but handled by default
-        * in the way we desire when doing it in C.
-        */
-
-       return str == "1" || str == "y" || str == "Y" || (!g_ascii_strncasecmp(str.c_str(), "yes", str.length())) ||
-               (!g_ascii_strncasecmp(str.c_str(), "true", str.length()));
-}
-
 /** A wrapper for dgettext that takes a msgid of the form Context|Text.
  *  If Context|Text is translated, the translation is returned, otherwise
  *  just Text is returned.  Useful for getting translations of words or phrases