ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

NOOP, whitespace.

Browse Source
This commit is contained in:
Robin Gareus 2015-09-19 20:31:32 +02:00
parent dad0e390ff
commit a6caf6ed3a
2 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
gtk2_ardour/strip_silence_dialog.cc
View File

@ -43,15 +43,15 @@ using namespace ArdourCanvas;
StripSilenceDialog::StripSilenceDialog (Session* s, list<RegionView*> const & v)
: ArdourDialog (_("Strip Silence"))
, ProgressReporter ()
, _minimum_length (new AudioClock (X_("silence duration"), true, "", true, false, true, false))
, _fade_length (new AudioClock (X_("silence duration"), true, "", 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))
, _destroying (false)
{
set_session (s);
set_session (s);
for (list<RegionView*>::const_iterator r = v.begin(); r != v.end(); ++r) {
views.push_back (ViewInterval (*r));
}
for (list<RegionView*>::const_iterator r = v.begin(); r != v.end(); ++r) {
views.push_back (ViewInterval (*r));
}
Gtk::HBox* hbox = Gtk::manage (new Gtk::HBox);
@ -75,17 +75,17 @@ StripSilenceDialog::StripSilenceDialog (Session* s, list<RegionView*> const & v)
table->attach (*_minimum_length, 1, 2, n, n + 1, Gtk::FILL);
++n;
_minimum_length->set_session (s);
_minimum_length->set_mode (AudioClock::Frames);
_minimum_length->set (1000, true);
_minimum_length->set_session (s);
_minimum_length->set_mode (AudioClock::Frames);
_minimum_length->set (1000, true);
table->attach (*Gtk::manage (new Gtk::Label (_("Fade length"), 1, 0.5)), 0, 1, n, n + 1, Gtk::FILL);
table->attach (*_fade_length, 1, 2, n, n + 1, Gtk::FILL);
table->attach (*_fade_length, 1, 2, n, n + 1, Gtk::FILL);
++n;
_fade_length->set_session (s);
_fade_length->set_mode (AudioClock::Frames);
_fade_length->set (64, true);
_fade_length->set_session (s);
_fade_length->set_mode (AudioClock::Frames);
_fade_length->set (64, true);
hbox->pack_start (*table);
@ -99,8 +99,8 @@ StripSilenceDialog::StripSilenceDialog (Session* s, list<RegionView*> const & v)
show_all ();
_threshold.get_adjustment()->signal_value_changed().connect (sigc::mem_fun (*this, &StripSilenceDialog::threshold_changed));
_minimum_length->ValueChanged.connect (sigc::mem_fun (*this, &StripSilenceDialog::restart_thread));
_threshold.get_adjustment()->signal_value_changed().connect (sigc::mem_fun (*this, &StripSilenceDialog::threshold_changed));
_minimum_length->ValueChanged.connect (sigc::mem_fun (*this, &StripSilenceDialog::restart_thread));
update_silence_rects ();
update_threshold_line ();
@ -132,10 +132,10 @@ StripSilenceDialog::~StripSilenceDialog ()
void
StripSilenceDialog::silences (AudioIntervalMap& m)
{
for (list<ViewInterval>::iterator v = views.begin(); v != views.end(); ++v) {
pair<boost::shared_ptr<Region>,AudioIntervalResult> newpair (v->view->region(), v->intervals);
m.insert (newpair);
}
for (list<ViewInterval>::iterator v = views.begin(); v != views.end(); ++v) {
pair<boost::shared_ptr<Region>,AudioIntervalResult> newpair (v->view->region(), v->intervals);
m.insert (newpair);
}
}
void
@ -144,9 +144,9 @@ StripSilenceDialog::drop_rects ()
// called by parent when starting to progess (dialog::run returned),
// but before the dialog is destoyed.
for (list<ViewInterval>::iterator v = views.begin(); v != views.end(); ++v) {
v->view->drop_silent_frames ();
}
for (list<ViewInterval>::iterator v = views.begin(); v != views.end(); ++v) {
v->view->drop_silent_frames ();
}
cancel_button->set_sensitive (false);
apply_button->set_sensitive (false);
@ -186,10 +186,10 @@ StripSilenceDialog::update_silence_rects ()
{
/* Lock so that we don't contend with the detection thread for access to the silence regions */
Glib::Threads::Mutex::Lock lm (_lock);
double const y = _threshold.get_value();
double const y = _threshold.get_value();
for (list<ViewInterval>::iterator v = views.begin(); v != views.end(); ++v) {
v->view->set_silent_frames (v->intervals, y);
for (list<ViewInterval>::iterator v = views.begin(); v != views.end(); ++v) {
v->view->set_silent_frames (v->intervals, y);
}
}
@ -204,18 +204,18 @@ StripSilenceDialog::_detection_thread_work (void* arg)
void *
StripSilenceDialog::detection_thread_work ()
{
ARDOUR_UI::instance()->register_thread ("gui", pthread_self(), "silence", 32);
ARDOUR_UI::instance()->register_thread ("gui", pthread_self(), "silence", 32);
/* Hold this lock when we are doing work */
_lock.lock ();
while (1) {
for (list<ViewInterval>::iterator i = views.begin(); i != views.end(); ++i) {
boost::shared_ptr<AudioRegion> ar = boost::dynamic_pointer_cast<AudioRegion> ((*i).view->region());
boost::shared_ptr<AudioRegion> ar = boost::dynamic_pointer_cast<AudioRegion> ((*i).view->region());
if (ar) {
i->intervals = ar->find_silence (dB_to_coefficient (threshold ()), minimum_length (), _interthread_info);
}
if (ar) {
i->intervals = ar->find_silence (dB_to_coefficient (threshold ()), minimum_length (), _interthread_info);
}
if (_interthread_info.cancel) {
break;
@ -248,7 +248,7 @@ StripSilenceDialog::restart_thread ()
method to be called after our destructor has finished executing.
If this happens, bad things follow; _lock cannot be locked and
Ardour hangs. So if we are destroying, just bail early.
*/
*/
return;
}
@ -275,13 +275,13 @@ StripSilenceDialog::threshold_changed ()
framecnt_t
StripSilenceDialog::minimum_length () const
{
return _minimum_length->current_duration (views.front().view->region()->position());
return _minimum_length->current_duration (views.front().view->region()->position());
}
framecnt_t
StripSilenceDialog::fade_length () const
{
return _fade_length->current_duration (views.front().view->region()->position());
return _fade_length->current_duration (views.front().view->region()->position());
}
void

26
gtk2_ardour/strip_silence_dialog.h
View File

@ -25,7 +25,7 @@
#include "progress_reporter.h"
namespace ARDOUR {
class Session;
class Session;
}
class AudioClock;
@ -35,25 +35,25 @@ class RegionView;
class StripSilenceDialog : public ArdourDialog, public ProgressReporter
{
public:
StripSilenceDialog (ARDOUR::Session*, std::list<RegionView*> const &);
StripSilenceDialog (ARDOUR::Session*, std::list<RegionView*> const &);
~StripSilenceDialog ();
double threshold () const {
return _threshold.get_value ();
}
void drop_rects ();
void drop_rects ();
void silences (ARDOUR::AudioIntervalMap&);
void silences (ARDOUR::AudioIntervalMap&);
ARDOUR::framecnt_t minimum_length () const;
ARDOUR::framecnt_t fade_length () const;
ARDOUR::framecnt_t fade_length () const;
private:
void create_waves ();
void canvas_allocation (Gtk::Allocation &);
void update_silence_rects ();
void resize_silence_rects ();
void resize_silence_rects ();
void update ();
void update_threshold_line ();
void update_stats (ARDOUR::AudioIntervalResult const &);
@ -63,20 +63,20 @@ private:
Gtk::SpinButton _threshold;
AudioClock* _minimum_length;
AudioClock* _fade_length;
AudioClock* _fade_length;
Gtk::ProgressBar _progress_bar;
Gtk::Button* cancel_button;
Gtk::Button* apply_button;
struct ViewInterval {
RegionView* view;
ARDOUR::AudioIntervalResult intervals;
struct ViewInterval {
RegionView* view;
ARDOUR::AudioIntervalResult intervals;
ViewInterval (RegionView* rv) : view (rv) {}
};
ViewInterval (RegionView* rv) : view (rv) {}
};
std::list<ViewInterval> views;
std::list<ViewInterval> views;
bool _destroying;