diff options
author | Robin Gareus <robin@gareus.org> | 2013-07-07 17:44:00 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2013-07-07 19:29:50 +0200 |
commit | a22e20133d0b5c1678fb41416f74283a93ab208f (patch) | |
tree | 99953f87a621b11d14b29c9925b0d82c6ca509ab /gtk2_ardour/window_manager.h | |
parent | cb6f16ac2df2db18e4a87aa2617625a3195d45c9 (diff) |
make window-manager session-aware
Diffstat (limited to 'gtk2_ardour/window_manager.h')
-rw-r--r-- | gtk2_ardour/window_manager.h | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/gtk2_ardour/window_manager.h b/gtk2_ardour/window_manager.h index 404bfd69d3..3a80840891 100644 --- a/gtk2_ardour/window_manager.h +++ b/gtk2_ardour/window_manager.h @@ -47,7 +47,7 @@ namespace WM { class ProxyBase; -class Manager +class Manager : public ARDOUR::SessionHandlePtr { public: static Manager& instance(); @@ -75,7 +75,7 @@ class Manager static Manager* _instance; }; -class ProxyBase : public sigc::trackable { +class ProxyBase : public ARDOUR::SessionHandlePtr, public sigc::trackable { public: ProxyBase (const std::string& name, const std::string& menu_name); ProxyBase (const std::string& name, const std::string& menu_name, const XMLNode&); @@ -106,7 +106,7 @@ class ProxyBase : public sigc::trackable { XMLNode& get_state () const; virtual ARDOUR::SessionHandlePtr* session_handle () = 0; - + operator bool() const { return _window != 0; } protected: @@ -122,6 +122,7 @@ class ProxyBase : public sigc::trackable { Gtkmm2ext::VisibilityTracker* vistracker; void save_pos_and_size (); + bool handle_win_event (GdkEventAny *ev); void setup (); }; @@ -139,7 +140,7 @@ class ProxyTemporary: public ProxyBase { Gtk::Window* operator->() { return _window; } - + ARDOUR::SessionHandlePtr* session_handle (); }; @@ -177,6 +178,15 @@ class ProxyWithConstructor: public ProxyBase { return dynamic_cast<T*> (_window); } + void set_session(ARDOUR::Session *s) { + SessionHandlePtr::set_session (s); + ARDOUR::SessionHandlePtr* sp = session_handle (); + if (sp) { + sp->set_session (s); + dynamic_cast<T*>(_window)->set_session(s); + } + } + private: boost::function<T*()> creator; }; @@ -215,6 +225,15 @@ class Proxy : public ProxyBase { return dynamic_cast<T*> (_window); } + void set_session(ARDOUR::Session *s) { + SessionHandlePtr::set_session (s); + ARDOUR::SessionHandlePtr* sp = session_handle (); + if (sp) { + sp->set_session (s); + dynamic_cast<T*>(_window)->set_session(s); + } + } + private: boost::function<T*()> creator; }; |