diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-12-13 13:44:11 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-12-13 13:44:11 +0000 |
| commit | 341cbfbd19dd9e885020c6fe1120fbcc497d621e (patch) | |
| tree | 3e8233aa9ce5860ea487b890c3bd470fb7a3f956 /libs | |
| parent | 17439ac72cbbfe70256d99c3380aa31a2eb7bd35 (diff) | |
reinstate the windows way for GUIIdle's but limit the scope of the connection to just the time when a long-running action is active (for now, just adding > 8 routes)
git-svn-id: svn://localhost/ardour2/branches/3.0@13654 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/ardour/ardour.h | 1 | ||||
| -rw-r--r-- | libs/ardour/globals.cc | 1 | ||||
| -rw-r--r-- | libs/ardour/session.cc | 5 | ||||
| -rw-r--r-- | libs/gtkmm2ext/pixfader.cc | 2 |
4 files changed, 9 insertions, 0 deletions
diff --git a/libs/ardour/ardour/ardour.h b/libs/ardour/ardour/ardour.h index c19d4332e8..03de3965ec 100644 --- a/libs/ardour/ardour/ardour.h +++ b/libs/ardour/ardour/ardour.h @@ -48,6 +48,7 @@ namespace ARDOUR { class AudioEngine; extern PBD::Signal1<void,std::string> BootMessage; + extern PBD::Signal0<void> GUIIdle; int init (bool with_vst, bool try_optimization); void init_post_engine (); diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc index 085dfc8e59..2b0bc05534 100644 --- a/libs/ardour/globals.cc +++ b/libs/ardour/globals.cc @@ -113,6 +113,7 @@ mix_buffers_with_gain_t ARDOUR::mix_buffers_with_gain = 0; mix_buffers_no_gain_t ARDOUR::mix_buffers_no_gain = 0; PBD::Signal1<void,std::string> ARDOUR::BootMessage; +PBD::Signal0<void> ARDOUR::GUIIdle; namespace ARDOUR { extern void setup_enum_writer (); diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index 4062537e37..3b46ad3be1 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -2012,8 +2012,11 @@ Session::new_audio_route (int input_channels, int output_channels, RouteGroup* r bus->add_internal_return (); ret.push_back (bus); + + ARDOUR::GUIIdle (); } + catch (failed_constructor &err) { error << _("Session: could not create new audio route.") << endmsg; goto failure; @@ -2241,6 +2244,8 @@ Session::add_routes_inner (RouteList& new_routes, bool input_auto_connect, bool order++; } } + + ARDOUR::GUIIdle (); } if (_monitor_out && IO::connecting_legal) { diff --git a/libs/gtkmm2ext/pixfader.cc b/libs/gtkmm2ext/pixfader.cc index 6099671fd2..c9a89e8791 100644 --- a/libs/gtkmm2ext/pixfader.cc +++ b/libs/gtkmm2ext/pixfader.cc @@ -318,6 +318,8 @@ PixFader::on_button_release_event (GdkEventButton* ev) /* no motion - just a click */ + cerr << "no motion click\n"; + if (ev->state & Keyboard::TertiaryModifier) { adjustment.set_value (default_value); } else if (ev->state & Keyboard::GainFineScaleModifier) { |