summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/editor_route_groups.cc4
-rw-r--r--gtk2_ardour/group_tabs.cc101
-rw-r--r--gtk2_ardour/group_tabs.h12
-rw-r--r--gtk2_ardour/mixer_ui.cc4
-rw-r--r--gtk2_ardour/route_group_dialog.h1
5 files changed, 53 insertions, 69 deletions
diff --git a/gtk2_ardour/editor_route_groups.cc b/gtk2_ardour/editor_route_groups.cc
index 7a6e22e76d..7d3f0e2ccd 100644
--- a/gtk2_ardour/editor_route_groups.cc
+++ b/gtk2_ardour/editor_route_groups.cc
@@ -572,9 +572,7 @@ EditorRouteGroups::set_session (Session* s)
void
EditorRouteGroups::run_new_group_dialog ()
{
- RouteList rl;
-
- return _editor->_group_tabs->run_new_group_dialog (rl, false);
+ return _editor->_group_tabs->run_new_group_dialog (0, false);
}
/** Called when a model row is deleted, but also when the model is
diff --git a/gtk2_ardour/group_tabs.cc b/gtk2_ardour/group_tabs.cc
index f7ceb9e996..057f551636 100644
--- a/gtk2_ardour/group_tabs.cc
+++ b/gtk2_ardour/group_tabs.cc
@@ -25,6 +25,8 @@
#include "ardour/vca_manager.h"
#include "ardour/vca.h"
+#include "gtkmm2ext/doi.h"
+
#include "gui_thread.h"
#include "route_group_dialog.h"
#include "group_tabs.h"
@@ -145,7 +147,7 @@ GroupTabs::on_button_press_event (GdkEventButton* ev)
if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier) && g) {
/* edit */
RouteGroupDialog d (g, false);
- d.do_run ();
+ d.present ();
} else {
Menu* m = get_menu (g, true);
if (m) {
@@ -208,12 +210,7 @@ GroupTabs::on_button_release_event (GdkEventButton*)
if (!routes.empty()) {
if (_dragging_new_tab) {
- RouteGroup* g = create_and_add_group ();
- if (g) {
- for (RouteList::iterator i = routes.begin(); i != routes.end(); ++i) {
- g->add (*i);
- }
- }
+ run_new_group_dialog (&routes, false);
} else {
boost::shared_ptr<RouteList> r = _session->get_routes ();
for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
@@ -344,8 +341,8 @@ GroupTabs::get_menu (RouteGroup* g, bool in_tab_area)
const VCAList vcas = _session->vca_manager().vcas ();
if (!in_tab_area) {
- items.push_back (MenuElem (_("Create New Group ..."), hide_return (sigc::mem_fun(*this, &GroupTabs::create_and_add_group))));
- items.push_back (MenuElem (_("Create New Group with Control Master ..."), hide_return (sigc::mem_fun(*this, &GroupTabs::create_and_add_group_with_master))));
+ items.push_back (MenuElem (_("Create New Group ..."), sigc::bind (sigc::mem_fun(*this, &GroupTabs::run_new_group_dialog), (RouteList const *) 0, false)));
+ items.push_back (MenuElem (_("Create New Group with Control Master ..."), sigc::bind (sigc::mem_fun(*this, &GroupTabs::run_new_group_dialog), (RouteList const *) 0, true)));
/* context menu is not for a group tab, show the "create new
from" items here
@@ -436,7 +433,7 @@ GroupTabs::get_menu (RouteGroup* g, bool in_tab_area)
}
void
-GroupTabs::assign_group_to_master (uint32_t which, RouteGroup* group, bool rename_master)
+GroupTabs::assign_group_to_master (uint32_t which, RouteGroup* group, bool rename_master) const
{
if (!_session || !group) {
return;
@@ -569,86 +566,74 @@ GroupTabs::assign_soloed_to_master (uint32_t which)
void
GroupTabs::new_from_selection (bool with_master)
{
- run_new_group_dialog (selected_routes(), with_master);
+ RouteList rl (selected_routes());
+ run_new_group_dialog (&rl, with_master);
}
void
GroupTabs::new_from_rec_enabled (bool with_master)
{
- run_new_group_dialog (get_rec_enabled(), with_master);
+ RouteList rl (get_rec_enabled());
+ run_new_group_dialog (&rl, with_master);
}
void
GroupTabs::new_from_soloed (bool with_master)
{
- run_new_group_dialog (get_soloed(), with_master);
+ RouteList rl (get_soloed());
+ run_new_group_dialog (&rl, with_master);
}
void
-GroupTabs::run_new_group_dialog (RouteList const & rl, bool with_master)
+GroupTabs::run_new_group_dialog (RouteList const * rl, bool with_master)
{
- if (rl.empty()) {
+ if (rl && rl->empty()) {
return;
}
RouteGroup* g = new RouteGroup (*_session, "");
- RouteGroupDialog d (g, true);
-
- if (d.do_run ()) {
- delete g;
- } else {
- _session->add_route_group (g);
- for (RouteList::const_iterator i = rl.begin(); i != rl.end(); ++i) {
- g->add (*i);
- }
+ RouteGroupDialog* d = new RouteGroupDialog (g, true);
- if (with_master) {
- assign_group_to_master (0, g, true); /* zero => new master */
- }
- }
+ d->signal_response().connect (sigc::bind (sigc::mem_fun (*this, &GroupTabs::new_group_dialog_finished), d, rl ? new RouteList (*rl): 0, with_master));
+ d->present ();
}
-RouteGroup *
-GroupTabs::create_and_add_group () const
+void
+GroupTabs::new_group_dialog_finished (int r, RouteGroupDialog* d, RouteList const * rl, bool with_master) const
{
- RouteGroup* g = new RouteGroup (*_session, "");
- RouteGroupDialog d (g, true);
+ if (r == RESPONSE_OK) {
- if (d.do_run ()) {
- delete g;
- return 0;
- }
-
- _session->add_route_group (g);
- return g;
-}
+ _session->add_route_group (d->group());
-RouteGroup *
-GroupTabs::create_and_add_master () const
-{
- return 0;
-}
-
-RouteGroup *
-GroupTabs::create_and_add_group_with_master () const
-{
- RouteGroup* g = new RouteGroup (*_session, "");
- RouteGroupDialog d (g, true);
+ if (rl) {
+ for (RouteList::const_iterator i = rl->begin(); i != rl->end(); ++i) {
+ d->group()->add (*i);
+ }
- if (d.do_run ()) {
- delete g;
- return 0;
+ if (with_master) {
+ assign_group_to_master (0, d->group(), true); /* zero => new master */
+ }
+ }
+ } else {
+ delete d->group ();
}
- _session->add_route_group (g);
- return g;
+ delete rl;
+ delete_when_idle (d);
}
void
GroupTabs::edit_group (RouteGroup* g)
{
- RouteGroupDialog d (g, false);
- d.do_run ();
+ RouteGroupDialog* d = new RouteGroupDialog (g, false);
+ d->signal_response().connect (sigc::bind (sigc::mem_fun (*this, &GroupTabs::edit_group_dialog_finished), d));
+ d->present ();
+}
+
+void
+GroupTabs::edit_group_dialog_finished (int r, RouteGroupDialog* d) const
+{
+ delete_when_idle (d);
}
void
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);
diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc
index d88a7b9b16..0924f7aa74 100644
--- a/gtk2_ardour/mixer_ui.cc
+++ b/gtk2_ardour/mixer_ui.cc
@@ -1626,9 +1626,7 @@ Mixer_UI::route_groups_changed ()
void
Mixer_UI::new_route_group ()
{
- RouteList rl;
-
- _group_tabs->run_new_group_dialog (rl, false);
+ _group_tabs->run_new_group_dialog (0, false);
}
void
diff --git a/gtk2_ardour/route_group_dialog.h b/gtk2_ardour/route_group_dialog.h
index 5e2521d300..e43ccba79f 100644
--- a/gtk2_ardour/route_group_dialog.h
+++ b/gtk2_ardour/route_group_dialog.h
@@ -33,6 +33,7 @@ public:
RouteGroupDialog (ARDOUR::RouteGroup *, bool);
bool do_run ();
+ ARDOUR::RouteGroup* group() const { return _group; }
private:
ARDOUR::RouteGroup* _group;
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-27 15:56:36 +0000