diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-06-11 15:49:18 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-06-11 15:49:38 -0400 |
| commit | 2c44225df2569bffe452fe2a84b698488f203cf0 (patch) | |
| tree | dbf597787d00d433ab998e9551ca996cb824b72d /gtk2_ardour/group_tabs.h | |
| parent | 63e6378713b1cb130efeb2347e42e796931b1415 (diff) | |
make RouteGroupDialog non-modal.
Not really how/why it was modal, but it did run a recursive main event loop, and these are
always a bad idea for lots of reasons. So I removed that feature, which makes it non-modal.
Not 100% tested yet.
Diffstat (limited to 'gtk2_ardour/group_tabs.h')
| -rw-r--r-- | gtk2_ardour/group_tabs.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gtk2_ardour/group_tabs.h b/gtk2_ardour/group_tabs.h index f718128e5f..39ea78deb6 100644 --- a/gtk2_ardour/group_tabs.h +++ b/gtk2_ardour/group_tabs.h @@ -27,6 +27,7 @@ namespace ARDOUR { } class Editor; +class RouteGroupDialog; /** Parent class for tabs which represent route groups as colored tabs; * Currently used on the left-hand side of the editor and at the top of the mixer. @@ -48,7 +49,7 @@ public: */ Gtk::Menu* get_menu (ARDOUR::RouteGroup* g, bool tabArea = false); - void run_new_group_dialog (ARDOUR::RouteList const &, bool with_master); + void run_new_group_dialog (ARDOUR::RouteList const *, bool with_master); static void set_group_color (ARDOUR::RouteGroup *, uint32_t); static std::string group_gui_id (ARDOUR::RouteGroup *); @@ -98,9 +99,10 @@ private: void new_from_selection (bool with_master); void new_from_rec_enabled (bool with_master); void new_from_soloed (bool with_master); - ARDOUR::RouteGroup* create_and_add_group () const; - ARDOUR::RouteGroup* create_and_add_master () const; - ARDOUR::RouteGroup* create_and_add_group_with_master () const; + + void new_group_dialog_finished (int, RouteGroupDialog*, ARDOUR::RouteList const *, bool with_master) const; + void edit_group_dialog_finished (int, RouteGroupDialog*) const; + void collect (ARDOUR::RouteGroup *); void set_activation (ARDOUR::RouteGroup *, bool); void edit_group (ARDOUR::RouteGroup *); @@ -122,7 +124,7 @@ private: void route_added_to_route_group (ARDOUR::RouteGroup *, boost::weak_ptr<ARDOUR::Route>); void route_removed_from_route_group (ARDOUR::RouteGroup *, boost::weak_ptr<ARDOUR::Route>); - void assign_group_to_master (uint32_t which, ARDOUR::RouteGroup*, bool rename_master); + void assign_group_to_master (uint32_t which, ARDOUR::RouteGroup*, bool rename_master) const; void assign_selection_to_master (uint32_t which); void assign_recenabled_to_master (uint32_t which); void assign_soloed_to_master (uint32_t which); |