From 2e8f80e37a7d20deb3f138cd72c26f8c6de9d1ab Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 14 Apr 2007 18:39:01 +0000 Subject: Merged with trunk R1719. Updated for Jack MIDI SVN branch (required for now). git-svn-id: svn://localhost/ardour2/branches/midi@1720 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/session_time.cc | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'libs/ardour/session_time.cc') diff --git a/libs/ardour/session_time.cc b/libs/ardour/session_time.cc index 281c3a3315..a388e31d80 100644 --- a/libs/ardour/session_time.cc +++ b/libs/ardour/session_time.cc @@ -158,14 +158,6 @@ Session::sync_time_vars () } _smpte_frames_per_hour = (nframes_t)rint(smpte_frames_per_second() * 3600.0); -} - -int -Session::set_smpte_format (SmpteFormat format) -{ - - Config->set_smpte_format (format); - last_smpte_valid = false; // smpte type bits are the middle two in the upper nibble switch ((int) ceil (smpte_frames_per_second())) { @@ -186,7 +178,13 @@ Session::set_smpte_format (SmpteFormat format) } break; }; +} +int +Session::set_smpte_format (SmpteFormat format) +{ + /* this will trigger any other changes needed */ + Config->set_smpte_format (format); return 0; } -- cgit v1.2.3