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

git-svn-id: svn://localhost/ardour2/branches/3.0-SG@13410 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-11-09 13:34:58 +00:00
parent 8bb2a5b241
commit 98a70a905b
11 changed files with 854 additions and 82 deletions

View file

@ -26,7 +26,7 @@
namespace Timecode {
float Time::default_rate = 30.0;
double Time::default_rate = 30.0;
/** Increment @a timecode by exactly one frame (keep subframes value).
@ -424,7 +424,7 @@ hours_floor(Time& timecode)
}
}
float
double
timecode_to_frames_per_second(TimecodeFormat t)
{
switch (t) {