merge -r 13409:13412 svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0

git-svn-id: svn://localhost/ardour2/branches/3.0-SG@13413 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-11-09 14:43:08 +00:00
parent 98a70a905b
commit e793fbf211
5 changed files with 28 additions and 26 deletions

View file

@ -563,21 +563,15 @@ timecode_format_name (TimecodeFormat const t)
return "25";
break;
case timecode_2997000:
case timecode_2997:
return "29.97";
break;
case timecode_2997000drop:
case timecode_2997drop:
return "29.97 drop";
break;
case timecode_2997000:
return "29.97000";
break;
case timecode_2997000drop:
return "29.97000 drop";
break;
case timecode_30:
return "30";