projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
enough with umpteen "i18n.h" files. Consolidate on pbd/i18n.h
[ardour.git]
/
libs
/
ardour
/
utils.cc
diff --git
a/libs/ardour/utils.cc
b/libs/ardour/utils.cc
index 6d6511bb9f5f377c29d7cd4eb014fcdefe54e45f..8e57cdeac305af0224101dab6b2612b80453d458 100644
(file)
--- a/
libs/ardour/utils.cc
+++ b/
libs/ardour/utils.cc
@@
-33,7
+33,6
@@
#include <cerrno>
#include <iostream>
#include <sys/types.h>
#include <cerrno>
#include <iostream>
#include <sys/types.h>
-#include <sys/stat.h>
#include <sys/time.h>
#include <fcntl.h>
#ifndef COMPILER_MSVC
#include <sys/time.h>
#include <fcntl.h>
#ifndef COMPILER_MSVC
@@
-42,6
+41,8
@@
#include <errno.h>
#include <regex.h>
#include <errno.h>
#include <regex.h>
+#include "pbd/gstdio_compat.h"
+
#include <glibmm/miscutils.h>
#include <glibmm/fileutils.h>
#include <glibmm/miscutils.h>
#include <glibmm/fileutils.h>
@@
-56,7
+57,7
@@
#include "ardour/utils.h"
#include "ardour/rc_configuration.h"
#include "ardour/utils.h"
#include "ardour/rc_configuration.h"
-#include "i18n.h"
+#include "
pbd/
i18n.h"
using namespace ARDOUR;
using namespace std;
using namespace ARDOUR;
using namespace std;
@@
-132,13
+133,13
@@
ARDOUR::legalize_for_uri (const string& str)
* version.
*/
* version.
*/
-string
+string
ARDOUR::legalize_for_path_2X (const string& str)
{
string::size_type pos;
string legal_chars = "abcdefghijklmnopqrtsuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_+=: ";
Glib::ustring legal;
ARDOUR::legalize_for_path_2X (const string& str)
{
string::size_type pos;
string legal_chars = "abcdefghijklmnopqrtsuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_+=: ";
Glib::ustring legal;
-
+
/* this is the one place in Ardour where we need to iterate across
* potential multibyte characters, and thus we need Glib::ustring
*/
/* this is the one place in Ardour where we need to iterate across
* potential multibyte characters, and thus we need Glib::ustring
*/
@@
-296,17
+297,6
@@
ARDOUR::cmp_nocase_utf8 (const string& s1, const string& s2)
return retval;
}
return retval;
}
-int
-ARDOUR::touch_file (string path)
-{
- int fd = open (path.c_str(), O_RDWR|O_CREAT, 0660);
- if (fd >= 0) {
- close (fd);
- return 0;
- }
- return 1;
-}
-
string
ARDOUR::region_name_from_path (string path, bool strip_channels, bool add_channel_suffix, uint32_t total, uint32_t this_one)
{
string
ARDOUR::region_name_from_path (string path, bool strip_channels, bool add_channel_suffix, uint32_t total, uint32_t this_one)
{
@@
-467,6
+457,10
@@
ARDOUR::string_to_sync_source (string str)
return Engine;
}
return Engine;
}
+ if (str == _("LTC")) {
+ return LTC;
+ }
+
fatal << string_compose (_("programming error: unknown sync source string \"%1\""), str) << endmsg;
abort(); /*NOTREACHED*/
return Engine;
fatal << string_compose (_("programming error: unknown sync source string \"%1\""), str) << endmsg;
abort(); /*NOTREACHED*/
return Engine;
@@
-521,11
+515,8
@@
ARDOUR::meter_falloff_to_float (MeterFalloff falloff)
case MeterFalloffModerate:
return METER_FALLOFF_MODERATE;
case MeterFalloffFast:
case MeterFalloffModerate:
return METER_FALLOFF_MODERATE;
case MeterFalloffFast:
- return METER_FALLOFF_FAST;
- case MeterFalloffFaster:
- return METER_FALLOFF_FASTER;
+ case MeterFalloffFaster: // backwards compat enum MeterFalloff
case MeterFalloffFastest:
case MeterFalloffFastest:
- return METER_FALLOFF_FASTEST;
default:
return METER_FALLOFF_FAST;
}
default:
return METER_FALLOFF_FAST;
}
@@
-552,14
+543,8
@@
ARDOUR::meter_falloff_from_float (float val)
else if (val <= METER_FALLOFF_MEDIUM) {
return MeterFalloffMedium;
}
else if (val <= METER_FALLOFF_MEDIUM) {
return MeterFalloffMedium;
}
- else if (val <= METER_FALLOFF_FAST) {
- return MeterFalloffFast;
- }
- else if (val <= METER_FALLOFF_FASTER) {
- return MeterFalloffFaster;
- }
else {
else {
- return MeterFalloffFast
est
;
+ return MeterFalloffFast;
}
}
}
}
@@
-665,6
+650,8
@@
ARDOUR::native_header_format_extension (HeaderFormat hf, const DataType& type)
case iXML:
return ".ixml";
case RF64:
case iXML:
return ".ixml";
case RF64:
+ case RF64_WAV:
+ case MBWF:
return ".rf64";
}
return ".rf64";
}
@@
-676,11
+663,11
@@
ARDOUR::native_header_format_extension (HeaderFormat hf, const DataType& type)
bool
ARDOUR::matching_unsuffixed_filename_exists_in (const string& dir, const string& path)
{
bool
ARDOUR::matching_unsuffixed_filename_exists_in (const string& dir, const string& path)
{
-
string bws = basename_nosuffix (path);
+ string bws = basename_nosuffix (path);
struct dirent* dentry;
struct dirent* dentry;
-
struct stat
statbuf;
+
GStatBuf
statbuf;
DIR* dead;
DIR* dead;
-
bool ret = false;
+ bool ret = false;
if ((dead = ::opendir (dir.c_str())) == 0) {
error << string_compose (_("cannot open directory %1 (%2)"), dir, strerror (errno)) << endl;
if ((dead = ::opendir (dir.c_str())) == 0) {
error << string_compose (_("cannot open directory %1 (%2)"), dir, strerror (errno)) << endl;
@@
-698,7
+685,7
@@
ARDOUR::matching_unsuffixed_filename_exists_in (const string& dir, const string&
string fullpath = Glib::build_filename (dir, dentry->d_name);
string fullpath = Glib::build_filename (dir, dentry->d_name);
- if (
::
stat (fullpath.c_str(), &statbuf)) {
+ if (
g_
stat (fullpath.c_str(), &statbuf)) {
continue;
}
continue;
}
@@
-767,3
+754,4
@@
ARDOUR::slider_position_to_gain_with_max (double g, double max_gain)
extern "C" {
void c_stacktrace() { stacktrace (cerr); }
}
extern "C" {
void c_stacktrace() { stacktrace (cerr); }
}
+