diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-06-02 17:50:37 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-06-02 17:50:37 +0000 |
| commit | 83f385d26336f58c1b2e3ce49c609fe86878b56d (patch) | |
| tree | 5cc50c4afd705ad83ee4455bd4547eaffc7e7895 /gtk2_ardour/ardour_ui2.cc | |
| parent | add91aa2d723c15148d83dae7c8178ee6102146e (diff) | |
audio clock switchover part2: remove most egregious include-time dependency on audio_clock.h, and alter API for a few utilities along the way
git-svn-id: svn://localhost/ardour2/branches/3.0@9673 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/ardour_ui2.cc')
| -rw-r--r-- | gtk2_ardour/ardour_ui2.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc index 2cbd70ed37..80ef975b91 100644 --- a/gtk2_ardour/ardour_ui2.cc +++ b/gtk2_ardour/ardour_ui2.cc @@ -318,9 +318,9 @@ ARDOUR_UI::setup_transport () ARDOUR_UI::Clock.connect (sigc::bind (sigc::mem_fun (primary_clock, &AudioClock::set), 'p')); ARDOUR_UI::Clock.connect (sigc::bind (sigc::mem_fun (secondary_clock, &AudioClock::set), 's')); - primary_clock.ValueChanged.connect (sigc::mem_fun(*this, &ARDOUR_UI::primary_clock_value_changed)); - secondary_clock.ValueChanged.connect (sigc::mem_fun(*this, &ARDOUR_UI::secondary_clock_value_changed)); - big_clock.ValueChanged.connect (sigc::mem_fun(*this, &ARDOUR_UI::big_clock_value_changed)); + primary_clock->ValueChanged.connect (sigc::mem_fun(*this, &ARDOUR_UI::primary_clock_value_changed)); + secondary_clock->ValueChanged.connect (sigc::mem_fun(*this, &ARDOUR_UI::secondary_clock_value_changed)); + big_clock->ValueChanged.connect (sigc::mem_fun(*this, &ARDOUR_UI::big_clock_value_changed)); ActionManager::get_action ("Transport", "ToggleAutoReturn")->connect_proxy (auto_return_button); ActionManager::get_action ("Transport", "ToggleAutoPlay")->connect_proxy (auto_play_button); @@ -334,10 +334,10 @@ ARDOUR_UI::setup_transport () preroll_button.set_name ("TransportButton"); postroll_button.set_name ("TransportButton"); - preroll_clock.set_mode (AudioClock::MinSec); - preroll_clock.set_name ("TransportClockDisplay"); - postroll_clock.set_mode (AudioClock::MinSec); - postroll_clock.set_name ("TransportClockDisplay"); + preroll_clock->set_mode (AudioClock::MinSec); + preroll_clock->set_name ("TransportClockDisplay"); + postroll_clock->set_mode (AudioClock::MinSec); + postroll_clock->set_name ("TransportClockDisplay"); /* alerts */ @@ -385,9 +385,9 @@ ARDOUR_UI::setup_transport () transport_hbox->pack_start (rec_button, false, false, 6); HBox* clock_box = manage (new HBox); - clock_box->pack_start (primary_clock, false, false); + clock_box->pack_start (*primary_clock, false, false); if (!ARDOUR::Profile->get_small_screen()) { - clock_box->pack_start (secondary_clock, false, false); + clock_box->pack_start (*secondary_clock, false, false); } if (!Profile->get_sae()) { |