ardour/livetrax
13
0
Fork 0
Code

trigger_ui: add buttons to display and modify segment_tempo

Browse Source
This commit is contained in:
Ben Loftis 2022-01-13 23:19:59 -06:00
parent de324b54b9
commit 6e5cb50f32
3 changed files with 37 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk2_ardour/audio_clip_editor.cc
View File

@ -95,9 +95,9 @@ AudioClipEditor::ClipBBTMetric::get_marks (std::vector<ArdourCanvas::Ruler::Mark
ArdourCanvas::Ruler::Mark mark;
assert (trigger->apparent_tempo() > 0.);
assert (trigger->segment_tempo() > 0.);
Temporal::Tempo tempo (trigger->apparent_tempo(), 4); /* XXX don't assume 4 */
Temporal::Tempo tempo (trigger->segment_tempo(), trigger->meter().divisions_per_bar());
std::cerr << "get marks between " << lower << " .. " << upper << " with tempo " << tempo << " upp = " << units_per_pixel << std::endl;
@ -442,7 +442,7 @@ AudioClipEditor::set_region (boost::shared_ptr<AudioRegion> r, TriggerReference
TriggerPtr t (tr.trigger());
if (t) {
if (t->apparent_tempo() == 0.) {
if (t->segment_tempo() == 0.) {
/* tempo unknown, hide ruler */
ruler->hide ();
} else {

38
gtk2_ardour/audio_trigger_properties_box.cc
View File

@ -28,6 +28,8 @@
#include "gtkmm2ext/utils.h"
#include "gtkmm2ext/menu_elems.h"
#include "widgets/tooltips.h"
#include "ardour/location.h"
#include "ardour/profile.h"
#include "ardour/session.h"
@ -56,6 +58,7 @@ AudioTriggerPropertiesBox::AudioTriggerPropertiesBox ()
, _gain_adjustment( 0.0, -20.0, +20.0, 1.0, 3.0, 0)
, _gain_spinner (_gain_adjustment)
, _stretch_toggle (ArdourButton::led_default_elements)
, _abpm_label (ArdourButton::Text)
{
_header_label.set_text (_("AUDIO Trigger Properties:"));
@ -72,8 +75,15 @@ AudioTriggerPropertiesBox::AudioTriggerPropertiesBox ()
label = manage (new Gtk::Label (_("BPM:")));
label->set_alignment (1.0, 0.5);
bpm_table->attach (*label, 0, 1, row, row + 1, Gtk::SHRINK, Gtk::SHRINK);
bpm_table->attach (_bpm_button, 1, 2, row, row + 1, Gtk::SHRINK, Gtk::SHRINK);
bpm_table->attach (_abpm_label, 2, 3, row, row + 1, Gtk::SHRINK, Gtk::SHRINK);
bpm_table->attach (_abpm_label, 1, 2, row, row + 1, Gtk::SHRINK, Gtk::SHRINK);
ArdourButton *half = manage (new ArdourButton (_("/2")));
half->signal_clicked.connect(sigc::bind (sigc::mem_fun(*this, &AudioTriggerPropertiesBox::MultiplyTempo), 0.5));
bpm_table->attach (*half, 2, 3, row, row + 1, Gtk::SHRINK, Gtk::SHRINK);
ArdourButton *dbl = manage (new ArdourButton (_("x2")));
dbl->signal_clicked.connect(sigc::bind (sigc::mem_fun(*this, &AudioTriggerPropertiesBox::MultiplyTempo), 2.0));
bpm_table->attach (*dbl, 3, 4, row, row + 1, Gtk::SHRINK, Gtk::SHRINK);
row++;
pack_start (*bpm_table, false, false);
@ -164,6 +174,15 @@ AudioTriggerPropertiesBox::~AudioTriggerPropertiesBox ()
{
}
void
AudioTriggerPropertiesBox::MultiplyTempo(float mult)
{
TriggerPtr trigger (tref.trigger());
if (trigger) {
trigger->set_segment_tempo (trigger->segment_tempo () * mult);
}
}
void
AudioTriggerPropertiesBox::toggle_stretch ()
{
@ -204,17 +223,18 @@ AudioTriggerPropertiesBox::on_trigger_changed (const PBD::PropertyChange& what_c
_start_clock.set (tref.trigger()->start_offset ());
_length_clock.set (tref.trigger()->current_length ()); // set_duration() ?
int metrum_numerator = 4; //TODO: use the SegmentDescriptor's meter
int bar_beats = metrum_numerator * tref.trigger()->follow_length().bars;
int metrum_numerator = trigger->meter().divisions_per_bar();
int bar_beats = metrum_numerator * trigger->follow_length().bars;
int beats = tref.trigger()->follow_length().beats;
_follow_length_adjustment.set_value (bar_beats+beats); //note: 0 is a special case meaning "use clip length"
_start_clock.ValueChanged.connect (sigc::mem_fun (*this, &AudioTriggerPropertiesBox::start_clock_changed));
_length_clock.ValueChanged.connect (sigc::mem_fun (*this, &AudioTriggerPropertiesBox::length_clock_changed));
_bpm_button.set_text (string_compose ("%1", trigger->apparent_tempo ()));
_abpm_label.set_text (string_compose ("%1", trigger->apparent_tempo ()));
_metrum_button.set_text ("4/4");
_abpm_label.set_text (string_compose ("%1", trigger->segment_tempo ()));
ArdourWidgets::set_tooltip (_abpm_label, string_compose ("Clip Tempo, used for stretching. Estimated tempo (from file) was: %1", trigger->estimated_tempo ()));
_metrum_button.set_text (string_compose ("%1/%2", metrum_numerator, trigger->meter().note_value()));
_stretch_toggle.set_active (tref.trigger()->stretchable () ? Gtkmm2ext::ExplicitActive : Gtkmm2ext::Off);
@ -253,10 +273,10 @@ AudioTriggerPropertiesBox::follow_clock_changed ()
{
int beatz = (int) _follow_length_adjustment.get_value();
int metrum_numerator = 4; //TODO: use the SegmentDescriptor's meter
int metrum_numerator = trigger()->meter().divisions_per_bar();
int bars = beatz/metrum_numerator;
int beats = beatz%metrum_numerator;
tref.trigger()->set_follow_length(Temporal::BBT_Offset(bars,beats,0));
trigger()->set_follow_length(Temporal::BBT_Offset(bars,beats,0));
}

7
gtk2_ardour/audio_trigger_properties_box.h
View File

@ -68,8 +68,10 @@ protected:
private:
void MultiplyTempo(float mult);
Gtk::Table _table;
Gtk::Label _abpm_label;
AudioClock _length_clock;
AudioClock _start_clock;
@ -79,13 +81,14 @@ private:
Gtk::Adjustment _gain_adjustment;
Gtk::SpinButton _gain_spinner;
ArdourWidgets::ArdourButton _bpm_button;
ArdourWidgets::ArdourButton _metrum_button;
ArdourWidgets::ArdourButton _stretch_toggle;
ArdourWidgets::ArdourDropdown _stretch_selector;
ArdourWidgets::ArdourButton _abpm_label;
};
#endif