hiro/openAV-Luppp
1
0
Fork 0
mirror of https://github.com/vale981/openAV-Luppp synced 2025-03-05 09:01:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

reduce magic numbers on calculating tempo limits

Browse source
This commit is contained in:
Georg Krause 2018-03-31 14:30:24 +02:00
parent 2c43704b8f
commit fe1b68a069
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/config.hxx
View file

@ -51,6 +51,10 @@
#define NSCENES 10 #define NSCENES 10
#define MAX_BUFFER_SIZE 1024 #define MAX_BUFFER_SIZE 1024
/// TEMPO
#define MIN_TEMPO 60
#define MAX_TEMPO 220
#define CONTROLLERS_PREALLOC 20 #define CONTROLLERS_PREALLOC 20
// nsamples remaining during recording before Looper requests larger buffer // nsamples remaining during recording before Looper requests larger buffer

4
src/gmastertrack.cxx
View file

@ -23,7 +23,7 @@
static void gmastertrack_tempoDial_callback(Fl_Widget *w, void *data) static void gmastertrack_tempoDial_callback(Fl_Widget *w, void *data)
{ {
Avtk::Dial* b = (Avtk::Dial*)w; Avtk::Dial* b = (Avtk::Dial*)w;
float bpm = (int)(b->value() * 160.f + 60); float bpm = (int)(b->value() * (float)(MAX_TEMPO - MIN_TEMPO) + MIN_TEMPO);
if(std::fabs(bpm-round(bpm))) { if(std::fabs(bpm-round(bpm))) {
LUPPP_WARN("%f",bpm); LUPPP_WARN("%f",bpm);
} }
@ -269,7 +269,7 @@ GMasterTrack::GMasterTrack(int x, int y, int w, int h, const char* l ) :
void GMasterTrack::setBpm( int b ) void GMasterTrack::setBpm( int b )
{ {
bpm = b; bpm = b;
tempoDial.value( ( bpm - 60 ) / 160.f ); tempoDial.value( ( bpm - MIN_TEMPO ) / (float)(MAX_TEMPO-MIN_TEMPO) );
std::stringstream s; std::stringstream s;
s << bpm; s << bpm;
tempoDial.copy_label( s.str().c_str() ); tempoDial.copy_label( s.str().c_str() );