Soundship
/
Loopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #255 from openAVproductions/fix_bpm_use_tempo 

timemanager: error check tempos from "Use Tempo"
main
Harry van Haaren 2018-07-21 16:50:40 +01:00 committed by GitHub
parent 5533a99913 7afcef5993
commit 03c099d0d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/goptions.cxx
View File

@ -82,7 +82,8 @@ static void updateLinkCB(Fl_Widget* w, void* data)
str << l;
int ret = system( str.str().c_str() );
/* if it fails it fails.. */
/* if it fails it fails... (void) to mute clang warning */
(void)ret;
}
static void writeBindEnable(Fl_Widget* w, void* data)

26
src/timemanager.cxx
View File

@ -86,6 +86,16 @@ void TimeManager::queueBpmChangeZeroOne(float b)
void TimeManager::queueFpbChange( double f )
{
float bpm = (samplerate * 60.f) / f;
if(bpm < MIN_TEMPO || bpm > MAX_TEMPO) {
char buffer[128];
snprintf(buffer, sizeof(buffer), "drop TM::qfpb() %d bpm = %d",
(int)f, (int)bpm);
EventGuiPrint e( buffer );
writeToGuiRingbuffer( &e );
return;
}
_bpmChangeQueued = true;
_nextFpb = f;
}
@ -100,7 +110,8 @@ void TimeManager::setFpb(double f)
int bpm = ( samplerate * 60) / f;
char buffer [50];
sprintf (buffer, "TM, setFpb() %i, bpm = %i", int(f), int(bpm) );
snprintf(buffer, sizeof(buffer), "TM, setFpb() %i, bpm = %i",
int(f), int(bpm) );
EventGuiPrint e( buffer );
writeToGuiRingbuffer( &e );
@ -143,14 +154,16 @@ void TimeManager::tap()
if( average < 13000 ) {
char buffer [50];
sprintf (buffer, "TM, tap() average too slow! quitting");
snprintf(buffer, sizeof(buffer),
"TM, tap() average too slow! quitting");
EventGuiPrint e( buffer );
writeToGuiRingbuffer( &e );
return;
}
char buffer [50];
sprintf (buffer, "TM, tap() average = %i", average );
snprintf(buffer, sizeof(buffer), "TM, tap() average = %i",
average);
EventGuiPrint e( buffer );
writeToGuiRingbuffer( &e );
@ -207,13 +220,16 @@ void TimeManager::process(Buffers* buffers)
if ( before < nframes && after <= nframes && before + after == nframes ) {
char buffer [50];
// sprintf (buffer, "Timing OK: before %i, after %i, b+a %i", before, after, before+after );
// snprintf(buffer, sizeof(buffer), "Timing OK: before %i, after %i, b+a %i",
// before, after, before+after );
// EventGuiPrint e2( buffer );
// writeToGuiRingbuffer( &e2 );
} else {
char buffer [50];
sprintf (buffer, "Timing Error: before: %i, after %i", before, after );
snprintf(buffer, sizeof(buffer),
"Timing Error: before: %i, after %i",
before, after );
EventGuiPrint e2( buffer );
writeToGuiRingbuffer( &e2 );
}