add VCA::full_name() which returns "VCA %n" : VCA %n" by default and "VCA %n : user...

[ardour.git] / libs / ardour / ltc_slave.cc

diff --git a/libs/ardour/ltc_slave.cc b/libs/ardour/ltc_slave.cc
index ab84cf6201b11aa4153b82561a019446d7f7af70..2501378017d9de198aefcc5032240207dc5c20f5 100644 (file)
--- a/libs/ardour/ltc_slave.cc
+++ b/libs/ardour/ltc_slave.cc
@@ -32,7 +32,7 @@
 #include "ardour/audioengine.h"
 #include "ardour/audio_port.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -45,7 +45,7 @@ using namespace Timecode;
 LTC_Slave::LTC_Slave (Session& s)
        : session (s)
 {
-       frames_per_ltc_frame = session.frames_per_timecode_frame();
+       frames_per_ltc_frame = session.samples_per_timecode_frame();
        timecode.rate = session.timecode_frames_per_second();
        timecode.drop  = session.timecode_drop_frames();
 
@@ -365,13 +365,13 @@ LTC_Slave::process_ltc(framepos_t const /*now*/)
                        ltc_frame_increment(&frame.ltc, fps_i, tv_standard, 0);
                        ltc_frame_to_time(&stime, &frame.ltc, 0);
                        transport_direction = 1;
-                       frame.off_start -= ltc_frame_alignment(session.frames_per_timecode_frame(), tv_standard);
-                       frame.off_end -= ltc_frame_alignment(session.frames_per_timecode_frame(), tv_standard);
+                       frame.off_start -= ltc_frame_alignment(session.samples_per_timecode_frame(), tv_standard);
+                       frame.off_end -= ltc_frame_alignment(session.samples_per_timecode_frame(), tv_standard);
                } else {
                        ltc_frame_decrement(&frame.ltc, fps_i, tv_standard, 0);
                        int off = frame.off_end - frame.off_start;
-                       frame.off_start += off - ltc_frame_alignment(session.frames_per_timecode_frame(), tv_standard);
-                       frame.off_end += off - ltc_frame_alignment(session.frames_per_timecode_frame(), tv_standard);
+                       frame.off_start += off - ltc_frame_alignment(session.samples_per_timecode_frame(), tv_standard);
+                       frame.off_end += off - ltc_frame_alignment(session.samples_per_timecode_frame(), tv_standard);
                        transport_direction = -1;
                }