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

Tempo ramps - check for impossible locations tempo dialog bbt entry. reorganise code.

This commit is contained in:
nick_m 2016-03-07 06:35:32 +11:00
parent 36ec551a8a
commit 278ad73259
7 changed files with 551 additions and 418 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/editor_drag.cc
View File

@ -3183,9 +3183,9 @@ MeterMarkerDrag::motion (GdkEvent* event, bool first_move)
}
framepos_t const pf = adjusted_current_frame (event);
double const baf = _editor->session()->tempo_map().beat_at_frame (pf);
_marker->set_position (pf);
if (_marker->meter().position_lock_style() == MusicTime) {
double const baf = _editor->session()->tempo_map().beat_at_frame (pf);
_editor->session()->tempo_map().gui_move_meter (_real_section, _marker->meter(), baf);
} else {
_editor->session()->tempo_map().gui_move_meter (_real_section, _marker->meter(), pf);

2
gtk2_ardour/editor_tempodisplay.cc
View File

@ -378,7 +378,7 @@ Editor::edit_tempo_section (TempoSection* section)
if (tempo_dialog.get_lock_style() == MusicTime) {
_session->tempo_map().replace_tempo (*section, Tempo (bpm, nt), beat, tempo_dialog.get_tempo_type());
} else {
framepos_t const f = _session->tempo_map().compute_new_tempo_frame (section, Tempo (bpm, nt), beat);
framepos_t const f = _session->tempo_map().predict_tempo_frame (section, Tempo (bpm, nt), when);
_session->tempo_map().replace_tempo (*section, Tempo (bpm, nt), f, tempo_dialog.get_tempo_type());
}
XMLNode &after = _session->tempo_map().get_state();

14
gtk2_ardour/tempo_dialog.cc
View File

@ -36,6 +36,8 @@ using namespace PBD;
TempoDialog::TempoDialog (TempoMap& map, framepos_t frame, const string&)
: ArdourDialog (_("New Tempo"))
, _map (&map)
, _section (0)
, bpm_adjustment (60.0, 1.0, 999.9, 0.1, 1.0)
, bpm_spinner (bpm_adjustment)
, when_bar_label (_("bar:"), ALIGN_LEFT, ALIGN_CENTER)
@ -52,6 +54,8 @@ TempoDialog::TempoDialog (TempoMap& map, framepos_t frame, const string&)
TempoDialog::TempoDialog (TempoMap& map, TempoSection& section, const string&)
: ArdourDialog (_("Edit Tempo"))
, _map (&map)
, _section (&section)
, bpm_adjustment (60.0, 1.0, 999.9, 0.1, 1.0)
, bpm_spinner (bpm_adjustment)
, when_bar_label (_("bar:"), ALIGN_LEFT, ALIGN_CENTER)
@ -269,7 +273,15 @@ TempoDialog::bpm_button_release (GdkEventButton*)
bool
TempoDialog::entry_key_release (GdkEventKey*)
{
set_response_sensitive (RESPONSE_ACCEPT, is_user_input_valid());
Timecode::BBT_Time bbt;
get_bbt_time (bbt);
if (_section && is_user_input_valid()) {
set_response_sensitive (RESPONSE_ACCEPT, _map->bbt_valid (_section, Tempo (get_bpm(), get_note_type()), bbt));
} else {
set_response_sensitive (RESPONSE_ACCEPT, is_user_input_valid());
}
return false;
}

5
gtk2_ardour/tempo_dialog.h
View File

@ -75,6 +75,9 @@ private:
double last_t;
gint64 first_t;
ARDOUR::TempoMap* _map;
ARDOUR::TempoSection* _section;
Gtk::ComboBoxText pulse_selector;
Gtk::Adjustment bpm_adjustment;
Gtk::SpinButton bpm_spinner;
@ -86,8 +89,6 @@ private:
Gtk::Button tap_tempo_button;
Gtk::ComboBoxText tempo_type;
Gtk::ComboBoxText lock_style;
};
class MeterDialog : public ArdourDialog

48
libs/ardour/ardour/tempo.h
View File

