Compare commits
1 Commits
0612f423d1
...
3-integrat
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d28e1f45f5 |
@@ -4,16 +4,16 @@
|
||||
#include "command.h"
|
||||
#include "midi.h"
|
||||
#include "queue.h"
|
||||
#include <jack/jack.h>
|
||||
#include <sys/stat.h>
|
||||
#include <fcntl.h>
|
||||
#include <unistd.h>
|
||||
#include <jack/jack.h>
|
||||
#include <jack/midiport.h>
|
||||
#include <math.h>
|
||||
#include <stdatomic.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <sys/stat.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#define STATUS_FIFO "/tmp/looper_status"
|
||||
|
||||
@@ -31,15 +31,23 @@ static void looper_write_status(void) {
|
||||
int state = atomic_load(&cur[ch].scenes[sc_idx].state);
|
||||
const char *state_str;
|
||||
switch (state) {
|
||||
case STATE_IDLE: state_str = "IDLE"; break;
|
||||
case STATE_RECORD: state_str = "RECORD"; break;
|
||||
case STATE_LOOPING: state_str = "LOOPING"; break;
|
||||
case STATE_PAUSED: state_str = "PAUSED"; break;
|
||||
default: state_str = "UNKNOWN";
|
||||
case STATE_IDLE:
|
||||
state_str = "IDLE";
|
||||
break;
|
||||
case STATE_RECORD:
|
||||
state_str = "RECORD";
|
||||
break;
|
||||
case STATE_LOOPING:
|
||||
state_str = "LOOPING";
|
||||
break;
|
||||
case STATE_PAUSED:
|
||||
state_str = "PAUSED";
|
||||
break;
|
||||
default:
|
||||
state_str = "UNKNOWN";
|
||||
}
|
||||
int n = snprintf(buf, sizeof(buf),
|
||||
"CH=%d SC=%d STATE=%s\n",
|
||||
ch, sc_idx, state_str);
|
||||
int n = snprintf(buf, sizeof(buf), "CH=%d SC=%d STATE=%s\n", ch, sc_idx,
|
||||
state_str);
|
||||
if (n > 0) {
|
||||
int ret = write(fd, buf, n);
|
||||
(void)ret;
|
||||
@@ -252,8 +260,7 @@ int process_callback(jack_nframes_t nframes, void *arg) {
|
||||
if (rp < MAX_MIDI_EVENTS) {
|
||||
sc->loop.midi_events[rp].timestamp = ev.time;
|
||||
sc->loop.midi_events[rp].status = ev.buffer[0];
|
||||
sc->loop.midi_events[rp].note =
|
||||
(ev.size > 1) ? ev.buffer[1] : 0;
|
||||
sc->loop.midi_events[rp].note = (ev.size > 1) ? ev.buffer[1] : 0;
|
||||
sc->loop.midi_events[rp].velocity =
|
||||
(ev.size > 2) ? ev.buffer[2] : 0;
|
||||
atomic_store(&sc->record_pos, rp + 1);
|
||||
@@ -310,8 +317,7 @@ int process_callback(jack_nframes_t nframes, void *arg) {
|
||||
jack_midi_event_write(midi_out_buf, ev.time, ev.buffer, ev.size);
|
||||
}
|
||||
}
|
||||
}
|
||||
break;
|
||||
} break;
|
||||
}
|
||||
if (state == STATE_LOOPING) {
|
||||
atomic_store(&sc->loop_count, atomic_load(&sc->record_pos));
|
||||
|
||||
@@ -82,8 +82,7 @@ void midi_handle_events(void *port_buffer, jack_nframes_t nframes) {
|
||||
queue_push(&cmd_queue_main_midi, cmd);
|
||||
} break;
|
||||
case 69: {
|
||||
command_t cmd = {
|
||||
.type = CMD_ADD_SCENE, .channel = -1, .data = 0};
|
||||
command_t cmd = {.type = CMD_ADD_SCENE, .channel = -1, .data = 0};
|
||||
queue_push(&cmd_queue_main_midi, cmd);
|
||||
} break;
|
||||
case 70: {
|
||||
|
||||
@@ -7,8 +7,8 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <time.h>
|
||||
#include <sys/stat.h>
|
||||
#include <time.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#define FIFO_PATH "/tmp/looper_cmd"
|
||||
@@ -39,7 +39,8 @@ static void *pipe_thread_func(void *arg) {
|
||||
command_t cmd = {.type = CMD_ADD_CHANNEL, .channel = -1, .data = 0};
|
||||
queue_push(&cmd_queue_main_fifo, cmd);
|
||||
} else if (strcmp(line, "add_midi") == 0) {
|
||||
command_t cmd = {.type = CMD_ADD_MIDI_CHANNEL, .channel = -1, .data = 0};
|
||||
command_t cmd = {
|
||||
.type = CMD_ADD_MIDI_CHANNEL, .channel = -1, .data = 0};
|
||||
queue_push(&cmd_queue_main_fifo, cmd);
|
||||
} else if (strcmp(line, "remove") == 0) {
|
||||
command_t cmd = {.type = CMD_REMOVE_CHANNEL, .channel = -1, .data = 0};
|
||||
|
||||
Reference in New Issue
Block a user