smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-15 19:16:40 +01:00
Code Issues Projects Releases Wiki Activity

Tempo ramps - meter sections drag again.

Browse source
This commit is contained in:
nick_m 2016-03-04 09:11:21 +11:00
parent b4f0695780
commit 6ecef52d76
3 changed files with 27 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

5
gtk2_ardour/editor_drag.cc
View file

@ -3184,11 +3184,12 @@ MeterMarkerDrag::motion (GdkEvent* event, bool first_move)
_marker->hide();
}
framepos_t const pf = adjusted_current_frame (event, false);
framepos_t const pf = adjusted_current_frame (event);
/* moving a meter doesn't change beat locations, so this shuld be ok */
double const baf = _editor->session()->tempo_map().beat_at_frame (pf);
_marker->set_position (pf);
_editor->session()->tempo_map().gui_move_meter (_real_section, _marker->meter(), pf, baf);
_editor->session()->tempo_map().gui_move_meter (_real_section, _marker->meter(), baf);
show_verbose_cursor_time (pf);
}

4
libs/ardour/ardour/tempo.h
View file

@ -381,7 +381,7 @@ class LIBARDOUR_API TempoMap : public PBD::StatefulDestructible
void replace_tempo (const TempoSection&, const Tempo&, const framepos_t& frame, TempoSection::Type type);
void gui_move_tempo (TempoSection*, const Tempo& bpm, const framepos_t& where);
void gui_move_meter (MeterSection*, const Meter& mt, const framepos_t& where, const double& beat);
void gui_move_meter (MeterSection*, const Meter& mt, const double& beat);
void replace_meter (const MeterSection&, const Meter&, const Timecode::BBT_Time& where);
void replace_meter (const MeterSection&, const Meter&, const framepos_t& frame);
@ -434,7 +434,7 @@ private:
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, const double& beat);
Metrics get_new_order (MeterSection* section, const Meter& mt, const double& beat);
friend class ::BBTTest;
friend class ::FrameposPlusBeatsTest;

70
libs/ardour/tempo.cc
View file

@ -1027,31 +1027,25 @@ TempoMap::get_new_order (TempoSection* section, const Tempo& bpm, const double&
}
Metrics
TempoMap::get_new_order(MeterSection* section, const Meter& mt, const framepos_t& frame, const double& beat)
TempoMap::get_new_order(MeterSection* section, const Meter& mt, const double& beat)
{
/* incomplete */
Metrics imaginary (metrics);
MeterSection* prev_ms = 0;
MeterSection* m;
MeterSection* our_section = 0;
framepos_t ret = 0;
pair<double, BBT_Time> b_bbt = make_pair (beat, BBT_Time (1, 1, 0));
section->set_beat (b_bbt);
MetricSectionSorter cmp;
imaginary.sort (cmp);
for (Metrics::iterator i = imaginary.begin(); i != imaginary.end(); ++i) {
MeterSection* m;
if ((m = dynamic_cast<MeterSection*> (*i)) != 0) {
if (prev_ms) {
if (section->beat() == m->beat()) {
our_section = m;
if (m->beat() > beat){
section->set_frame (frame_at_beat_locked (beat));
prev_ms = section;
continue;
}
if (beat < m->beat()){
pair<double, BBT_Time> b_bbt = make_pair (beat, BBT_Time (1, 1, 0));
our_section->set_beat (b_bbt);
our_section->set_frame (frame_at_beat_locked (beat));
break;
}
if (m->position_lock_style() == MusicTime) {
m->set_frame (frame_at_beat_locked (m->beat()));
} else {
@ -1062,38 +1056,10 @@ TempoMap::get_new_order(MeterSection* section, const Meter& mt, const framepos_t
prev_ms = m;
}
}
/* now we do the whole thing again because audio-locked sections will have caused a re-order */
prev_ms = 0;
metrics.sort (cmp);
for (Metrics::iterator i = imaginary.begin(); i != imaginary.end(); ++i) {
if ((m = dynamic_cast<MeterSection*> (*i)) != 0) {
if (prev_ms) {
if (section->beat() == m->beat()) {
continue;
}
if (beat < m->beat()){
ret = frame_at_beat (beat);
section->set_frame (ret);
prev_ms = section;
break;
}
if (m->position_lock_style() == MusicTime) {
m->set_frame (frame_at_beat (m->beat()));
} else {
pair<double, BBT_Time> b_bbt = make_pair (beat_at_frame_locked (m->frame()), BBT_Time (1, 1, 0));
m->set_beat (b_bbt);
}
}
prev_ms = m;
}
}
MetricSectionFrameSorter fcmp;
imaginary.sort (fcmp);
if (!ret) {
pair<double, BBT_Time> b_bbt = make_pair (beat, BBT_Time (1, 1, 0));
section->set_beat (b_bbt);
section->set_frame (frame_at_beat_locked (beat));
}
return imaginary;
}
@ -1131,10 +1097,18 @@ TempoMap::gui_move_tempo (TempoSection* ts, const Tempo& bpm, const framepos_t&
}
void
TempoMap::gui_move_meter (MeterSection* ms, const Meter& mt, const framepos_t& frame, const double& beat_where)
TempoMap::gui_move_meter (MeterSection* ms, const Meter& mt, const double& beat_where)
{
Glib::Threads::RWLock::WriterLock lm (lock);
Metrics imaginary = get_new_order (ms, mt, frame, beat_where);
{
Glib::Threads::RWLock::WriterLock lm (lock);
Metrics new_order = get_new_order (ms, mt, beat_where);
metrics.clear();
metrics = new_order;
recompute_map (false);
}
MetricPositionChanged (); // Emit Signal
}
void