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

avoid non-integer loop conditions.

Browse source
This commit is contained in:
Robin Gareus 2015-03-08 02:01:48 +01:00
parent 95631cdc25
commit 50041cb450
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gtk2_ardour/automation_controller.cc
View file

@ -303,10 +303,10 @@ AutomationController::on_button_release(GdkEventButton* ev)
sigc::mem_fun(*this, &AutomationController::run_note_select_dialog))); sigc::mem_fun(*this, &AutomationController::run_note_select_dialog)));
} }
if (is_low) { if (is_low) {
for (double beats = 1.0; beats <= 16; ++beats) { for (int beats = 1; beats <= 16; ++beats) {
items.push_back(MenuElem(string_compose(_("Set to %1 beat(s)"), (int)beats), items.push_back(MenuElem(string_compose(_("Set to %1 beat(s)"), (int)beats),
sigc::bind(sigc::mem_fun(*this, &AutomationController::set_freq_beats), sigc::bind(sigc::mem_fun(*this, &AutomationController::set_freq_beats),
beats))); (double)beats)));
} }
} }
menu->popup(1, ev->time); menu->popup(1, ev->time);

5
libs/backends/dummy/dummy_audiobackend.cc
View file

@ -1600,8 +1600,9 @@ void DummyAudioPort::setup_generator (GeneratorType const g, float const sampler
const double b = log (f_max / f_min) / g_p2; const double b = log (f_max / f_min) / g_p2;
const double a = f_min / (b * samplerate); const double a = f_min / (b * samplerate);
#endif #endif
const uint32_t g_p2i = rint(g_p2);
_wavetable = (Sample*) malloc (_gen_period * sizeof(Sample)); _wavetable = (Sample*) malloc (_gen_period * sizeof(Sample));
for (uint32_t i = 0 ; i < g_p2; ++i) { for (uint32_t i = 0 ; i < g_p2i; ++i) {
#ifdef LINEAR_SWEEP #ifdef LINEAR_SWEEP
const double phase = i * (a + b * i); const double phase = i * (a + b * i);
#else #else
@ -1609,7 +1610,7 @@ void DummyAudioPort::setup_generator (GeneratorType const g, float const sampler
#endif #endif
_wavetable[i] = (float)sin (2. * M_PI * (phase - floor (phase))); _wavetable[i] = (float)sin (2. * M_PI * (phase - floor (phase)));
} }
for (uint32_t i = g_p2; i < _gen_period; ++i) { for (uint32_t i = g_p2i; i < _gen_period; ++i) {
const uint32_t j = _gen_period - i; const uint32_t j = _gen_period - i;
#ifdef LINEAR_SWEEP #ifdef LINEAR_SWEEP
const double phase = j * (a + b * j); const double phase = j * (a + b * j);