diff options
| author | Robin Gareus <robin@gareus.org> | 2016-05-16 02:49:18 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2016-05-16 02:49:18 +0200 |
| commit | 1b570d98861ba476ebd3fb9c066304973753c600 (patch) | |
| tree | 579a822f2423d76c4a861bcfa451e904c2622e1f /gtk2_ardour/audio_region_editor.h | |
| parent | 89361e08337c4179f432c9e9712e02e014d3891c (diff) | |
peak_amplitude_thread fix - #6807
On windows AudioRegionEditor d'tor never returns, stalling or
crashing in pthread_join() after pthread_cancel().
Crashes happen if two thread pools with the same name exist.
(but since the thread has no event loop, no pool is needed)
After showing Region Properties any operation that would close the dialog
will either cause the application to hang indefinitely or terminate.
This also consolidates code: CrossThreadChannel works on windows these days
Diffstat (limited to 'gtk2_ardour/audio_region_editor.h')
| -rw-r--r-- | gtk2_ardour/audio_region_editor.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/gtk2_ardour/audio_region_editor.h b/gtk2_ardour/audio_region_editor.h index dd726bdd54..083a39dfbc 100644 --- a/gtk2_ardour/audio_region_editor.h +++ b/gtk2_ardour/audio_region_editor.h @@ -36,11 +36,7 @@ #include "pbd/signals.h" -#ifdef PLATFORM_WINDOWS -#include "pbd/semutils.h" -#else #include "pbd/crossthread.h" -#endif #include "audio_clock.h" #include "ardour_dialog.h" @@ -78,16 +74,11 @@ class AudioRegionEditor : public RegionEditor Gtk::Entry _peak_amplitude; void signal_peak_thread (); - void wait_for_signal (); pthread_t _peak_amplitude_thread_handle; void peak_amplitude_found (double); PBD::Signal1<void, double> PeakAmplitudeFound; PBD::ScopedConnection _peak_amplitude_connection; -#ifdef PLATFORM_WINDOWS - PBD::Semaphore m_peak_sem; -#else CrossThreadChannel _peak_channel; -#endif }; #endif /* __gtk_ardour_audio_region_edit_h__ */ |