summaryrefslogtreecommitdiff
path: root/libs/ardour/session_time.cc
diff options
context:
space:
mode:
authorNick Mainsbridge <beatroute@iprimus.com.au>2006-12-08 22:08:36 +0000
committerNick Mainsbridge <beatroute@iprimus.com.au>2006-12-08 22:08:36 +0000
commit6146d6aa6f32b79bb0fe573fe00134b6159a7325 (patch)
tree8364ed5b81deab92c3c70d8a671a0a2d846586fb /libs/ardour/session_time.cc
parent3039691723ae9fb11f05d763c2813222488a59e3 (diff)
Unbreak SMPTE ruler at non-30fps rates. Display 60fps properly. Use the same data types for SMPTE::Time.rate and dropframe as are used in Config.
git-svn-id: svn://localhost/ardour2/trunk@1198 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/session_time.cc')
-rw-r--r--libs/ardour/session_time.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/libs/ardour/session_time.cc b/libs/ardour/session_time.cc
index bc9778052f..61051e4632 100644
--- a/libs/ardour/session_time.cc
+++ b/libs/ardour/session_time.cc
@@ -281,6 +281,9 @@ Session::sample_to_smpte( nframes_t sample, SMPTE::Time& smpte, bool use_offset,
if (!use_subframes) {
smpte.subframes = 0;
}
+ /* set frame rate and drop frame */
+ smpte.rate = Config->get_smpte_frames_per_second ();
+ smpte.drop = Config->get_smpte_drop_frames();
}
void