mirror of
https://github.com/vale981/openAV-Luppp
synced 2025-03-05 09:01:39 -05:00
-Refactored TimeManager
This commit is contained in:
Harry van Haaren
parent
74fb5bcee1
commit
3ab0096371
3 changed files with 158 additions and 124 deletions
149
src/timemanager.cxx
Normal file
149
src/timemanager.cxx
Normal file
|
|
@ -0,0 +1,149 @@
|
|||
|
||||
#include "timemanager.hxx"
|
||||
|
||||
#include <iostream>
|
||||
#include <cstdio>
|
||||
|
||||
#include "buffers.hxx"
|
||||
#include "eventhandler.hxx"
|
||||
|
||||
#include "observer/time.hxx"
|
||||
|
||||
using namespace std;
|
||||
|
||||
TimeManager::TimeManager():
|
||||
fpb(22050),
|
||||
oldBeat(0),
|
||||
observers()
|
||||
{
|
||||
tapTempoPos = 0;
|
||||
tapTempo[0] = 0;
|
||||
tapTempo[1] = 0;
|
||||
tapTempo[2] = 0;
|
||||
|
||||
cout << "TimeManager() done" << endl;
|
||||
}
|
||||
|
||||
|
||||
int TimeManager::getFpb()
|
||||
{
|
||||
return fpb;
|
||||
}
|
||||
|
||||
|
||||
void TimeManager::setBpm(float bpm)
|
||||
{
|
||||
//cout << "setBpm() " << bpm << endl;
|
||||
setFpb( 44100 / bpm * 60 );
|
||||
}
|
||||
|
||||
|
||||
void TimeManager::setFpb(float f)
|
||||
{
|
||||
fpb = f;
|
||||
//cout << "setFpb() " << fpb << endl;
|
||||
|
||||
char buffer [50];
|
||||
sprintf (buffer, "TM, setFpb() %i", int(f) );
|
||||
EventGuiPrint e( buffer );
|
||||
writeToGuiRingbuffer( &e );
|
||||
|
||||
for(uint i = 0; i < observers.size(); i++)
|
||||
{
|
||||
observers.at(i)->setFpb(fpb);
|
||||
}
|
||||
}
|
||||
|
||||
void TimeManager::registerObserver(TimeObserver* o)
|
||||
{
|
||||
//cout << "registerObserver() " << o << endl;
|
||||
observers.push_back(o);
|
||||
o->setFpb( fpb );
|
||||
}
|
||||
|
||||
void TimeManager::tap()
|
||||
{
|
||||
// reset tap tempo to "first tap" if more than 5 secs elapsed since last tap
|
||||
int sr = 44100;
|
||||
if ( tapTempo[0] < frame - sr * 5 )
|
||||
{
|
||||
tapTempoPos = 0;
|
||||
}
|
||||
|
||||
if ( tapTempoPos < 3 )
|
||||
{
|
||||
tapTempo[tapTempoPos] = frame;
|
||||
tapTempoPos++;
|
||||
}
|
||||
else
|
||||
{
|
||||
// calculate frames per tap
|
||||
int tapFpb1 = tapTempo[1] - tapTempo[0];
|
||||
int tapFpb2 = tapTempo[2] - tapTempo[1];
|
||||
int tapFpb3 = frame - tapTempo[2]; // last tap, until now
|
||||
|
||||
int average = (tapFpb1 + tapFpb2 + tapFpb3) / 3;
|
||||
|
||||
char buffer [50];
|
||||
sprintf (buffer, "TM, tap() average = %i", average );
|
||||
EventGuiPrint e( buffer );
|
||||
writeToGuiRingbuffer( &e );
|
||||
|
||||
setFpb(average);
|
||||
|
||||
// reset, so next 3 taps restart process
|
||||
tapTempoPos = 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void TimeManager::process(Buffers* buffers)
|
||||
{
|
||||
// tap tempo measurements
|
||||
frame = buffers->transportFrame;
|
||||
|
||||
//int framesPerBeat = (int) buffers->samplerate / (bpm / 60.0);
|
||||
|
||||
// time signature?
|
||||
buffers->transportPosition->beats_per_bar = 4;
|
||||
buffers->transportPosition->beat_type = 4;
|
||||
|
||||
int beat = buffers->transportFrame / fpb;
|
||||
//int beat = int(beat);
|
||||
|
||||
//int tick = int( (beatFloat - beat) * 1920 );
|
||||
|
||||
if ( beat != oldBeat )
|
||||
{
|
||||
// inform observers of new beat FIRST
|
||||
for(uint i = 0; i < observers.size(); i++)
|
||||
{
|
||||
observers.at(i)->beat();
|
||||
}
|
||||
|
||||
if ( beat % (int)buffers->transportPosition->beats_per_bar == 0 )
|
||||
{
|
||||
// inform observers of new bar SECOND
|
||||
for(uint i = 0; i < observers.size(); i++) { observers.at(i)->bar(); }
|
||||
buffers->transportPosition->bar++;
|
||||
}
|
||||
|
||||
// write new beat to UI (bar info currently not used)
|
||||
EventTimeBarBeat e( 0, beat );
|
||||
writeToGuiRingbuffer( &e );
|
||||
|
||||
oldBeat = beat;
|
||||
}
|
||||
|
||||
buffers->transportPosition->valid = JackPositionBBT;
|
||||
buffers->transportPosition->tick += (buffers->nframes / buffers->samplerate);
|
||||
|
||||
buffers->transportPosition->beat = beat % 4;
|
||||
buffers->transportPosition->tick = 0;
|
||||
|
||||
buffers->transportPosition->ticks_per_beat = 1920;
|
||||
|
||||
int bpm = int(buffers->samplerate * fpb / 60.0);
|
||||
buffers->transportPosition->beats_per_minute = bpm;
|
||||
}
|
||||
|
||||
|
|
@ -15,133 +15,17 @@ using namespace std;
|
|||
class TimeManager
|
||||
{
|
||||
public:
|
||||
TimeManager():
|
||||
fpb(22050),
|
||||
oldBeat(0),
|
||||
observers()
|
||||
{
|
||||
tapTempoPos = 0;
|
||||
tapTempo[0] = 0;
|
||||
tapTempo[1] = 0;
|
||||
tapTempo[2] = 0;
|
||||
|
||||
cout << "TimeManager() done" << endl;
|
||||
}
|
||||
int getFpb(){return fpb;}
|
||||
void setBpm(float bpm)
|
||||
{
|
||||
//cout << "setBpm() " << bpm << endl;
|
||||
setFpb( 44100 / bpm * 60 );
|
||||
}
|
||||
void setFpb(float f)
|
||||
{
|
||||
fpb = f;
|
||||
//cout << "setFpb() " << fpb << endl;
|
||||
|
||||
char buffer [50];
|
||||
sprintf (buffer, "TM, setFpb() %i", int(f) );
|
||||
EventGuiPrint e( buffer );
|
||||
writeToGuiRingbuffer( &e );
|
||||
|
||||
for(uint i = 0; i < observers.size(); i++)
|
||||
{
|
||||
observers.at(i)->setFpb(fpb);
|
||||
}
|
||||
}
|
||||
TimeManager();
|
||||
|
||||
void registerObserver(TimeObserver* o)
|
||||
{
|
||||
//cout << "registerObserver() " << o << endl;
|
||||
observers.push_back(o);
|
||||
o->setFpb( fpb );
|
||||
}
|
||||
int getFpb();
|
||||
void setBpm(float bpm);
|
||||
void setFpb(float f);
|
||||
|
||||
void tap()
|
||||
{
|
||||
// reset tap tempo to "first tap" if more than 5 secs elapsed since last tap
|
||||
int sr = 44100;
|
||||
if ( tapTempo[0] < frame - sr * 5 )
|
||||
{
|
||||
tapTempoPos = 0;
|
||||
}
|
||||
|
||||
if ( tapTempoPos < 3 )
|
||||
{
|
||||
tapTempo[tapTempoPos] = frame;
|
||||
tapTempoPos++;
|
||||
}
|
||||
else
|
||||
{
|
||||
// calculate frames per tap
|
||||
int tapFpb1 = tapTempo[1] - tapTempo[0];
|
||||
int tapFpb2 = tapTempo[2] - tapTempo[1];
|
||||
int tapFpb3 = frame - tapTempo[2]; // last tap, until now
|
||||
|
||||
int average = (tapFpb1 + tapFpb2 + tapFpb3) / 3;
|
||||
|
||||
char buffer [50];
|
||||
sprintf (buffer, "TM, tap() average = %i", average );
|
||||
EventGuiPrint e( buffer );
|
||||
writeToGuiRingbuffer( &e );
|
||||
|
||||
setFpb(average);
|
||||
|
||||
// reset, so next 3 taps restart process
|
||||
tapTempoPos = 0;
|
||||
}
|
||||
}
|
||||
void registerObserver(TimeObserver* o);
|
||||
|
||||
void process(Buffers* buffers)
|
||||
{
|
||||
// tap tempo measurements
|
||||
frame = buffers->transportFrame;
|
||||
|
||||
//int framesPerBeat = (int) buffers->samplerate / (bpm / 60.0);
|
||||
|
||||
|
||||
|
||||
// time signature?
|
||||
buffers->transportPosition->beats_per_bar = 4;
|
||||
buffers->transportPosition->beat_type = 4;
|
||||
|
||||
int beat = buffers->transportFrame / fpb;
|
||||
//int beat = int(beat);
|
||||
|
||||
//int tick = int( (beatFloat - beat) * 1920 );
|
||||
|
||||
if ( beat != oldBeat )
|
||||
{
|
||||
// inform observers of new beat FIRST
|
||||
for(uint i = 0; i < observers.size(); i++)
|
||||
{
|
||||
observers.at(i)->beat();
|
||||
}
|
||||
|
||||
if ( beat % (int)buffers->transportPosition->beats_per_bar == 0 )
|
||||
{
|
||||
// inform observers of new bar SECOND
|
||||
for(uint i = 0; i < observers.size(); i++) { observers.at(i)->bar(); }
|
||||
buffers->transportPosition->bar++;
|
||||
}
|
||||
|
||||
// write new beat to UI (bar info currently not used)
|
||||
EventTimeBarBeat e( 0, beat );
|
||||
writeToGuiRingbuffer( &e );
|
||||
|
||||
oldBeat = beat;
|
||||
}
|
||||
|
||||
buffers->transportPosition->valid = JackPositionBBT;
|
||||
buffers->transportPosition->tick += (buffers->nframes / buffers->samplerate);
|
||||
|
||||
buffers->transportPosition->beat = beat % 4;
|
||||
buffers->transportPosition->tick = 0;
|
||||
|
||||
buffers->transportPosition->ticks_per_beat = 1920;
|
||||
|
||||
int bpm = int(buffers->samplerate * fpb / 60.0);
|
||||
buffers->transportPosition->beats_per_minute = bpm;
|
||||
}
|
||||
void tap();
|
||||
|
||||
void process(Buffers* buffers);
|
||||
|
||||
private:
|
||||
float fpb;
|
||||
|
|
|
|||
1
wscript
1
wscript
|
|
@ -27,6 +27,7 @@ def build(bld):
|
|||
'src/looper.cxx',
|
||||
'src/looperclip.cxx',
|
||||
'src/trackoutput.cxx',
|
||||
'src/timemanager.cxx',
|
||||
|
||||
'src/logic.cxx',
|
||||
'src/gridlogic.cxx',
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue