X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fplaylist_selector.cc;h=cc92d5d2befa267141e460f84f52deb38da70708;hb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;hp=1469a3566c84f25904b8196d3c6fa5fc90633868;hpb=64dc5427e4f5339a16a018692dd94f476c53cae9;p=ardour.git diff --git a/gtk2_ardour/playlist_selector.cc b/gtk2_ardour/playlist_selector.cc index 1469a3566c..cc92d5d2be 100644 --- a/gtk2_ardour/playlist_selector.cc +++ b/gtk2_ardour/playlist_selector.cc @@ -20,12 +20,10 @@ #include -#include "ardour/session_playlist.h" -#include "ardour/audio_diskstream.h" -#include "ardour/playlist.h" #include "ardour/audio_track.h" #include "ardour/audioplaylist.h" -#include "ardour/configuration.h" +#include "ardour/playlist.h" +#include "ardour/session_playlist.h" #include @@ -33,28 +31,24 @@ #include "route_ui.h" #include "gui_thread.h" -#include "i18n.h" +#include "pbd/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; - set_position (WIN_POS_MOUSE); set_name ("PlaylistSelectorWindow"); set_modal(true); add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK); set_size_request (300, 200); - set_title (_("Playlists")); - model = TreeStore::create (columns); tree.set_model (model); tree.append_column (_("Playlists grouped by track"), columns.text); @@ -67,7 +61,7 @@ PlaylistSelector::PlaylistSelector () get_vbox()->pack_start (scroller); - Button* b = add_button (_("close"), RESPONSE_CANCEL); + Button* b = add_button (_("Close"), RESPONSE_CANCEL); b->signal_clicked().connect (sigc::mem_fun(*this, &PlaylistSelector::close_button_click)); } @@ -80,10 +74,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 @@ -100,7 +94,6 @@ void PlaylistSelector::show_for (RouteUI* ruix) { vector item; - boost::shared_ptr this_ds; string str; rui = ruix; @@ -112,9 +105,9 @@ 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(); + boost::shared_ptr this_track = rui->track(); TreeModel::Row others = *(model->append ()); @@ -122,29 +115,38 @@ 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 ds = session->diskstream_by_id (x->first); + boost::shared_ptr tr = boost::dynamic_pointer_cast (_session->route_by_id (x->first)); - if (ds == 0) { + /* legacy sessions stored the diskstream ID as the original + * playlist owner. so try there instead. + */ + + if (tr == 0) { + tr = _session->track_by_diskstream_id (x->first); + } + + 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; + TreeModel::Row selected_row; + bool have_selected = false; 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]; @@ -158,7 +160,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) { @@ -168,22 +170,24 @@ PlaylistSelector::show_for (RouteUI* ruix) child_row[columns.text] = (*p)->name(); child_row[columns.playlist] = *p; - if (*p == this_ds->playlist()) { - selected_row = &child_row; + if (*p == this_track->playlist()) { + selected_row = child_row; + have_selected = true; } } - if (selected_row != 0) { - tree.get_selection()->select (*selected_row); + if (have_selected) { + tree.get_selection()->select (selected_row); } } // 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; + TreeModel::Row selected_row; + bool have_selected = false; TreePath this_path; row = *(model->append (others.children())); @@ -198,12 +202,13 @@ PlaylistSelector::show_for (RouteUI* ruix) child_row[columns.text] = (*p)->name(); child_row[columns.playlist] = *p; - if (*p == this_ds->playlist()) { - selected_row = &child_row; + if (*p == this_track->playlist()) { + selected_row = child_row; + have_selected = true; } - if (selected_row != 0) { - tree.get_selection()->select (*selected_row); + if (have_selected) { + tree.get_selection()->select (selected_row); } } @@ -224,30 +229,15 @@ PlaylistSelector::add_playlist_to_map (boost::shared_ptr pl) return; } - DSPL_Map::iterator x; - - if ((x = dspl_map.find (apl->get_orig_diskstream_id())) == dspl_map.end()) { + TrackPlaylistMap::iterator x; - 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 (*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 () { @@ -282,7 +272,7 @@ PlaylistSelector::selection_changed () return; } - at->diskstream()->use_playlist (apl); + at->use_playlist (apl); hide (); }