diff options
| author | John Emmas <johne53@tiscali.co.uk> | 2013-10-06 11:56:03 +0100 |
|---|---|---|
| committer | John Emmas <johne53@tiscali.co.uk> | 2013-10-06 11:56:03 +0100 |
| commit | 300b484cf6ac14c15e365c4062345d64a61c4b18 (patch) | |
| tree | f10b9abedc141192f5c35f9c0f40e94f1d52786d /gtk2_ardour/audio_clock.cc | |
| parent | 7d78172abfd9b02bcb6809db3f7545e90dbe968d (diff) | |
| parent | 2d5e605bf124c82f77a5a893e540bc176164947d (diff) | |
Merge branch 'master' into windows+cc
Conflicts (hopefully resolved):
gtk2_ardour/ardour_ui.cc
gtk2_ardour/ardour_ui.h
gtk2_ardour/ardour_ui_options.cc
Diffstat (limited to 'gtk2_ardour/audio_clock.cc')
| -rw-r--r-- | gtk2_ardour/audio_clock.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc index 0265df5d3f..55c388170a 100644 --- a/gtk2_ardour/audio_clock.cc +++ b/gtk2_ardour/audio_clock.cc @@ -996,7 +996,7 @@ AudioClock::set_slave_info () Slave* slave = _session->slave(); switch (sync_src) { - case JACK: + case Engine: _left_layout->set_markup (string_compose ("<span size=\"%1\">" TXTSPAN "%2</span></span>", INFO_FONT_SIZE, sync_source_to_string(sync_src, true))); _right_layout->set_text (""); |