X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fplaylist_selector.cc;h=f81e199d625b69a7c60c588a67e7bcef845f1007;hb=a9adbd9404257f5eefac27c579f6c3b890b81969;hp=b4f884a0a758168f7b36c2b3c26f46b4a6345a11;hpb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;p=ardour.git diff --git a/gtk2_ardour/playlist_selector.cc b/gtk2_ardour/playlist_selector.cc index b4f884a0a7..f81e199d62 100644 --- a/gtk2_ardour/playlist_selector.cc +++ b/gtk2_ardour/playlist_selector.cc @@ -28,7 +28,6 @@ #include "ardour/configuration.h" #include -#include #include "playlist_selector.h" #include "route_ui.h" @@ -37,14 +36,13 @@ #include "i18n.h" using namespace std; -using namespace sigc; using namespace Gtk; using namespace Gtkmm2ext; using namespace ARDOUR; using namespace PBD; PlaylistSelector::PlaylistSelector () - : ArdourDialog ("playlist selector") + : ArdourDialog (_("Playlists")) { rui = 0; @@ -54,10 +52,6 @@ PlaylistSelector::PlaylistSelector () add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK); set_size_request (300, 200); - WindowTitle title(Glib::get_application_name()); - title += _("Playlists"); - set_title(title.get_string()); - model = TreeStore::create (columns); tree.set_model (model); tree.append_column (_("Playlists grouped by track"), columns.text); @@ -71,7 +65,7 @@ PlaylistSelector::PlaylistSelector () get_vbox()->pack_start (scroller); Button* b = add_button (_("close"), RESPONSE_CANCEL); - b->signal_clicked().connect (mem_fun(*this, &PlaylistSelector::close_button_click)); + b->signal_clicked().connect (sigc::mem_fun(*this, &PlaylistSelector::close_button_click)); } @@ -83,10 +77,10 @@ PlaylistSelector::~PlaylistSelector () void PlaylistSelector::clear_map () { - for (DSPL_Map::iterator x = dspl_map.begin(); x != dspl_map.end(); ++x) { + for (TrackPlaylistMap::iterator x = trpl_map.begin(); x != trpl_map.end(); ++x) { delete x->second; } - dspl_map.clear (); + trpl_map.clear (); } bool @@ -103,23 +97,20 @@ void PlaylistSelector::show_for (RouteUI* ruix) { vector item; - boost::shared_ptr this_ds; string str; rui = ruix; - WindowTitle title(Glib::get_application_name()); - title += string_compose (_("Playlist for %1"), rui->route()->name()); - set_title (title.get_string()); + set_title (string_compose (_("Playlist for %1"), rui->route()->name())); clear_map (); select_connection.disconnect (); model->clear (); - session->foreach_playlist (this, &PlaylistSelector::add_playlist_to_map); + _session->playlists->foreach (this, &PlaylistSelector::add_playlist_to_map); - this_ds = rui->get_diskstream(); + boost::shared_ptr this_track = rui->track(); TreeModel::Row others = *(model->append ()); @@ -127,29 +118,37 @@ PlaylistSelector::show_for (RouteUI* ruix) boost::shared_ptr proxy = others[columns.playlist]; proxy.reset (); - for (DSPL_Map::iterator x = dspl_map.begin(); x != dspl_map.end(); ++x) { + for (TrackPlaylistMap::iterator x = trpl_map.begin(); x != trpl_map.end(); ++x) { + + boost::shared_ptr tr = boost::dynamic_pointer_cast (_session->route_by_id (x->first)); + + /* legacy sessions stored the diskstream ID as the original + * playlist owner. so try there instead. + */ - boost::shared_ptr ds = session->diskstream_by_id (x->first); + if (tr == 0) { + tr = _session->track_by_diskstream_id (x->first); + } - if (ds == 0) { + if (tr == 0) { continue; } - /* add a node for the diskstream */ + /* add a node for the track */ string nodename; - if (ds->name().empty()) { + if (tr->name().empty()) { nodename = _("unassigned"); } else { - nodename = ds->name().c_str(); + nodename = tr->name().c_str(); } TreeModel::Row row; TreeModel::Row* selected_row = 0; TreePath this_path; - if (ds == this_ds) { + if (tr == this_track) { row = *(model->prepend()); row[columns.text] = nodename; boost::shared_ptr proxy = row[columns.playlist]; @@ -163,7 +162,7 @@ PlaylistSelector::show_for (RouteUI* ruix) /* Now insert all the playlists for this diskstream/track in a subtree */ - list > *pls = x->second; + list >* pls = x->second; for (list >::iterator p = pls->begin(); p != pls->end(); ++p) { @@ -173,7 +172,7 @@ PlaylistSelector::show_for (RouteUI* ruix) child_row[columns.text] = (*p)->name(); child_row[columns.playlist] = *p; - if (*p == this_ds->playlist()) { + if (*p == this_track->playlist()) { selected_row = &child_row; } } @@ -185,7 +184,7 @@ PlaylistSelector::show_for (RouteUI* ruix) // Add unassigned (imported) playlists to the list list > unassigned; - session->unassigned_playlists (unassigned); + _session->playlists->unassigned (unassigned); TreeModel::Row row; TreeModel::Row* selected_row = 0; @@ -203,7 +202,7 @@ PlaylistSelector::show_for (RouteUI* ruix) child_row[columns.text] = (*p)->name(); child_row[columns.playlist] = *p; - if (*p == this_ds->playlist()) { + if (*p == this_track->playlist()) { selected_row = &child_row; } @@ -213,7 +212,7 @@ PlaylistSelector::show_for (RouteUI* ruix) } show_all (); - select_connection = tree.get_selection()->signal_changed().connect (mem_fun(*this, &PlaylistSelector::selection_changed)); + select_connection = tree.get_selection()->signal_changed().connect (sigc::mem_fun(*this, &PlaylistSelector::selection_changed)); } void @@ -229,30 +228,15 @@ PlaylistSelector::add_playlist_to_map (boost::shared_ptr pl) return; } - DSPL_Map::iterator x; + TrackPlaylistMap::iterator x; - if ((x = dspl_map.find (apl->get_orig_diskstream_id())) == dspl_map.end()) { - - pair >*> newp (apl->get_orig_diskstream_id(), new list >); - - x = dspl_map.insert (dspl_map.end(), newp); + if ((x = trpl_map.find (apl->get_orig_track_id())) == trpl_map.end()) { + x = trpl_map.insert (trpl_map.end(), make_pair (apl->get_orig_track_id(), new list >)); } x->second->push_back (pl); } -void -PlaylistSelector::set_session (Session* s) -{ - ENSURE_GUI_THREAD(bind (mem_fun(*this, &PlaylistSelector::set_session), s)); - - session = s; - - if (session) { - session->GoingAway.connect (bind (mem_fun(*this, &PlaylistSelector::set_session), static_cast (0))); - } -} - void PlaylistSelector::close_button_click () { @@ -287,7 +271,7 @@ PlaylistSelector::selection_changed () return; } - at->diskstream()->use_playlist (apl); + at->use_playlist (apl); hide (); }