From f6fdd8dcbf41f864e9f0cc32dabe81fe3533ddfe Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 17 Dec 2009 18:24:23 +0000 Subject: switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/playlist_selector.cc | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) (limited to 'gtk2_ardour/playlist_selector.cc') diff --git a/gtk2_ardour/playlist_selector.cc b/gtk2_ardour/playlist_selector.cc index abf249fb3d..aa678e80a3 100644 --- a/gtk2_ardour/playlist_selector.cc +++ b/gtk2_ardour/playlist_selector.cc @@ -111,7 +111,7 @@ PlaylistSelector::show_for (RouteUI* ruix) model->clear (); - session->playlists->foreach (this, &PlaylistSelector::add_playlist_to_map); + _session->playlists->foreach (this, &PlaylistSelector::add_playlist_to_map); this_ds = rui->get_diskstream(); @@ -123,7 +123,7 @@ PlaylistSelector::show_for (RouteUI* ruix) for (DSPL_Map::iterator x = dspl_map.begin(); x != dspl_map.end(); ++x) { - boost::shared_ptr ds = session->diskstream_by_id (x->first); + boost::shared_ptr ds = _session->diskstream_by_id (x->first); if (ds == 0) { continue; @@ -179,7 +179,7 @@ PlaylistSelector::show_for (RouteUI* ruix) // Add unassigned (imported) playlists to the list list > unassigned; - session->playlists->unassigned (unassigned); + _session->playlists->unassigned (unassigned); TreeModel::Row row; TreeModel::Row* selected_row = 0; @@ -235,18 +235,6 @@ PlaylistSelector::add_playlist_to_map (boost::shared_ptr pl) x->second->push_back (pl); } -void -PlaylistSelector::set_session (Session* s) -{ - ENSURE_GUI_THREAD (*this, &PlaylistSelector::set_session, s) - - session = s; - - if (session) { - session->GoingAway.connect (sigc::bind (sigc::mem_fun(*this, &PlaylistSelector::set_session), static_cast (0))); - } -} - void PlaylistSelector::close_button_click () { -- cgit v1.2.3