diff options
| author | David Robillard <d@drobilla.net> | 2007-01-09 23:24:54 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2007-01-09 23:24:54 +0000 |
| commit | 532f6aad4ac79ca15d69deccd18fca90e444c437 (patch) | |
| tree | 0d4ca5449af8eb48ad56e163efcab42c4656e8de /gtk2_ardour/playlist_selector.h | |
| parent | ef6b25432d9c46d71b08c0f7d5f2686df428c4e8 (diff) | |
Merged with trunk R1283.
NOTE: Compiles, but broken (crash on adding MIDI track).
git-svn-id: svn://localhost/ardour2/branches/midi@1292 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/playlist_selector.h')
| -rw-r--r-- | gtk2_ardour/playlist_selector.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/gtk2_ardour/playlist_selector.h b/gtk2_ardour/playlist_selector.h index 2829ba54bb..071f82c616 100644 --- a/gtk2_ardour/playlist_selector.h +++ b/gtk2_ardour/playlist_selector.h @@ -20,6 +20,8 @@ #ifndef __ardour_playlist_selector_h__ #define __ardour_playlist_selector_h__ +#include <boost/shared_ptr.hpp> + #include <gtkmm/box.h> #include <gtkmm/scrolledwindow.h> #include <gtkmm/button.h> @@ -45,8 +47,11 @@ class PlaylistSelector : public ArdourDialog void set_session (ARDOUR::Session*); void show_for (RouteUI*); + protected: + bool on_unmap_event (GdkEventAny*); + private: - typedef std::map<PBD::ID,std::list<ARDOUR::Playlist*>*> DSPL_Map; + typedef std::map<PBD::ID,std::list<boost::shared_ptr<ARDOUR::Playlist> >*> DSPL_Map; ARDOUR::Session* session; Gtk::ScrolledWindow scroller; @@ -55,7 +60,7 @@ class PlaylistSelector : public ArdourDialog sigc::connection select_connection; - void add_playlist_to_map (ARDOUR::Playlist*); + void add_playlist_to_map (boost::shared_ptr<ARDOUR::Playlist>); void clear_map (); void close_button_click (); void selection_changed (); @@ -66,7 +71,7 @@ class PlaylistSelector : public ArdourDialog add (playlist); } Gtk::TreeModelColumn<std::string> text; - Gtk::TreeModelColumn<ARDOUR::Playlist*> playlist; + Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::Playlist> > playlist; }; ModelColumns columns; |