X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fpbd%2Fconvert.cc;h=660891076d1c908390bb9c4b0e07293ff48d7447;hb=a7df009de73ad38026ff97d9aeafb8e2aa22e627;hp=940aa871899390a5278e3b0c430c71c2cc2501d5;hpb=b6a9bf5d043bf74cdb5aebc11b54e0c187e225ad;p=ardour.git diff --git a/libs/pbd/convert.cc b/libs/pbd/convert.cc index 940aa87189..660891076d 100644 --- 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 #include -#include +#include #include #include @@ -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') ) { @@ -249,18 +249,18 @@ length2string (const int64_t frames, const double sample_rate) 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; - + 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()) {