smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-25 07:57:43 +01:00
Code Issues Projects Releases Wiki Activity

merge 13363:13398 svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0, plus further work on SG (forgot to commit right after the merge, thus confusing things a bit

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@13409 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-11-09 13:28:54 +00:00
parent e9a7cf6584
commit 8bb2a5b241
34 changed files with 696 additions and 424 deletions
Download patch file Download diff file Expand all files Collapse all files

26
libs/timecode/src/time.cc
View file

@ -445,12 +445,20 @@ timecode_to_frames_per_second(TimecodeFormat t)
break;
case timecode_2997:
return 29.97;
return (30000.0/1001.0); //29.97;
break;
case timecode_2997drop:
return (30000.0/1001.0); //29.97;
break;
case timecode_2997000:
return 29.97;
break;
case timecode_2997000drop:
return 29.97;
break;
case timecode_30:
return 30;
@ -502,6 +510,14 @@ timecode_has_drop_frames(TimecodeFormat t)
case timecode_2997drop:
return true;
break;
case timecode_2997000:
return false;
break;
case timecode_2997000drop:
return true;
break;
case timecode_30:
return false;
@ -554,6 +570,14 @@ timecode_format_name (TimecodeFormat const t)
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";