X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fplaylist_selector.cc;h=dd62240e44217688143fc6c435d61ae4e2e90d28;hb=ae6dbb836cc1ab1bcbc21883f282361c43f10883;hp=9022c8acb4f85e324c0a78651db278adc275e328;hpb=8b46567e0677eb25c965ed46b80da8808fa33b2b;p=ardour.git diff --git a/gtk2_ardour/playlist_selector.cc b/gtk2_ardour/playlist_selector.cc index 9022c8acb4..dd62240e44 100644 --- a/gtk2_ardour/playlist_selector.cc +++ b/gtk2_ardour/playlist_selector.cc @@ -15,20 +15,20 @@ 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/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 +#include #include "playlist_selector.h" #include "route_ui.h" @@ -39,6 +39,7 @@ using namespace std; using namespace sigc; using namespace Gtk; +using namespace Gtkmm2ext; using namespace ARDOUR; using namespace PBD; @@ -49,11 +50,14 @@ PlaylistSelector::PlaylistSelector () 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); + 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); @@ -61,9 +65,8 @@ PlaylistSelector::PlaylistSelector () scroller.add (tree); scroller.set_policy (POLICY_AUTOMATIC, POLICY_AUTOMATIC); - // GTK2FIX do we need this stuff or is GTK applying some policy now? - //set_border_width (6); - // set_spacing (12); + get_vbox()->set_border_width (6); + get_vbox()->set_spacing (12); get_vbox()->pack_start (scroller); @@ -86,19 +89,28 @@ PlaylistSelector::clear_map () dspl_map.clear (); } +bool +PlaylistSelector::on_unmap_event (GdkEventAny* ev) +{ + clear_map (); + if (model) { + model->clear (); + } + return Dialog::on_unmap_event (ev); +} + void PlaylistSelector::show_for (RouteUI* ruix) { vector item; - AudioDiskstream* this_ds; + boost::shared_ptr this_ds; string str; rui = ruix; - str = _("ardour: playlist for "); - str += rui->route().name(); - - set_title (str); + WindowTitle title(Glib::get_application_name()); + title += string_compose (_("Playlist for %1"), rui->route()->name()); + set_title (title.get_string()); clear_map (); select_connection.disconnect (); @@ -112,11 +124,12 @@ PlaylistSelector::show_for (RouteUI* ruix) TreeModel::Row others = *(model->append ()); others[columns.text] = _("Other tracks"); - others[columns.playlist] = 0; + boost::shared_ptr proxy = others[columns.playlist]; + proxy.reset (); for (DSPL_Map::iterator x = dspl_map.begin(); x != dspl_map.end(); ++x) { - AudioDiskstream* ds = session->diskstream_by_id (x->first); + boost::shared_ptr ds = session->diskstream_by_id (x->first); if (ds == 0) { continue; @@ -139,18 +152,20 @@ PlaylistSelector::show_for (RouteUI* ruix) if (ds == this_ds) { row = *(model->prepend()); row[columns.text] = nodename; - row[columns.playlist] = 0; + boost::shared_ptr proxy = row[columns.playlist]; + proxy.reset (); } else { row = *(model->append (others.children())); row[columns.text] = nodename; - row[columns.playlist] = 0; + boost::shared_ptr proxy = row[columns.playlist]; + proxy.reset (); } /* 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) { + for (list >::iterator p = pls->begin(); p != pls->end(); ++p) { TreeModel::Row child_row; @@ -168,20 +183,49 @@ PlaylistSelector::show_for (RouteUI* ruix) } } + // Add unassigned (imported) playlists to the list + list > unassigned; + session->unassigned_playlists (unassigned); + + TreeModel::Row row; + TreeModel::Row* selected_row = 0; + 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_ds->playlist()) { + selected_row = &child_row; + } + + if (selected_row != 0) { + tree.get_selection()->select (*selected_row); + } + } + show_all (); select_connection = tree.get_selection()->signal_changed().connect (mem_fun(*this, &PlaylistSelector::selection_changed)); } void -PlaylistSelector::add_playlist_to_map (Playlist *pl) +PlaylistSelector::add_playlist_to_map (boost::shared_ptr pl) { - AudioPlaylist* apl; + boost::shared_ptr apl; if (pl->frozen()) { return; } - - if ((apl = dynamic_cast (pl)) == 0) { + + if ((apl = boost::dynamic_pointer_cast (pl)) == 0) { return; } @@ -189,7 +233,7 @@ PlaylistSelector::add_playlist_to_map (Playlist *pl) if ((x = dspl_map.find (apl->get_orig_diskstream_id())) == dspl_map.end()) { - pair*> newp (apl->get_orig_diskstream_id(), new list); + pair >*> newp (apl->get_orig_diskstream_id(), new list >); x = dspl_map.insert (dspl_map.end(), newp); } @@ -205,7 +249,7 @@ PlaylistSelector::set_session (Session* s) session = s; if (session) { - session->going_away.connect (bind (mem_fun(*this, &PlaylistSelector::set_session), static_cast (0))); + session->GoingAway.connect (bind (mem_fun(*this, &PlaylistSelector::set_session), static_cast (0))); } } @@ -219,31 +263,31 @@ PlaylistSelector::close_button_click () void PlaylistSelector::selection_changed () { - Playlist *playlist; + boost::shared_ptr playlist; TreeModel::iterator iter = tree.get_selection()->get_selected(); - if (!iter) { + if (!iter || rui == 0) { /* nothing selected */ return; } if ((playlist = ((*iter)[columns.playlist])) != 0) { - AudioTrack* at; - AudioPlaylist* apl; + boost::shared_ptr at; + boost::shared_ptr apl; - if ((at = dynamic_cast (&rui->route())) == 0) { + if ((at = rui->audio_track()) == 0) { /* eh? */ return; } - if ((apl = dynamic_cast (playlist)) == 0) { + if ((apl = boost::dynamic_pointer_cast (playlist)) == 0) { /* eh? */ return; } - at->disk_stream().use_playlist (apl); + at->diskstream()->use_playlist (apl); hide (); }