X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Faudio_region_editor.cc;h=15186f2b8af4a9889ec8721986160974d6669af7;hb=29b80725559c8fd60ae51bf33270963e647d0c1c;hp=806659b52c1f3b04a17733c3ef6d5ccbbd5af108;hpb=02cfe41bff57712e59f7169037d694a3dd6a1420;p=ardour.git

diff --git a/gtk2_ardour/audio_region_editor.cc b/gtk2_ardour/audio_region_editor.cc
index 806659b52c..15186f2b8a 100644
--- a/gtk2_ardour/audio_region_editor.cc
+++ b/gtk2_ardour/audio_region_editor.cc
@@ -17,25 +17,23 @@
 
 */
 
+#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"
-#include "ardour_ui.h"
-#include "utils.h"
 #include "gui_thread.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;
@@ -45,7 +43,6 @@ using namespace Gtkmm2ext;
 static void *
 _peak_amplitude_thread (void* arg)
 {
-	SessionEvent::create_per_thread_pool ("peak amplitude events", 64);
 	static_cast<AudioRegionEditor*>(arg)->peak_amplitude_thread ();
 	return 0;
 }
@@ -74,14 +71,14 @@ AudioRegionEditor::AudioRegionEditor (Session* s, boost::shared_ptr<AudioRegion>
 	b->set_spacing (6);
 	b->pack_start (_peak_amplitude);
 	b->pack_start (*Gtk::manage (new Gtk::Label (_("dBFS"))), false, false);
-	
+
 	_peak_amplitude_label.set_name ("AudioRegionEditorLabel");
 	_peak_amplitude_label.set_text (_("Peak amplitude:"));
 	_peak_amplitude_label.set_alignment (1, 0.5);
 	_table.attach (_peak_amplitude_label, 0, 1, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
 	_table.attach (*b, 1, 2, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
 	++_table_row;
-	
+
 	gain_changed ();
 
 	gain_adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &AudioRegionEditor::gain_adjustment_changed));
@@ -90,30 +87,32 @@ AudioRegionEditor::AudioRegionEditor (Session* s, boost::shared_ptr<AudioRegion>
 	_peak_amplitude.set_text (_("Calculating..."));
 
 	PeakAmplitudeFound.connect (_peak_amplitude_connection, invalidator (*this), boost::bind (&AudioRegionEditor::peak_amplitude_found, this, _1), gui_context ());
-	pthread_create_and_store (X_("peak-amplitude"), &_peak_amplitude_thread_handle, _peak_amplitude_thread, this);
-	_peak_channel.deliver ('c');
+
+	char name[64];
+	snprintf (name, 64, "peak amplitude-%p", this);
+	pthread_create_and_store (name, &_peak_amplitude_thread_handle, _peak_amplitude_thread, this);
+	signal_peak_thread ();
 }
 
 AudioRegionEditor::~AudioRegionEditor ()
 {
-	pthread_cancel_one (_peak_amplitude_thread_handle);
 	void* v;
-	int const r = pthread_join (_peak_amplitude_thread_handle, &v);
-	assert (r == 0);
+	_peak_channel.deliver ('t');
+	pthread_join (_peak_amplitude_thread_handle, &v);
 }
 
 void
 AudioRegionEditor::region_changed (const PBD::PropertyChange& what_changed)
 {
 	RegionEditor::region_changed (what_changed);
-	
+
 	if (what_changed.contains (ARDOUR::Properties::scale_amplitude)) {
 		gain_changed ();
 	}
 
 	if (what_changed.contains (ARDOUR::Properties::start) || what_changed.contains (ARDOUR::Properties::length)) {
 		/* ask the peak thread to run again */
-		_peak_channel.deliver ('c');
+		signal_peak_thread ();
 	}
 }
 void
@@ -134,14 +133,24 @@ AudioRegionEditor::gain_adjustment_changed ()
 	}
 }
 
+void
+AudioRegionEditor::signal_peak_thread ()
+{
+	_peak_channel.deliver ('c');
+}
+
 void
 AudioRegionEditor::peak_amplitude_thread ()
 {
 	while (1) {
-		/* await instructions to run */
 		char msg;
+		/* await instructions to run */
 		_peak_channel.receive (msg);
 
+		if (msg == 't') {
+			break;
+		}
+
 		/* compute peak amplitude and signal the fact */
 		PeakAmplitudeFound (accurate_coefficient_to_dB (_audio_region->maximum_amplitude ())); /* EMIT SIGNAL */
 	}