diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-12 15:02:15 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-12 15:02:15 +0000 |
| commit | 8687895abba4209a6de8d8a8fc1bda5996f0d875 (patch) | |
| tree | a2123e967e7c9906d787a5cec94ec53894d32734 /libs/ardour/ticker.cc | |
| parent | 0c80b01f4724922a95d22fc441d6854da001c442 (diff) | |
remove using namespace sigc everywhere to ensure clarity over which bind/mem_fun is being used; make Config::map_parameters take a boost::function rather than a sigc::slot ; continue debugging crash caused by regionviews not tracking their Region's lifetime
git-svn-id: svn://localhost/ardour2/branches/3.0@6357 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ticker.cc')
| -rw-r--r-- | libs/ardour/ticker.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libs/ardour/ticker.cc b/libs/ardour/ticker.cc index 7f7ca32907..ab0a7144a8 100644 --- a/libs/ardour/ticker.cc +++ b/libs/ardour/ticker.cc @@ -36,8 +36,8 @@ void Ticker::set_session(Session& s) _session = &s; if (_session) { - _session->tick.connect(mem_fun (*this, &Ticker::tick)); - _session->GoingAway.connect(mem_fun (*this, &Ticker::going_away)); + _session->tick.connect(sigc::mem_fun (*this, &Ticker::tick)); + _session->GoingAway.connect(sigc::mem_fun (*this, &Ticker::going_away)); } } @@ -47,13 +47,13 @@ void MidiClockTicker::set_session(Session& s) if (_session) { _session->MIDIClock_PortChanged.connect( - mem_fun (*this, &MidiClockTicker::update_midi_clock_port)); + sigc::mem_fun (*this, &MidiClockTicker::update_midi_clock_port)); _session->TransportStateChange.connect( - mem_fun (*this, &MidiClockTicker::transport_state_changed)); + sigc::mem_fun (*this, &MidiClockTicker::transport_state_changed)); _session->PositionChanged.connect( - mem_fun (*this, &MidiClockTicker::position_changed)); + sigc::mem_fun (*this, &MidiClockTicker::position_changed)); _session->TransportLooped.connect( - mem_fun (*this, &MidiClockTicker::transport_looped)); + sigc::mem_fun (*this, &MidiClockTicker::transport_looped)); update_midi_clock_port(); } } |