Make scroll-wheel modifier keys consistent in editor summary pane.

[ardour.git] / gtk2_ardour / audio_region_editor.cc

diff --git a/gtk2_ardour/audio_region_editor.cc b/gtk2_ardour/audio_region_editor.cc
index b0767604c95e3923452bf760e65c8c236bf6738e..2aeb2dbe60aae44ffe7cfcd737c19cf5dd3d8691 100644 (file)
--- a/gtk2_ardour/audio_region_editor.cc
+++ b/gtk2_ardour/audio_region_editor.cc
@@ -17,17 +17,17 @@
 
 */
 
+#include <cmath>
+
+#include <gtkmm2ext/utils.h>
+
 #include "pbd/memento_command.h"
 #include "pbd/stateful_diff_command.h"
 #include "pbd/pthread_utils.h"
 
-#include "ardour/session.h"
 #include "ardour/audioregion.h"
-#include "ardour/playlist.h"
-#include "ardour/utils.h"
+#include "ardour/session_event.h"
 #include "ardour/dB.h"
-#include <gtkmm2ext/utils.h>
-#include <cmath>
 
 #include "audio_region_editor.h"
 #include "audio_region_view.h"
@@ -96,10 +96,9 @@ AudioRegionEditor::AudioRegionEditor (Session* s, boost::shared_ptr<AudioRegion>
 
 AudioRegionEditor::~AudioRegionEditor ()
 {
-       pthread_cancel_one (_peak_amplitude_thread_handle);
        void* v;
-       int const r = pthread_join (_peak_amplitude_thread_handle, &v);
-       assert (r == 0);
+       pthread_cancel_one (_peak_amplitude_thread_handle);
+       pthread_join (_peak_amplitude_thread_handle, &v);
 }
 
 void