#include <gtkmm/button.h>
-#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 <gtkmm2ext/gtk_ui.h>
#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);
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));
}
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
PlaylistSelector::show_for (RouteUI* ruix)
{
vector<const char*> item;
- boost::shared_ptr<Diskstream> this_ds;
string str;
rui = 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<Track> this_track = rui->track();
TreeModel::Row others = *(model->append ());
boost::shared_ptr<Playlist> proxy = others[columns.playlist];
proxy.reset ();
- for (DSPL_Map::iterator x = dspl_map.begin(); x != dspl_map.end(); ++x) {
-
- boost::shared_ptr<Diskstream> ds = session->diskstream_by_id (x->first);
+ for (TrackPlaylistMap::iterator x = trpl_map.begin(); x != trpl_map.end(); ++x) {
- if (ds == 0) {
- continue;
- }
+ boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (_session->route_by_id (x->first));
- /* add a node for the diskstream */
+ /* add a node for the track */
string nodename;
- if (ds->name().empty()) {
+ if (!tr || 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<Playlist> proxy = row[columns.playlist];
/* Now insert all the playlists for this diskstream/track in a subtree */
- list<boost::shared_ptr<Playlist> > *pls = x->second;
+ list<boost::shared_ptr<Playlist> >* pls = x->second;
for (list<boost::shared_ptr<Playlist> >::iterator p = pls->begin(); p != pls->end(); ++p) {
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<boost::shared_ptr<Playlist> > 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()));
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);
}
}
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
return;
}
- DSPL_Map::iterator x;
-
- if ((x = dspl_map.find (apl->get_orig_diskstream_id())) == dspl_map.end()) {
+ TrackPlaylistMap::iterator x;
- pair<PBD::ID,list<boost::shared_ptr<Playlist> >*> newp (apl->get_orig_diskstream_id(), new list<boost::shared_ptr<Playlist> >);
-
- 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<boost::shared_ptr<Playlist> >));
}
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<Session*> (0)));
- }
-}
-
void
PlaylistSelector::close_button_click ()
{
return;
}
- at->diskstream()->use_playlist (apl);
+ at->use_playlist (DataType::AUDIO, apl);
hide ();
}
projects / ardour.git / blobdiff