smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-06 05:35:47 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into windows+cc

Browse source 
Conflicts (hopefully resolved):
	gtk2_ardour/ardour_ui.cc
	gtk2_ardour/ardour_ui.h
	gtk2_ardour/ardour_ui_options.cc
This commit is contained in:
John Emmas 2013-10-06 11:56:03 +01:00
commit 300b484cf6
54 changed files with 2274 additions and 1923 deletions
Download patch file Download diff file Expand all files Collapse all files

9
libs/ardour/utils.cc
View file

@ -397,12 +397,12 @@ string_to_sync_source (string str)
}
if (str == _("JACK")) {
return JACK;
return Engine;
}
fatal << string_compose (_("programming error: unknown sync source string \"%1\""), str) << endmsg;
/*NOTREACHED*/
return JACK;
return Engine;
}
/** @param sh Return a short version of the string */
@ -410,7 +410,10 @@ const char*
sync_source_to_string (SyncSource src, bool sh)
{
switch (src) {
case JACK:
case Engine:
/* no other backends offer sync for now ... deal with this if we
* ever have to.
*/
return _("JACK");
case MTC: