Visual tweaks to Soundcloud panel

[ardour.git] / gtk2_ardour / strip_silence_dialog.cc

diff --git a/gtk2_ardour/strip_silence_dialog.cc b/gtk2_ardour/strip_silence_dialog.cc
index 5f9dc6441d131b078ea1ba4030fa8f21b8228dd9..d37fbb6585ebea29391b61f5ab9e89e47d25668a 100644 (file)
--- a/gtk2_ardour/strip_silence_dialog.cc
+++ b/gtk2_ardour/strip_silence_dialog.cc
@@ -22,21 +22,15 @@
 #include <gtkmm/table.h>
 #include <gtkmm/label.h>
 #include <gtkmm/stock.h>
-#include "ardour/audioregion.h"
-#include "ardour/audiosource.h"
 
+#include "ardour/audioregion.h"
 #include "ardour/dB.h"
 #include "ardour_ui.h"
-#include "ardour/session.h"
 
 #include "audio_clock.h"
 #include "gui_thread.h"
 #include "strip_silence_dialog.h"
-#include "canvas_impl.h"
 #include "region_view.h"
-#include "simpleline.h"
-#include "waveview.h"
-#include "simplerect.h"
 #include "rgb_macros.h"
 #include "i18n.h"
 #include "logmeter.h"
@@ -49,8 +43,8 @@ using namespace ArdourCanvas;
 StripSilenceDialog::StripSilenceDialog (Session* s, list<RegionView*> const & v)
        : ArdourDialog (_("Strip Silence"))
        , ProgressReporter ()
-        , _minimum_length (new AudioClock (X_("silence duration"), true, "SilenceDurationClock", true, false, true, false))
-        , _fade_length (new AudioClock (X_("silence duration"), true, "SilenceDurationClock", true, false, true, false))
+        , _minimum_length (new AudioClock (X_("silence duration"), true, "", true, false, true, false))
+        , _fade_length (new AudioClock (X_("silence duration"), true, "", true, false, true, false))
        , _peaks_ready_connection (0)
        , _destroying (false)
 {
@@ -76,6 +70,7 @@ StripSilenceDialog::StripSilenceDialog (Session* s, list<RegionView*> const & v)
        _threshold.set_increments (1, 10);
        _threshold.set_range (-120, 0);
        _threshold.set_value (-60);
+       _threshold.set_activates_default ();
 
        table->attach (*Gtk::manage (new Gtk::Label (_("Minimum length"), 1, 0.5)), 0, 1, n, n + 1, Gtk::FILL);
        table->attach (*_minimum_length, 1, 2, n, n + 1, Gtk::FILL);
@@ -99,6 +94,7 @@ StripSilenceDialog::StripSilenceDialog (Session* s, list<RegionView*> const & v)
 
        add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
        add_button (Gtk::Stock::APPLY, Gtk::RESPONSE_OK);
+       set_default_response (Gtk::RESPONSE_OK);
 
        get_vbox()->pack_start (_progress_bar, true, true, 12);
 
@@ -111,7 +107,7 @@ StripSilenceDialog::StripSilenceDialog (Session* s, list<RegionView*> const & v)
        update_threshold_line ();
 
        /* Create a thread which runs while the dialogue is open to compute the silence regions */
-       Completed.connect (_completed_connection, MISSING_INVALIDATOR, ui_bind (&StripSilenceDialog::update, this), gui_context ());
+       Completed.connect (_completed_connection, MISSING_INVALIDATOR, boost::bind (&StripSilenceDialog::update, this), gui_context ());
        _thread_should_finish = false;
        pthread_create (&_thread, 0, StripSilenceDialog::_detection_thread_work, this);
 }
@@ -187,7 +183,7 @@ void
 StripSilenceDialog::update_silence_rects ()
 {
        /* Lock so that we don't contend with the detection thread for access to the silence regions */
-       Glib::Mutex::Lock lm (_lock);
+       Glib::Threads::Mutex::Lock lm (_lock);
         double const y = _threshold.get_value();
 
         for (list<ViewInterval>::iterator v = views.begin(); v != views.end(); ++v) {