@ -194,8 +194,8 @@ class LIBARDOUR_API TempoSection : public MetricSection, public Tempo {
double tick_at_frame (framepos_t frame, framecnt_t frame_rate) const;
framepos_t frame_at_tick (double tick, framecnt_t frame_rate) const;
void set_c_func_from_tempo_and_beat (double end_bpm, double end_beat, framecnt_t frame_rate);
double compute_c_func (double end_bpm, framepos_t end_frame, framecnt_t frame_rate) const;
double compute_c_func_beat (double end_bpm, double end_beat, framecnt_t frame_rate);
double compute_c_func_frame (double end_bpm, framepos_t end_frame, framecnt_t frame_rate) const;
double get_c_func () const { return _c_func; }
void set_c_func (double c_func) { _c_func = c_func; }
@ -315,7 +315,7 @@ class LIBARDOUR_API TempoMap : public PBD::StatefulDestructible
template<class T> void apply_with_metrics (T& obj, void (T::*method)(const Metrics&)) {
Glib::Threads::RWLock::ReaderLock lm (lock);
(obj.*method)(metrics);
(obj.*method)(_metrics);
}
void get_grid (std::vector<BBTPoint>&,
@ -377,7 +377,7 @@ class LIBARDOUR_API TempoMap : public PBD::StatefulDestructible
void remove_tempo (const TempoSection&, bool send_signal);
void remove_meter (const MeterSection&, bool send_signal);
framepos_t compute_new_tempo_frame (TempoSection* section, const Tempo& bpm, const double& beat);
framepos_t predict_tempo_frame (TempoSection* section, const Tempo& bpm, const Timecode::BBT_Time& bbt);
void replace_tempo (const TempoSection&, const Tempo&, const double& where, TempoSection::Type type);
void replace_tempo (const TempoSection&, const Tempo&, const framepos_t& frame, TempoSection::Type type);
@ -386,6 +386,7 @@ class LIBARDOUR_API TempoMap : public PBD::StatefulDestructible
void gui_move_meter (MeterSection*, const Meter& mt, const framepos_t& frame);
void gui_move_meter (MeterSection*, const Meter& mt, const double& beat);
bool bbt_valid (TempoSection* section, const Tempo& bpm, const Timecode::BBT_Time& bbt);
void replace_meter (const MeterSection&, const Meter&, const Timecode::BBT_Time& where);
void replace_meter (const MeterSection&, const Meter&, const framepos_t& frame);
@ -409,7 +410,7 @@ class LIBARDOUR_API TempoMap : public PBD::StatefulDestructible
*/
TempoMetric metric_at (framepos_t, Metrics::const_iterator* last=NULL) const;
Metrics::const_iterator metrics_end() { return metrics.end(); }
Metrics::const_iterator metrics_end() { return _metrics.end(); }
void change_existing_tempo_at (framepos_t, double bpm, double note_type);
void change_initial_tempo (double bpm, double note_type);
@ -422,24 +423,24 @@ class LIBARDOUR_API TempoMap : public PBD::StatefulDestructible
framecnt_t frame_rate () const { return _frame_rate; }
PBD::Signal0<void> MetricPositionChanged;
double bbt_to_beats (Timecode::BBT_Time bbt);
Timecode::BBT_Time beats_to_bbt (double beats);
private:
double bbt_to_beats_locked (Timecode::BBT_Time bbt);
Timecode::BBT_Time beats_to_bbt_locked (double beats);
double beat_at_frame_locked (framecnt_t frame) const;
framecnt_t frame_at_beat_locked (double beat) const;
double tick_at_frame_locked (framecnt_t frame) const;
framecnt_t frame_at_tick_locked (double tick) const;
framepos_t frame_time_locked (const Timecode::BBT_Time&);
PBD::Signal0<void> MetricPositionChanged;
Metrics get_new_order (TempoSection* section, const Tempo& bpm, const framepos_t& frame);
Metrics get_new_order (TempoSection* section, const Tempo& bpm, const double& beat);
Metrics get_new_order (MeterSection* section, const Meter& mt, const framepos_t& frame);
Metrics get_new_order (MeterSection* section, const Meter& mt, const double& beat);
private:
double bbt_to_beats_locked (Metrics& metrics, Timecode::BBT_Time bbt);
Timecode::BBT_Time beats_to_bbt_locked (Metrics& metrics, double beats);
double beat_at_frame_locked (Metrics& metrics, framecnt_t frame) const;
framecnt_t frame_at_beat_locked (Metrics& metrics, double beat) const;
double tick_at_frame_locked (const Metrics& metrics, framecnt_t frame) const;
framecnt_t frame_at_tick_locked (const Metrics& metrics, double tick) const;
framepos_t frame_time_locked (Metrics& metrics, const Timecode::BBT_Time&);
void get_new_order (Metrics& metrics, TempoSection* section, const Tempo& bpm, const framepos_t& frame);
void get_new_order (Metrics& metrics, TempoSection* section, const Tempo& bpm, const double& beat);
void get_new_order (Metrics& metrics, MeterSection* section, const Meter& mt, const framepos_t& frame);
void get_new_order (Metrics& metrics, MeterSection* section, const Meter& mt, const double& beat);
friend class ::BBTTest;
friend class ::FrameposPlusBeatsTest;
@ -448,13 +449,13 @@ private:
static Tempo _default_tempo;
static Meter _default_meter;
Metrics metrics;
Metrics _metrics;
framecnt_t _frame_rate;
mutable Glib::Threads::RWLock lock;
void recompute_tempos ();
void recompute_meters ();
void recompute_map (bool reassign_tempo_bbt, framepos_t end = -1);
void recompute_tempos (Metrics& metrics);
void recompute_meters (Metrics& metrics);
void recompute_map (Metrics& metrics, framepos_t end = -1);
framepos_t round_to_type (framepos_t fr, RoundMode dir, BBTPointType);
@ -474,6 +475,7 @@ private:
bool remove_tempo_locked (const TempoSection&);
bool remove_meter_locked (const MeterSection&);
TempoSection* copy_metrics_and_point (Metrics& copy, TempoSection* section);
};
}; /* namespace ARDOUR */

894
libs/ardour/tempo.cc
View File

File diff suppressed because it is too large Load Diff

4
libs/ardour/test/tempo_test.cc
View File

@ -41,10 +41,10 @@ TempoTest::recomputeMapTest ()
Meter meterB (3, 4);
map.add_meter (meterB, 12.0, BBT_Time (4, 1, 0));
list<MetricSection*>::iterator i = map.metrics.begin();
list<MetricSection*>::iterator i = map._metrics.begin();
CPPUNIT_ASSERT_EQUAL (framepos_t (0), (*i)->frame ());
i = map.metrics.end();
i = map._metrics.end();
--i;
CPPUNIT_ASSERT_EQUAL (framepos_t (288e3), (*i)->frame ());
}