projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rename latched solo option and reverse its meaning; add exclusive solo button functio...
[ardour.git]
/
gtk2_ardour
/
playlist_selector.cc
diff --git
a/gtk2_ardour/playlist_selector.cc
b/gtk2_ardour/playlist_selector.cc
index aa678e80a3f765cfa6b7a986f0864da3bee51638..e0c51082a1eeadaa5a19a1859e6893d2f3edec54 100644
(file)
--- a/
gtk2_ardour/playlist_selector.cc
+++ b/
gtk2_ardour/playlist_selector.cc
@@
-42,7
+42,7
@@
using namespace ARDOUR;
using namespace PBD;
PlaylistSelector::PlaylistSelector ()
using namespace PBD;
PlaylistSelector::PlaylistSelector ()
- : ArdourDialog (
"playlist selector"
)
+ : ArdourDialog (
_("Playlists")
)
{
rui = 0;
{
rui = 0;
@@
-52,8
+52,6
@@
PlaylistSelector::PlaylistSelector ()
add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK);
set_size_request (300, 200);
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);
model = TreeStore::create (columns);
tree.set_model (model);
tree.append_column (_("Playlists grouped by track"), columns.text);
@@
-79,10
+77,10
@@
PlaylistSelector::~PlaylistSelector ()
void
PlaylistSelector::clear_map ()
{
void
PlaylistSelector::clear_map ()
{
- for (
DSPL_Map::iterator x = dspl_map.begin(); x != ds
pl_map.end(); ++x) {
+ for (
TrackPlaylistMap::iterator x = trpl_map.begin(); x != tr
pl_map.end(); ++x) {
delete x->second;
}
delete x->second;
}
-
ds
pl_map.clear ();
+
tr
pl_map.clear ();
}
bool
}
bool
@@
-99,7
+97,6
@@
void
PlaylistSelector::show_for (RouteUI* ruix)
{
vector<const char*> item;
PlaylistSelector::show_for (RouteUI* ruix)
{
vector<const char*> item;
- boost::shared_ptr<Diskstream> this_ds;
string str;
rui = ruix;
string str;
rui = ruix;
@@
-113,7
+110,7
@@
PlaylistSelector::show_for (RouteUI* ruix)
_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 ());
TreeModel::Row others = *(model->append ());
@@
-121,29
+118,29
@@
PlaylistSelector::show_for (RouteUI* ruix)
boost::shared_ptr<Playlist> proxy = others[columns.playlist];
proxy.reset ();
boost::shared_ptr<Playlist> proxy = others[columns.playlist];
proxy.reset ();
- for (
DSPL_Map::iterator x = dspl_map.begin(); x != ds
pl_map.end(); ++x) {
+ for (
TrackPlaylistMap::iterator x = trpl_map.begin(); x != tr
pl_map.end(); ++x) {
- boost::shared_ptr<
Diskstream> ds = _session->diskstream_by_id (x->first
);
+ boost::shared_ptr<
Track> tr = boost::dynamic_pointer_cast<Track> (_session->route_by_id (x->first)
);
- if (
ds
== 0) {
+ if (
tr
== 0) {
continue;
}
continue;
}
- /* add a node for the
diskstream
*/
+ /* add a node for the
track
*/
string nodename;
string nodename;
- if (
ds
->name().empty()) {
+ if (
tr
->name().empty()) {
nodename = _("unassigned");
} else {
nodename = _("unassigned");
} else {
- nodename =
ds
->name().c_str();
+ nodename =
tr
->name().c_str();
}
TreeModel::Row row;
TreeModel::Row* selected_row = 0;
TreePath this_path;
}
TreeModel::Row row;
TreeModel::Row* selected_row = 0;
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];
row = *(model->prepend());
row[columns.text] = nodename;
boost::shared_ptr<Playlist> proxy = row[columns.playlist];
@@
-157,7
+154,7
@@
PlaylistSelector::show_for (RouteUI* ruix)
/* Now insert all the playlists for this diskstream/track in a subtree */
/* 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) {
for (list<boost::shared_ptr<Playlist> >::iterator p = pls->begin(); p != pls->end(); ++p) {
@@
-167,7
+164,7
@@
PlaylistSelector::show_for (RouteUI* ruix)
child_row[columns.text] = (*p)->name();
child_row[columns.playlist] = *p;
child_row[columns.text] = (*p)->name();
child_row[columns.playlist] = *p;
- if (*p == this_
ds
->playlist()) {
+ if (*p == this_
track
->playlist()) {
selected_row = &child_row;
}
}
selected_row = &child_row;
}
}
@@
-197,7
+194,7
@@
PlaylistSelector::show_for (RouteUI* ruix)
child_row[columns.text] = (*p)->name();
child_row[columns.playlist] = *p;
child_row[columns.text] = (*p)->name();
child_row[columns.playlist] = *p;
- if (*p == this_
ds
->playlist()) {
+ if (*p == this_
track
->playlist()) {
selected_row = &child_row;
}
selected_row = &child_row;
}
@@
-223,13
+220,10
@@
PlaylistSelector::add_playlist_to_map (boost::shared_ptr<Playlist> pl)
return;
}
return;
}
- DSPL_Map::iterator x;
-
- if ((x = dspl_map.find (apl->get_orig_diskstream_id())) == dspl_map.end()) {
-
- pair<PBD::ID,list<boost::shared_ptr<Playlist> >*> newp (apl->get_orig_diskstream_id(), new list<boost::shared_ptr<Playlist> >);
+ TrackPlaylistMap::iterator x;
- x = dspl_map.insert (dspl_map.end(), newp);
+ if ((x = trpl_map.find (apl->get_orig_diskstream_id())) == trpl_map.end()) {
+ x = trpl_map.insert (trpl_map.end(), make_pair (apl->get_orig_diskstream_id(), new list<boost::shared_ptr<Playlist> >));
}
x->second->push_back (pl);
}
x->second->push_back (pl);
@@
-269,7
+263,7
@@
PlaylistSelector::selection_changed ()
return;
}
return;
}
- at->
diskstream()->
use_playlist (apl);
+ at->use_playlist (apl);
hide ();
}
hide ();
}