petern
/
mloop
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

-Change: Rename Jack::m_buffer to Jack::m_loop_buffer. 

git-svn-id: http://svn.fuzzle.org/mloop/trunk@20 ba049829-c6ef-42ef-81ac-908dd8d2e907
master
petern 2009-07-22 18:30:19 +00:00
parent 62083c0bb3
commit 6b8833dfc0
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/jack.cpp
View File

@ -11,14 +11,14 @@ Jack::Jack()
{
m_connected = false;
m_recording = false;
m_buffer = new RingBuffer(2048);
m_loop_buffer = new RingBuffer(2048);
m_notecache.Reset();
}
Jack::~Jack()
{
Disconnect();
delete m_buffer;
delete m_loop_buffer;
}
bool Jack::Connect()
@ -102,11 +102,11 @@ int Jack::ProcessCallback(jack_nframes_t nframes)
* need for extra logic to determine if the buffer is full
* or empty.
*/
if (m_buffer->Free() > sizeof ev.time + sizeof ev.size + ev.size) {
m_buffer->Write((uint8_t *)&m_recording_time, sizeof m_recording_time);
m_buffer->Write((uint8_t *)&ev.time, sizeof ev.time);
m_buffer->Write((uint8_t *)&ev.size, sizeof ev.size);
m_buffer->Write((uint8_t *)ev.buffer, ev.size);
if (m_loop_buffer->Free() > sizeof ev.time + sizeof ev.size + ev.size) {
m_loop_buffer->Write((uint8_t *)&m_recording_time, sizeof m_recording_time);
m_loop_buffer->Write((uint8_t *)&ev.time, sizeof ev.time);
m_loop_buffer->Write((uint8_t *)&ev.size, sizeof ev.size);
m_loop_buffer->Write((uint8_t *)ev.buffer, ev.size);
m_delay_record = false;
} else {
@ -183,15 +183,15 @@ bool Jack::Run()
}
if (ev.time == UINT_MAX) {
if (m_buffer->Size() >= sizeof recording_time + sizeof ev.time + sizeof ev.size) {
m_buffer->Read((uint8_t *)&recording_time, sizeof recording_time);
m_buffer->Read((uint8_t *)&ev.time, sizeof ev.time);
m_buffer->Read((uint8_t *)&ev.size, sizeof ev.size);
if (m_loop_buffer->Size() >= sizeof recording_time + sizeof ev.time + sizeof ev.size) {
m_loop_buffer->Read((uint8_t *)&recording_time, sizeof recording_time);
m_loop_buffer->Read((uint8_t *)&ev.time, sizeof ev.time);
m_loop_buffer->Read((uint8_t *)&ev.size, sizeof ev.size);
}
} else {
if (m_buffer->Size() >= ev.size) {
if (m_loop_buffer->Size() >= ev.size) {
ev.buffer = (jack_midi_data_t *)malloc(ev.size);
m_buffer->Read((uint8_t *)ev.buffer, ev.size);
m_loop_buffer->Read((uint8_t *)ev.buffer, ev.size);
}
if (m_recording) {

2
src/jack.h
View File

@ -21,7 +21,7 @@ private:
jack_nframes_t m_sample_rate;
Loop m_loops[NUM_LOOPS];
RingBuffer *m_buffer;
RingBuffer *m_loop_buffer;
bool m_recording;
bool m_delay_record;