X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fplaylist_selector.cc;h=cc92d5d2befa267141e460f84f52deb38da70708;hb=81211a91b1e6ffd77dd31676ffe65c4456aafdd7;hp=ddb771bb1841b5a75238bb6ad07a1b0b13f7bf73;hpb=bb02870c15a9db3f46e2e24d1d5c72e9ca5dfe0b;p=ardour.git diff --git a/gtk2_ardour/playlist_selector.cc b/gtk2_ardour/playlist_selector.cc index ddb771bb18..cc92d5d2be 100644 --- a/gtk2_ardour/playlist_selector.cc +++ b/gtk2_ardour/playlist_selector.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 Paul Davis + Copyright (C) 2004 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,18 +15,15 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id$ */ #include -#include -#include -#include -#include -#include -#include +#include "ardour/audio_track.h" +#include "ardour/audioplaylist.h" +#include "ardour/playlist.h" +#include "ardour/session_playlist.h" #include @@ -34,22 +31,20 @@ #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_title (_("ardour: playlists")); set_modal(true); add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK); set_size_request (300, 200); @@ -66,8 +61,8 @@ 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)); + Button* b = add_button (_("Close"), RESPONSE_CANCEL); + b->signal_clicked().connect (sigc::mem_fun(*this, &PlaylistSelector::close_button_click)); } @@ -79,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 @@ -99,54 +94,59 @@ void PlaylistSelector::show_for (RouteUI* ruix) { vector item; - boost::shared_ptr this_ds; string str; rui = ruix; - str = _("ardour: playlist for "); - str += rui->route()->name(); - - set_title (str); + 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); - this_ds = rui->get_diskstream(); + _session->playlists->foreach (this, &PlaylistSelector::add_playlist_to_map); + + boost::shared_ptr this_track = rui->track(); TreeModel::Row others = *(model->append ()); others[columns.text] = _("Other tracks"); boost::shared_ptr proxy = others[columns.playlist]; proxy.reset (); - - for (DSPL_Map::iterator x = dspl_map.begin(); x != dspl_map.end(); ++x) { - boost::shared_ptr ds = session->diskstream_by_id (x->first); + 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. + */ - if (ds == 0) { + 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]; @@ -159,9 +159,9 @@ 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) { TreeModel::Row child_row; @@ -170,18 +170,50 @@ 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 (have_selected) { + tree.get_selection()->select (selected_row); + } + } + + // Add unassigned (imported) playlists to the list + list > unassigned; + _session->playlists->unassigned (unassigned); + + TreeModel::Row row; + TreeModel::Row selected_row; + bool have_selected = false; + TreePath this_path; + + row = *(model->append (others.children())); + row[columns.text] = _("Imported"); + proxy = row[columns.playlist]; + proxy.reset (); + + for (list >::iterator p = unassigned.begin(); p != unassigned.end(); ++p) { + TreeModel::Row child_row; + + child_row = *(model->append (row.children())); + child_row[columns.text] = (*p)->name(); + child_row[columns.playlist] = *p; + + 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); } } 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 @@ -192,35 +224,20 @@ PlaylistSelector::add_playlist_to_map (boost::shared_ptr pl) if (pl->frozen()) { return; } - + if ((apl = boost::dynamic_pointer_cast (pl)) == 0) { 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 () { @@ -241,24 +258,24 @@ PlaylistSelector::selection_changed () } if ((playlist = ((*iter)[columns.playlist])) != 0) { - - AudioTrack* at; + + boost::shared_ptr at; boost::shared_ptr apl; - + if ((at = rui->audio_track()) == 0) { /* eh? */ return; } - + if ((apl = boost::dynamic_pointer_cast (playlist)) == 0) { /* eh? */ return; } - - at->diskstream()->use_playlist (apl); + + at->use_playlist (apl); hide (); } } - +