smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-08 15:54:57 +01:00
Code Issues Projects Releases Wiki Activity

MIDIClock is not a Timecode slave, fix segfault

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@13446 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Robin Gareus 2012-11-11 23:11:53 +00:00
parent 6657159ba8
commit 4e1a813f4d
2 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
gtk2_ardour/ardour_ui.cc
View file

@ -1077,8 +1077,9 @@ ARDOUR_UI::update_timecode_format ()
if (_session) { if (_session) {
bool matching; bool matching;
TimecodeSlave* tcslave; TimecodeSlave* tcslave;
SyncSource sync_src = Config->get_sync_source();
if ((tcslave = dynamic_cast<TimecodeSlave*>(_session->slave())) != 0) { if ((sync_src == LTC || sync_src == MTC) && (tcslave = dynamic_cast<TimecodeSlave*>(_session->slave())) != 0) {
matching = (tcslave->apparent_timecode_format() == _session->config.get_timecode_format()); matching = (tcslave->apparent_timecode_format() == _session->config.get_timecode_format());
} else { } else {
matching = true; matching = true;

13
gtk2_ardour/audio_clock.cc
View file

@ -1028,9 +1028,20 @@ AudioClock::set_slave_info ()
INFO_FONT_SIZE, sync_source_to_string(sync_src, true))); INFO_FONT_SIZE, sync_source_to_string(sync_src, true)));
_right_layout->set_text (""); _right_layout->set_text ("");
break; break;
case MIDIClock:
if (slave) {
_left_layout->set_markup (string_compose ("<span size=\"%1\" foreground=\"white\">%2</span>",
INFO_FONT_SIZE, sync_source_to_string(sync_src, true)));
_right_layout->set_markup (string_compose ("<span size=\"%1\" foreground=\"white\">%2</span>",
INFO_FONT_SIZE, slave->approximate_current_delta()));
} else {
_left_layout->set_markup (string_compose ("<span size=\"%1\" foreground=\"white\">%2</span>",
INFO_FONT_SIZE, _("--pending--")));
_right_layout->set_text ("");
}
break;
case LTC: case LTC:
case MTC: case MTC:
case MIDIClock:
if (slave) { if (slave) {
bool matching; bool matching;
TimecodeSlave* tcslave; TimecodeSlave* tcslave;