projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 64e06b6f12cac0bf1b3099eed7e8e64467cbbdd6..f9d16a47b49050ff9c661838d0896ae8e88a7cc3 100644
(file)
--- a/
libs/ardour/utils.cc
+++ b/
libs/ardour/utils.cc
@@
-400,7
+400,7
@@
edit_mode_to_string (EditMode mode)
SyncSource
string_to_sync_source (string str)
{
SyncSource
string_to_sync_source (string str)
{
- if (str == _("MIDI Timecode")) {
+ if (str == _("MIDI Timecode")
|| str == _("MTC")
) {
return MTC;
}
return MTC;
}
@@
-417,15
+417,20
@@
string_to_sync_source (string str)
return JACK;
}
return JACK;
}
+/** @param sh Return a short version of the string */
const char*
const char*
-sync_source_to_string (SyncSource src)
+sync_source_to_string (SyncSource src
, bool sh
)
{
switch (src) {
case JACK:
return _("JACK");
case MTC:
{
switch (src) {
case JACK:
return _("JACK");
case MTC:
- return _("MIDI Timecode");
+ if (sh) {
+ return _("MTC");
+ } else {
+ return _("MIDI Timecode");
+ }
case MIDIClock:
return _("MIDI Clock");
case MIDIClock:
return _("MIDI Clock");