X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faudio_region_editor.cc;h=15186f2b8af4a9889ec8721986160974d6669af7;hb=eecc9ed743d0623bf03ce1ead44ed329fa11211c;hp=e6983eb97008595cb3a4c45af5790b9dd9323416;hpb=22a2c820452eeec0399039149c179c4b0f7dcc21;p=ardour.git

diff --git a/gtk2_ardour/audio_region_editor.cc b/gtk2_ardour/audio_region_editor.cc
index e6983eb970..15186f2b8a 100644
--- a/gtk2_ardour/audio_region_editor.cc
+++ b/gtk2_ardour/audio_region_editor.cc
@@ -17,63 +17,103 @@
 
 */
 
+#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 <gtkmm2ext/stop_signal.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;
 using namespace std;
 using namespace Gtkmm2ext;
 
+static void *
+_peak_amplitude_thread (void* arg)
+{
+	static_cast<AudioRegionEditor*>(arg)->peak_amplitude_thread ();
+	return 0;
+}
+
 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)	  
-
+	, gain_adjustment(accurate_coefficient_to_dB(_audio_region->scale_amplitude()), -40.0, +40.0, 0.1, 1.0, 0)
+	, _peak_channel (false)
 {
-	gain_label.set_alignment (1, 0.5);
 
-	Gtk::HBox* gb = Gtk::manage (new Gtk::HBox);
-	gb->set_spacing (6);
-	gb->pack_start (gain_entry);
-	gb->pack_start (*Gtk::manage (new Gtk::Label (_("dB"))), false, false);
+	Gtk::HBox* b = Gtk::manage (new Gtk::HBox);
+	b->set_spacing (6);
+	b->pack_start (gain_entry);
+	b->pack_start (*Gtk::manage (new Gtk::Label (_("dB"))), false, false);
 
 	gain_label.set_name ("AudioRegionEditorLabel");
 	gain_label.set_text (_("Region gain:"));
+	gain_label.set_alignment (1, 0.5);
 	gain_entry.configure (gain_adjustment, 0.0, 1);
-	_table.attach (gain_label, 0, 1, 7, 8, Gtk::FILL, Gtk::FILL);
-	_table.attach (*gb, 1, 2, 7, 8, Gtk::FILL, Gtk::FILL);
+	_table.attach (gain_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;
+
+	b = Gtk::manage (new Gtk::HBox);
+	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));
+
+	_peak_amplitude.property_editable() = false;
+	_peak_amplitude.set_text (_("Calculating..."));
+
+	PeakAmplitudeFound.connect (_peak_amplitude_connection, invalidator (*this), boost::bind (&AudioRegionEditor::peak_amplitude_found, this, _1), gui_context ());
+
+	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 ()
+{
+	void* v;
+	_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 */
+		signal_peak_thread ();
+	}
 }
 void
 AudioRegionEditor::gain_changed ()
@@ -92,3 +132,37 @@ AudioRegionEditor::gain_adjustment_changed ()
 		_audio_region->set_scale_amplitude (gain);
 	}
 }
+
+void
+AudioRegionEditor::signal_peak_thread ()
+{
+	_peak_channel.deliver ('c');
+}
+
+void
+AudioRegionEditor::peak_amplitude_thread ()
+{
+	while (1) {
+		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 */
+	}
+}
+
+void
+AudioRegionEditor::peak_amplitude_found (double p)
+{
+	stringstream s;
+	s.precision (2);
+	s.setf (ios::fixed, ios::floatfield);
+	s << p;
+	_peak_amplitude.set_text (s.str ());
+}
+