diff --git a/gtk2_ardour/playlist_selector.cc b/gtk2_ardour/playlist_selector.cc index fcb1d66f15..646c4baaf5 100644 --- a/gtk2_ardour/playlist_selector.cc +++ b/gtk2_ardour/playlist_selector.cc @@ -57,11 +57,12 @@ PlaylistSelector::PlaylistSelector () set_name ("PlaylistSelectorWindow"); set_modal(false); add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK); - set_size_request (300, 200); + set_size_request (400, 250); model = TreeStore::create (columns); tree.set_model (model); tree.append_column (_("Playlists grouped by track"), columns.text); + tree.append_column (_("Playlist Group"), columns.pgrp); tree.set_headers_visible (false); scroller.add (tree); @@ -215,6 +216,7 @@ PlaylistSelector::redisplay() if (child_row) { child_row[columns.text] = (*p)->name(); + child_row[columns.pgrp] = (*p)->pgroup_id(); child_row[columns.playlist] = *p; if (*p == this_track->playlist()) { @@ -250,6 +252,7 @@ PlaylistSelector::redisplay() child_row = *(model->append (row.children())); child_row[columns.text] = (*p)->name(); + child_row[columns.pgrp] = (*p)->pgroup_id(); child_row[columns.playlist] = *p; if (*p == this_track->playlist()) { diff --git a/gtk2_ardour/playlist_selector.h b/gtk2_ardour/playlist_selector.h index d2a13a1c2b..0fc0e11a98 100644 --- a/gtk2_ardour/playlist_selector.h +++ b/gtk2_ardour/playlist_selector.h @@ -97,9 +97,11 @@ private: { ModelColumns () { add (text); + add (pgrp); add (playlist); } Gtk::TreeModelColumn text; + Gtk::TreeModelColumn pgrp; Gtk::TreeModelColumn > playlist; }; diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index 245922442c..55e2ad1414 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -2505,8 +2505,6 @@ RouteUI::build_playlist_menu () /* add the playlists to the menu */ for (vector >::iterator i = playlists_tr.begin(); i != playlists_tr.end(); ++i) { string text = (*i)->name(); - if ((*i)->pgroup_id().length()>0) - text.append( string_compose( " (%1)", (*i)->pgroup_id())); playlist_items.push_back (RadioMenuElem (playlist_group, text)); RadioMenuItem *item = static_cast(&playlist_items.back()); item->signal_toggled().connect(sigc::bind (sigc::mem_fun (*this, &RouteUI::use_playlist), item, boost::weak_ptr (*i)));