smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-07 14:15:46 +01:00
Code Issues Projects Releases Wiki Activity

make timecode offset work

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@13418 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Robin Gareus 2012-11-09 17:27:30 +00:00
parent ca7e72db62
commit c27dde889c
4 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
gtk2_ardour/option_editor.cc
View file

@ -293,12 +293,19 @@ ClockOption::ClockOption (string const & i, string const & n, sigc::slot<framecn
_label.set_text (n + ":");
_label.set_alignment (0, 0.5);
_label.set_name (X_("OptionsLabel"));
_clock.ValueChanged.connect (sigc::mem_fun (*this, &ClockOption::save_clock_time));
}
void
ClockOption::set_state_from_config ()
{
_clock.set (_get ());
_clock.set (_get (), true);
}
void
ClockOption::save_clock_time ()
{
_set (_clock.current_time());
}
void

1
gtk2_ardour/option_editor.h
View file

@ -543,6 +543,7 @@ public:
Gtk::Widget& tip_widget() { return _clock; }
private:
void save_clock_time ();
Gtk::Label _label;
AudioClock _clock;
sigc::slot<ARDOUR::framecnt_t> _get;

2
libs/ardour/ltc_slave.cc
View file

@ -331,7 +331,7 @@ LTC_Slave::process_ltc(framepos_t const now)
/* map LTC timecode to session TC setting */
framepos_t ltc_frame; ///< audio-frame corresponding to LTC frame
Timecode::timecode_to_sample (timecode, ltc_frame, true, false,
Timecode::timecode_to_sample (timecode, ltc_frame, false, false,
double(session.frame_rate()),
session.config.get_subframes_per_frame(),
session.config.get_timecode_offset_negative(), session.config.get_timecode_offset()

2
libs/ardour/mtc_slave.cc
View file

@ -387,7 +387,7 @@ MTC_Slave::update_mtc_time (const byte *msg, bool was_full, framepos_t now)
quarter_frame_duration = (double(session.frame_rate()) / (double) timecode.rate / 4.0);
Timecode::timecode_to_sample (timecode, mtc_frame, true, false,
Timecode::timecode_to_sample (timecode, mtc_frame, false, false,
double(session.frame_rate()),
session.config.get_subframes_per_frame(),
session.config.get_timecode_offset_negative(), session.config.get_timecode_offset()