smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-09 08:14:58 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Paul Davis 2016-06-12 14:53:55 -04:00
parent 0852d05643
commit d42f075408
4 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gtk2_ardour/add_route_dialog.cc
View file

@ -63,7 +63,6 @@ AddRouteDialog::AddRouteDialog ()
, instrument_label (_("Instrument:")) , instrument_label (_("Instrument:"))
{ {
set_name ("AddRouteDialog"); set_name ("AddRouteDialog");
set_modal (true);
set_skip_taskbar_hint (true); set_skip_taskbar_hint (true);
set_resizable (false); set_resizable (false);
set_position (WIN_POS_MOUSE); set_position (WIN_POS_MOUSE);

13
gtk2_ardour/ardour_ui.cc
View file

@ -4005,7 +4005,9 @@ ARDOUR_UI::start_duplicate_routes ()
void void
ARDOUR_UI::add_route () ARDOUR_UI::add_route ()
{ {
int count; if (!add_route_dialog.get (false)) {
add_route_dialog->signal_response().connect (sigc::mem_fun (*this, &ARDOUR_UI::add_route_dialog_finished));
}
if (!_session) { if (!_session) {
return; return;
@ -4016,7 +4018,14 @@ ARDOUR_UI::add_route ()
return; return;
} }
ResponseType r = (ResponseType) add_route_dialog->run (); add_route_dialog->set_position (WIN_POS_MOUSE);
add_route_dialog->present();
}
void
ARDOUR_UI::add_route_dialog_finished (int r)
{
int count;
add_route_dialog->hide(); add_route_dialog->hide();

1
gtk2_ardour/ardour_ui.h
View file

@ -261,6 +261,7 @@ public:
void synchronize_sync_source_and_video_pullup (); void synchronize_sync_source_and_video_pullup ();
void add_route (); void add_route ();
void add_route_dialog_finished (int);
void add_routes_part_two (); void add_routes_part_two ();
void add_routes_thread (); void add_routes_thread ();

1
gtk2_ardour/route_group_menu.h
View file

@ -40,6 +40,7 @@ public:
void new_group (); void new_group ();
void set_group (ARDOUR::RouteGroup *); void set_group (ARDOUR::RouteGroup *);
void new_group_dialog_finished (int, RouteGroupDialog*); void new_group_dialog_finished (int, RouteGroupDialog*);
Gtk::Menu* _menu; Gtk::Menu* _menu;
PBD::PropertyList* _default_properties; PBD::PropertyList* _default_properties;