diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-17 18:24:23 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-17 18:24:23 +0000 |
commit | f6fdd8dcbf41f864e9f0cc32dabe81fe3533ddfe (patch) | |
tree | 5214c580b9e6c17a499fa587660dbf949e892bf2 /gtk2_ardour/playlist_selector.cc | |
parent | da762129f19c28aff64f833b6ec09fba946faef6 (diff) |
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
Diffstat (limited to 'gtk2_ardour/playlist_selector.cc')
-rw-r--r-- | gtk2_ardour/playlist_selector.cc | 18 |
1 files changed, 3 insertions, 15 deletions
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<Diskstream> ds = session->diskstream_by_id (x->first); + boost::shared_ptr<Diskstream> 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<boost::shared_ptr<Playlist> > unassigned; - session->playlists->unassigned (unassigned); + _session->playlists->unassigned (unassigned); TreeModel::Row row; TreeModel::Row* selected_row = 0; @@ -236,18 +236,6 @@ PlaylistSelector::add_playlist_to_map (boost::shared_ptr<Playlist> 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<Session*> (0))); - } -} - -void PlaylistSelector::close_button_click () { rui = 0; |