stop AddRouteDialog from being modal and from using a recursive run loop

[ardour.git] / gtk2_ardour / route_group_menu.h

diff --git a/gtk2_ardour/route_group_menu.h b/gtk2_ardour/route_group_menu.h
index 7827179acb7fbb130cadec2f837691d58523a79f..334a3b504e99b6ef7857bbecd4edc9aa7fcfad97 100644 (file)
--- a/gtk2_ardour/route_group_menu.h
+++ b/gtk2_ardour/route_group_menu.h
@@ -17,26 +17,35 @@
 
 */
 
+#ifndef __ardour_gtk_route_group_menu_h__
+#define __ardour_gtk_route_group_menu_h__
+
 #include "ardour/route_group.h"
+#include "ardour/session_handle.h"
 
-namespace ARDOUR {
-       class Session;
-}
+class RouteGroupDialog;
 
-class RouteGroupMenu : public Gtk::Menu
+class RouteGroupMenu : public ARDOUR::SessionHandlePtr
 {
 public:
-       RouteGroupMenu (ARDOUR::Session &, ARDOUR::RouteGroup::Property);
+       RouteGroupMenu (ARDOUR::Session*, PBD::PropertyList*);
+       ~RouteGroupMenu();
 
-       void rebuild (ARDOUR::RouteGroup *);
+       Gtk::Menu* menu ();
+       void build (ARDOUR::WeakRouteList const &);
+       void detach ();
 
-       sigc::signal<void, ARDOUR::RouteGroup*> GroupSelected;
-       
-private:
-       void add_item (ARDOUR::RouteGroup *, ARDOUR::RouteGroup *, Gtk::RadioMenuItem::Group*);
+  private:
+       void add_item (ARDOUR::RouteGroup *, std::set<ARDOUR::RouteGroup*> const &, Gtk::RadioMenuItem::Group*);
        void new_group ();
        void set_group (ARDOUR::RouteGroup *);
-       
-       ARDOUR::Session& _session;
-       ARDOUR::RouteGroup::Property _default_properties;
+       void new_group_dialog_finished (int, RouteGroupDialog*);
+
+       Gtk::Menu* _menu;
+
+       PBD::PropertyList* _default_properties;
+       bool _inhibit_group_selected;
+       ARDOUR::WeakRouteList _subject;
 };
+
+#endif /* __ardour_gtk_route_group_menu_h__ */