X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Futils.cc;h=8e57cdeac305af0224101dab6b2612b80453d458;hb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;hp=d1d2372977c831cc4168240692347bdabc38bd79;hpb=a1a3f6c8265264227ce19f731bf1863aff229a94;p=ardour.git diff --git a/libs/ardour/utils.cc b/libs/ardour/utils.cc index d1d2372977..8e57cdeac3 100644 --- a/libs/ardour/utils.cc +++ b/libs/ardour/utils.cc @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #ifndef COMPILER_MSVC @@ -42,6 +41,8 @@ #include #include +#include "pbd/gstdio_compat.h" + #include #include @@ -56,7 +57,7 @@ #include "ardour/utils.h" #include "ardour/rc_configuration.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; using namespace std; @@ -93,7 +94,7 @@ replace_chars (const string& str, const string& illegal_chars) * the goal there is to be legal across filesystems. */ string -legalize_for_path (const string& str) +ARDOUR::legalize_for_path (const string& str) { return replace_chars (str, "/\\"); } @@ -108,7 +109,7 @@ legalize_for_path (const string& str) * ANY filesystem. */ string -legalize_for_universal_path (const string& str) +ARDOUR::legalize_for_universal_path (const string& str) { return replace_chars (str, "<>:\"/\\|?*"); } @@ -119,7 +120,7 @@ legalize_for_universal_path (const string& str) * correct. */ string -legalize_for_uri (const string& str) +ARDOUR::legalize_for_uri (const string& str) { return replace_chars (str, "<>:\"/\\|?* #"); } @@ -132,13 +133,13 @@ legalize_for_uri (const string& str) * version. */ -string -legalize_for_path_2X (const string& str) +string +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 */ @@ -155,7 +156,7 @@ legalize_for_path_2X (const string& str) } string -bump_name_once (const std::string& name, char delimiter) +ARDOUR::bump_name_once (const std::string& name, char delimiter) { string::size_type delim; string newname; @@ -196,8 +197,34 @@ bump_name_once (const std::string& name, char delimiter) } +string +ARDOUR::bump_name_number (const std::string& name) +{ + size_t pos = name.length(); + size_t num = 0; + bool have_number = false; + while (pos > 0 && isdigit(name.at(--pos))) { + have_number = true; + num = pos; + } + + string newname; + if (have_number) { + int32_t seq = strtol (name.c_str() + num, (char **)NULL, 10); + char buf[32]; + snprintf (buf, sizeof(buf), "%d", seq + 1); + newname = name.substr (0, num); + newname += buf; + } else { + newname = name; + newname += "1"; + } + + return newname; +} + XMLNode * -find_named_node (const XMLNode& node, string name) +ARDOUR::find_named_node (const XMLNode& node, string name) { XMLNodeList nlist; XMLNodeConstIterator niter; @@ -218,7 +245,7 @@ find_named_node (const XMLNode& node, string name) } int -cmp_nocase (const string& s, const string& s2) +ARDOUR::cmp_nocase (const string& s, const string& s2) { string::const_iterator p = s.begin(); string::const_iterator p2 = s2.begin(); @@ -234,7 +261,8 @@ cmp_nocase (const string& s, const string& s2) return (s2.size() == s.size()) ? 0 : (s.size() < s2.size()) ? -1 : 1; } -int cmp_nocase_utf8 (const string& s1, const string& s2) +int +ARDOUR::cmp_nocase_utf8 (const string& s1, const string& s2) { const char *cstr1 = s1.c_str(); const char *cstr2 = s2.c_str(); @@ -269,19 +297,8 @@ int cmp_nocase_utf8 (const string& s1, const string& s2) return retval; } -int -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 -region_name_from_path (string path, bool strip_channels, bool add_channel_suffix, uint32_t total, uint32_t this_one) +ARDOUR::region_name_from_path (string path, bool strip_channels, bool add_channel_suffix, uint32_t total, uint32_t this_one) { path = PBD::basename_nosuffix (path); @@ -313,7 +330,7 @@ region_name_from_path (string path, bool strip_channels, bool add_channel_suffix } bool -path_is_paired (string path, string& pair_base) +ARDOUR::path_is_paired (string path, string& pair_base) { string::size_type pos; @@ -346,7 +363,7 @@ path_is_paired (string path, string& pair_base) #if __APPLE__ string -CFStringRefToStdString(CFStringRef stringRef) +ARDOUR::CFStringRefToStdString(CFStringRef stringRef) { CFIndex size = CFStringGetMaximumSizeForEncoding(CFStringGetLength(stringRef) , @@ -364,7 +381,7 @@ CFStringRefToStdString(CFStringRef stringRef) #endif // __APPLE__ void -compute_equal_power_fades (framecnt_t nframes, float* in, float* out) +ARDOUR::compute_equal_power_fades (framecnt_t nframes, float* in, float* out) { double step; @@ -390,22 +407,24 @@ compute_equal_power_fades (framecnt_t nframes, float* in, float* out) } EditMode -string_to_edit_mode (string str) +ARDOUR::string_to_edit_mode (string str) { if (str == _("Splice")) { return Splice; } else if (str == _("Slide")) { return Slide; + } else if (str == _("Ripple")) { + return Ripple; } else if (str == _("Lock")) { return Lock; } fatal << string_compose (_("programming error: unknown edit mode string \"%1\""), str) << endmsg; - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ return Slide; } const char* -edit_mode_to_string (EditMode mode) +ARDOUR::edit_mode_to_string (EditMode mode) { switch (mode) { case Slide: @@ -414,6 +433,9 @@ edit_mode_to_string (EditMode mode) case Lock: return _("Lock"); + case Ripple: + return _("Ripple"); + default: case Splice: return _("Splice"); @@ -421,7 +443,7 @@ edit_mode_to_string (EditMode mode) } SyncSource -string_to_sync_source (string str) +ARDOUR::string_to_sync_source (string str) { if (str == _("MIDI Timecode") || str == _("MTC")) { return MTC; @@ -435,14 +457,18 @@ string_to_sync_source (string str) return Engine; } + if (str == _("LTC")) { + return LTC; + } + fatal << string_compose (_("programming error: unknown sync source string \"%1\""), str) << endmsg; - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ return Engine; } /** @param sh Return a short version of the string */ const char* -sync_source_to_string (SyncSource src, bool sh) +ARDOUR::sync_source_to_string (SyncSource src, bool sh) { switch (src) { case Engine: @@ -473,7 +499,7 @@ sync_source_to_string (SyncSource src, bool sh) } float -meter_falloff_to_float (MeterFalloff falloff) +ARDOUR::meter_falloff_to_float (MeterFalloff falloff) { switch (falloff) { case MeterFalloffOff: @@ -489,18 +515,15 @@ meter_falloff_to_float (MeterFalloff falloff) 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: - return METER_FALLOFF_FASTEST; default: return METER_FALLOFF_FAST; } } MeterFalloff -meter_falloff_from_float (float val) +ARDOUR::meter_falloff_from_float (float val) { if (val == METER_FALLOFF_OFF) { return MeterFalloffOff; @@ -520,14 +543,8 @@ meter_falloff_from_float (float val) 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 { - return MeterFalloffFastest; + return MeterFalloffFast; } } @@ -545,7 +562,7 @@ ARDOUR::string_to_auto_state (std::string str) } fatal << string_compose (_("programming error: %1 %2"), "illegal AutoState string: ", str) << endmsg; - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ return Touch; } @@ -569,7 +586,7 @@ ARDOUR::auto_state_to_string (AutoState as) } fatal << string_compose (_("programming error: %1 %2"), "illegal AutoState type: ", as) << endmsg; - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ return ""; } @@ -583,7 +600,7 @@ ARDOUR::string_to_auto_style (std::string str) } fatal << string_compose (_("programming error: %1 %2"), "illegal AutoStyle string: ", str) << endmsg; - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ return Trim; } @@ -602,7 +619,7 @@ ARDOUR::auto_style_to_string (AutoStyle as) } fatal << string_compose (_("programming error: %1 %2"), "illegal AutoStyle type: ", as) << endmsg; - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ return ""; } @@ -613,7 +630,7 @@ bool_as_string (bool yn) } const char* -native_header_format_extension (HeaderFormat hf, const DataType& type) +ARDOUR::native_header_format_extension (HeaderFormat hf, const DataType& type) { if (type == DataType::MIDI) { return ".mid"; @@ -633,22 +650,24 @@ native_header_format_extension (HeaderFormat hf, const DataType& type) case iXML: return ".ixml"; case RF64: + case RF64_WAV: + case MBWF: return ".rf64"; } fatal << string_compose (_("programming error: unknown native header format: %1"), hf); - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ return ".wav"; } bool -matching_unsuffixed_filename_exists_in (const string& dir, const string& path) +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 stat statbuf; + GStatBuf statbuf; 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; @@ -666,7 +685,7 @@ matching_unsuffixed_filename_exists_in (const string& dir, const string& path) string fullpath = Glib::build_filename (dir, dentry->d_name); - if (::stat (fullpath.c_str(), &statbuf)) { + if (g_stat (fullpath.c_str(), &statbuf)) { continue; } @@ -687,7 +706,7 @@ matching_unsuffixed_filename_exists_in (const string& dir, const string& path) } uint32_t -how_many_dsp_threads () +ARDOUR::how_many_dsp_threads () { /* CALLER MUST HOLD PROCESS LOCK */ @@ -720,12 +739,14 @@ how_many_dsp_threads () return num_threads; } -double gain_to_slider_position_with_max (double g, double max_gain) +double +ARDOUR::gain_to_slider_position_with_max (double g, double max_gain) { return gain_to_slider_position (g * 2.0/max_gain); } -double slider_position_to_gain_with_max (double g, double max_gain) +double +ARDOUR::slider_position_to_gain_with_max (double g, double max_gain) { return slider_position_to_gain (g * max_gain/2.0); } @@ -733,3 +754,4 @@ double slider_position_to_gain_with_max (double g, double max_gain) extern "C" { void c_stacktrace() { stacktrace (cerr); } } +