Respond to MMC even when synced to JACK. Fixes #3700.

[ardour.git] / libs / ardour / utils.cc

diff --git a/libs/ardour/utils.cc b/libs/ardour/utils.cc
index 6604a93d4a783a8cb97f85849bb7f8da27d1b53a..f9d16a47b49050ff9c661838d0896ae8e88a7cc3 100644 (file)
--- a/libs/ardour/utils.cc
+++ b/libs/ardour/utils.cc
@@ -21,7 +21,6 @@
 #include "libardour-config.h"
 #endif
 
-#define __STDC_FORMAT_MACROS 1
 #include <stdint.h>
 
 #include <cstdio> /* for sprintf */
@@ -322,7 +321,7 @@ path_expand (string path)
 #endif
 }
 
-#if defined(HAVE_COREAUDIO) || defined(HAVE_AUDIOUNITS)
+#if __APPLE__
 string
 CFStringRefToStdString(CFStringRef stringRef)
 {
@@ -339,10 +338,10 @@ CFStringRefToStdString(CFStringRef stringRef)
        delete [] buf;
        return result;
 }
-#endif // HAVE_COREAUDIO
+#endif // __APPLE__
 
 void
-compute_equal_power_fades (nframes_t nframes, float* in, float* out)
+compute_equal_power_fades (framecnt_t nframes, float* in, float* out)
 {
        double step;
 
@@ -350,7 +349,7 @@ compute_equal_power_fades (nframes_t nframes, float* in, float* out)
 
        in[0] = 0.0f;
 
-       for (nframes_t i = 1; i < nframes - 1; ++i) {
+       for (framecnt_t i = 1; i < nframes - 1; ++i) {
                in[i] = in[i-1] + step;
        }
 
@@ -359,7 +358,7 @@ compute_equal_power_fades (nframes_t nframes, float* in, float* out)
        const float pan_law_attenuation = -3.0f;
        const float scale = 2.0f - 4.0f * powf (10.0f,pan_law_attenuation/20.0f);
 
-       for (nframes_t n = 0; n < nframes; ++n) {
+       for (framecnt_t n = 0; n < nframes; ++n) {
                float inVal = in[n];
                float outVal = 1 - inVal;
                out[n] = outVal * (scale * outVal + 1.0f - scale);
@@ -401,7 +400,7 @@ edit_mode_to_string (EditMode mode)
 SyncSource
 string_to_sync_source (string str)
 {
-       if (str == _("MIDI Timecode")) {
+       if (str == _("MIDI Timecode") || str == _("MTC")) {
                return MTC;
        }
 
@@ -418,15 +417,20 @@ string_to_sync_source (string str)
        return JACK;
 }
 
+/** @param sh Return a short version of the string */
 const char*
-sync_source_to_string (SyncSource src)
+sync_source_to_string (SyncSource src, bool sh)
 {
        switch (src) {
        case JACK:
                return _("JACK");
 
        case MTC:
-               return _("MIDI Timecode");
+               if (sh) {
+                       return _("MTC");
+               } else {
+                       return _("MIDI Timecode");
+               }
 
        case MIDIClock:
                return _("MIDI Clock");