projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
General SMPTE fixes mostly relating to non-integer frame rates. Please Test. Fix...
[ardour.git]
/
gtk2_ardour
/
playlist_selector.cc
diff --git
a/gtk2_ardour/playlist_selector.cc
b/gtk2_ardour/playlist_selector.cc
index 68227d193c281fb0f07dc2de54643dd247a9bfa9..d02c5a88de7d941f57634e38927e136004e0504e 100644
(file)
--- a/
gtk2_ardour/playlist_selector.cc
+++ b/
gtk2_ardour/playlist_selector.cc
@@
-61,9
+61,8
@@
PlaylistSelector::PlaylistSelector ()
scroller.add (tree);
scroller.set_policy (POLICY_AUTOMATIC, POLICY_AUTOMATIC);
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);
get_vbox()->pack_start (scroller);
@@
-86,6
+85,17
@@
PlaylistSelector::clear_map ()
dspl_map.clear ();
}
dspl_map.clear ();
}
+bool
+PlaylistSelector::on_unmap_event (GdkEventAny* ev)
+{
+ cerr << "PLselector unmapped\n";
+ clear_map ();
+ if (model) {
+ model->clear ();
+ }
+ return Dialog::on_unmap_event (ev);
+}
+
void
PlaylistSelector::show_for (RouteUI* ruix)
{
void
PlaylistSelector::show_for (RouteUI* ruix)
{
@@
-112,7
+122,8
@@
PlaylistSelector::show_for (RouteUI* ruix)
TreeModel::Row others = *(model->append ());
others[columns.text] = _("Other tracks");
TreeModel::Row others = *(model->append ());
others[columns.text] = _("Other tracks");
- others[columns.playlist] = 0;
+ boost::shared_ptr<Playlist> proxy = others[columns.playlist];
+ proxy.reset ();
for (DSPL_Map::iterator x = dspl_map.begin(); x != dspl_map.end(); ++x) {
for (DSPL_Map::iterator x = dspl_map.begin(); x != dspl_map.end(); ++x) {
@@
-139,18
+150,20
@@
PlaylistSelector::show_for (RouteUI* ruix)
if (ds == this_ds) {
row = *(model->prepend());
row[columns.text] = nodename;
if (ds == this_ds) {
row = *(model->prepend());
row[columns.text] = nodename;
- row[columns.playlist] = 0;
+ boost::shared_ptr<Playlist> proxy = row[columns.playlist];
+ proxy.reset ();
} else {
row = *(model->append (others.children()));
row[columns.text] = nodename;
} else {
row = *(model->append (others.children()));
row[columns.text] = nodename;
- row[columns.playlist] = 0;
+ boost::shared_ptr<Playlist> proxy = row[columns.playlist];
+ proxy.reset ();
}
/* 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<
Playlist*
> *pls = x->second;
+ list<
boost::shared_ptr<Playlist>
> *pls = x->second;
- for (list<
Playlist*
>::iterator p = pls->begin(); p != pls->end(); ++p) {
+ for (list<
boost::shared_ptr<Playlist>
>::iterator p = pls->begin(); p != pls->end(); ++p) {
TreeModel::Row child_row;
TreeModel::Row child_row;
@@
-173,15
+186,15
@@
PlaylistSelector::show_for (RouteUI* ruix)
}
void
}
void
-PlaylistSelector::add_playlist_to_map (
Playlist *
pl)
+PlaylistSelector::add_playlist_to_map (
boost::shared_ptr<Playlist>
pl)
{
{
-
AudioPlaylist*
apl;
+
boost::shared_ptr<AudioPlaylist>
apl;
if (pl->frozen()) {
return;
}
if (pl->frozen()) {
return;
}
-
- if ((apl =
dynamic_cast<AudioPlaylist*
> (pl)) == 0) {
+
+ if ((apl =
boost::dynamic_pointer_cast<AudioPlaylist
> (pl)) == 0) {
return;
}
return;
}
@@
-189,7
+202,7
@@
PlaylistSelector::add_playlist_to_map (Playlist *pl)
if ((x = dspl_map.find (apl->get_orig_diskstream_id())) == dspl_map.end()) {
if ((x = dspl_map.find (apl->get_orig_diskstream_id())) == dspl_map.end()) {
- pair<PBD::ID,list<
Playlist*>*> newp (apl->get_orig_diskstream_id(), new list<Playlist*
>);
+ 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);
}
x = dspl_map.insert (dspl_map.end(), newp);
}
@@
-205,7
+218,7
@@
PlaylistSelector::set_session (Session* s)
session = s;
if (session) {
session = s;
if (session) {
- session->
going_a
way.connect (bind (mem_fun(*this, &PlaylistSelector::set_session), static_cast<Session*> (0)));
+ session->
GoingA
way.connect (bind (mem_fun(*this, &PlaylistSelector::set_session), static_cast<Session*> (0)));
}
}
}
}
@@
-219,7
+232,7
@@
PlaylistSelector::close_button_click ()
void
PlaylistSelector::selection_changed ()
{
void
PlaylistSelector::selection_changed ()
{
-
Playlist *
playlist;
+
boost::shared_ptr<Playlist>
playlist;
TreeModel::iterator iter = tree.get_selection()->get_selected();
TreeModel::iterator iter = tree.get_selection()->get_selected();
@@
-231,14
+244,14
@@
PlaylistSelector::selection_changed ()
if ((playlist = ((*iter)[columns.playlist])) != 0) {
AudioTrack* at;
if ((playlist = ((*iter)[columns.playlist])) != 0) {
AudioTrack* at;
-
AudioPlaylist*
apl;
+
boost::shared_ptr<AudioPlaylist>
apl;
if ((at = rui->audio_track()) == 0) {
/* eh? */
return;
}
if ((at = rui->audio_track()) == 0) {
/* eh? */
return;
}
- if ((apl =
dynamic_cast<AudioPlaylist*
> (playlist)) == 0) {
+ if ((apl =
boost::dynamic_pointer_cast<AudioPlaylist
> (playlist)) == 0) {
/* eh? */
return;
}
/* eh? */
return;
}