diff options
author | David Robillard <d@drobilla.net> | 2006-06-15 21:54:26 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2006-06-15 21:54:26 +0000 |
commit | 6313751f753c4e85116b0fcdaaf21e4d8369b4af (patch) | |
tree | fde36406fa61cc45c18571e6e062a7d23e5f4819 /gtk2_ardour/audio_clock.cc | |
parent | 4ef0bd23109d0a05a46f71e90676a58642dfabc5 (diff) |
Moved SMPTE type/functions into SMPTE namespace;
LGPL'd SMPTE code and moved in to libardour_cp;
Juggled control_protocol dir layout to be the same as other libs;
git-svn-id: svn://localhost/ardour2/trunk@610 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/audio_clock.cc')
-rw-r--r-- | gtk2_ardour/audio_clock.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc index 8289fac8a7..25985c4a3b 100644 --- a/gtk2_ardour/audio_clock.cc +++ b/gtk2_ardour/audio_clock.cc @@ -457,7 +457,7 @@ void AudioClock::set_smpte (jack_nframes_t when, bool force) { char buf[32]; - SMPTE_Time smpte; + SMPTE::Time smpte; if (is_duration) { session->smpte_duration (when, smpte); @@ -1281,7 +1281,7 @@ AudioClock::smpte_frame_from_display () const return 0; } - SMPTE_Time smpte; + SMPTE::Time smpte; jack_nframes_t sample; smpte.hours = atoi (hours_label.get_text()); @@ -1302,10 +1302,10 @@ AudioClock::smpte_frame_from_display () const #define SMPTE_SAMPLE_TEST_7 // Testcode for smpte<->sample conversions (P.S.) - SMPTE_Time smpte1; + SMPTE::Time smpte1; jack_nframes_t sample1; jack_nframes_t oldsample = 0; - SMPTE_Time smpte2; + SMPTE::Time smpte2; jack_nframes_t sample_increment; sample_increment = (long)rint(session->frame_rate() / session->smpte_frames_per_second); |