X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faudio_region_editor.cc;h=2041d20335feb17e289c4d488db29f4817214416;hb=5fef65538040fbac1b9edd1847a269aa925a49c9;hp=e47f145c7e2e4caabbdde6f03e962e0c89f077c4;hpb=b842ba42f537fd8055e9da4cf46bf0f3750bbc1f;p=ardour.git

diff --git a/gtk2_ardour/audio_region_editor.cc b/gtk2_ardour/audio_region_editor.cc
index e47f145c7e..2041d20335 100644
--- a/gtk2_ardour/audio_region_editor.cc
+++ b/gtk2_ardour/audio_region_editor.cc
@@ -17,22 +17,21 @@
 
 */
 
+#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"
@@ -53,8 +52,10 @@ _peak_amplitude_thread (void* arg)
 AudioRegionEditor::AudioRegionEditor (Session* s, boost::shared_ptr<AudioRegion> r)
 	: RegionEditor (s, r)
 	, _audio_region (r)
-	, gain_adjustment(accurate_coefficient_to_dB(_audio_region->scale_amplitude()), -40.0, +40.0, 0.1, 1.0, 0)	  
-	, _peak_amplitude_found (false)
+	, gain_adjustment(accurate_coefficient_to_dB(_audio_region->scale_amplitude()), -40.0, +40.0, 0.1, 1.0, 0)
+#ifndef PLATFORM_WINDOWS
+	, _peak_channel (false)
+#endif
 {
 
 	Gtk::HBox* b = Gtk::manage (new Gtk::HBox);
@@ -74,14 +75,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));
@@ -91,24 +92,29 @@ AudioRegionEditor::AudioRegionEditor (Session* s, boost::shared_ptr<AudioRegion>
 
 	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);
+	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);
+	pthread_cancel_one (_peak_amplitude_thread_handle);
+	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 */
+		signal_peak_thread ();
+	}
 }
 void
 AudioRegionEditor::gain_changed ()
@@ -128,10 +134,37 @@ AudioRegionEditor::gain_adjustment_changed ()
 	}
 }
 
+void
+AudioRegionEditor::signal_peak_thread ()
+{
+#ifdef PLATFORM_WINDOWS
+	m_peak_sem.post ();
+#else
+	_peak_channel.deliver ('c');
+#endif
+}
+
+void
+AudioRegionEditor::wait_for_signal ()
+{
+#ifdef PLATFORM_WINDOWS
+	m_peak_sem.wait ();
+#else
+	char msg;
+	_peak_channel.receive (msg);
+#endif
+}
+
 void
 AudioRegionEditor::peak_amplitude_thread ()
 {
-	PeakAmplitudeFound (accurate_coefficient_to_dB (_audio_region->maximum_amplitude ())); /* EMIT SIGNAL */
+	while (1) {
+		/* await instructions to run */
+		wait_for_signal ();
+
+		/* compute peak amplitude and signal the fact */
+		PeakAmplitudeFound (accurate_coefficient_to_dB (_audio_region->maximum_amplitude ())); /* EMIT SIGNAL */
+	}
 }
 
 void