diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-09-30 17:55:14 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-09-30 17:55:14 +0000 |
| commit | 0938a42440cc82ce8d0cb064840c258c863714ab (patch) | |
| tree | 19f58c31e65226d85c76d96647a6e300f7995c10 /gtk2_ardour/audio_region_editor.cc | |
| parent | 15e390ebe5611b5443eb1fb57631826389ffd021 (diff) | |
fixes for 98% of all the warnings/errors reported by OS X gcc on tiger
git-svn-id: svn://localhost/ardour2/branches/3.0@10179 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/audio_region_editor.cc')
| -rw-r--r-- | gtk2_ardour/audio_region_editor.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gtk2_ardour/audio_region_editor.cc b/gtk2_ardour/audio_region_editor.cc index b0767604c9..e06e50f113 100644 --- a/gtk2_ardour/audio_region_editor.cc +++ b/gtk2_ardour/audio_region_editor.cc @@ -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 |