New input/output plugin architecture. New LV2 plugin.

6 files changed, 634 insertions, 0 deletions

diff --git a/drumgizmo/input/jackmidi/Makefile.am b/drumgizmo/input/jackmidi/Makefile.am
new file mode 100644
index 0000000..f357b56
--- /dev/null
+++ b/drumgizmo/input/jackmidi/Makefile.am
@@ -0,0 +1,28 @@
+
+jackmidisources = \
+	jackmidi.cc \
+	jackclient.cc \
+	jackclient.h
+
+if HAVE_INPUT_JACKMIDI
+
+jackmidiltlibs = libjackmidi.la
+jackmidibuildsources = $(jackmidisources)
+
+else
+
+jackmidiltlibs =
+jackmidibuildsources =
+
+endif
+
+EXTRA_DIST = $(jackmidisources)
+
+lib_LTLIBRARIES = $(jackmidiltlibs)
+
+libdir = $(INPUT_PLUGIN_DIR)
+
+INCLUDES = -I$(top_srcdir)/include $(JACK_CFLAGS)
+libjackmidi_la_LDFLAGS = $(JACK_LIBS)
+libjackmidi_la_LIBADD =
+libjackmidi_la_SOURCES = $(jackmidibuildsources)
diff --git a/drumgizmo/input/jackmidi/audioinputenginejackmidi.cc b/drumgizmo/input/jackmidi/audioinputenginejackmidi.cc
new file mode 100644
index 0000000..5e1fb85
--- /dev/null
+++ b/drumgizmo/input/jackmidi/audioinputenginejackmidi.cc
@@ -0,0 +1,153 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/***************************************************************************
+ *            audioinputenginejackmidi.cc
+ *
+ *  Sun Feb 27 11:33:31 CET 2011
+ *  Copyright 2011 Bent Bisballe Nyeng
+ *  deva@aasimon.org
+ ****************************************************************************/
+
+/*
+ *  This file is part of DrumGizmo.
+ *
+ *  DrumGizmo is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  DrumGizmo is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with DrumGizmo; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ */
+#include "audioinputenginejackmidi.h"
+
+#define NOTE_ON 0x90
+
+AudioInputEngineJackMidi::AudioInputEngineJackMidi()
+{
+  jackclient = init_jack_client();
+
+  jackclient->addJackProcess(this);
+
+  pos = 0;
+}
+
+AudioInputEngineJackMidi::~AudioInputEngineJackMidi()
+{
+  jackclient->removeJackProcess(this);
+  close_jack_client();
+}
+
+void AudioInputEngineJackMidi::jack_process(jack_nframes_t nframes)
+{
+  void *midibuffer = jack_port_get_buffer(midi_port, nframes);
+
+  jack_nframes_t midievents = jack_midi_get_event_count(midibuffer);
+
+  for(jack_nframes_t i = 0; i < midievents; i++) {
+    jack_midi_event_t event;
+    jack_midi_event_get(&event, midibuffer, i);
+    
+    if(event.size != 3) continue;
+    if((event.buffer[0] & NOTE_ON) != NOTE_ON) continue;
+    
+    int key = event.buffer[1];
+    int velocity = event.buffer[2];
+    
+    printf("Event key:%d vel:%d\n", key, velocity);
+    /*
+    if(kit->midimap.find(key) == kit->midimap.end()) {
+      printf("Missing note %d in midimap.\n", key);
+      continue;
+    }
+
+    std::string instr = kit->midimap[key];
+
+    if(kit->instruments.find(instr) == kit->instruments.end()) {
+      printf("Missing instrument %s.\n", instr.c_str());
+      continue;
+    }
+    */
+
+    Instrument *i = NULL;
+    int d = key % kit->instruments.size();
+    Instruments::iterator it = kit->instruments.begin();
+    while(d--) {
+      i = &(it->second);
+      it++;
+    }
+
+    if(i == NULL) {
+      continue;
+    }
+
+    //    Sample *s = i.sample((float)velocity/127.0);
+    Sample *s = i->sample(0.5);
+    
+    if(s == NULL) {
+      printf("Missing Sample.\n");
+      continue;
+    }
+
+    Channels::iterator j = kit->channels.begin();
+    while(j != kit->channels.end()) {
+      Channel &ch = *j;
+      AudioFile *af = s->getAudioFile(&ch);
+      if(af == NULL) {
+        printf("Missing AudioFile.\n");
+      } else {
+        printf("Adding event.\n");
+        Event *evt = new EventSample(ch.num, 1.0, af);
+        eventqueue->post(evt, pos + event.time + nframes);
+      }
+      j++;
+    }
+  }
+  
+  jack_midi_clear_buffer(midibuffer);
+    
+  pos += nframes;
+}
+
+bool AudioInputEngineJackMidi::init(EventQueue *e, DrumKit *dk)
+{
+  eventqueue = e;
+  kit = dk;
+
+	midi_port = jack_port_register(jackclient->jack_client,
+                                 "drumgizmo_midiin",
+                                 JACK_DEFAULT_MIDI_TYPE,
+                                 JackPortIsInput,// | JackPortIsTerminal,
+                                 0);
+
+  return true;
+}
+
+
+bool AudioInputEngineJackMidi::activate()
+{
+  jackclient->activate();
+  return true;
+}
+
+#ifdef TEST_AUDIOINPUTENGINEJACKMIDI
+//Additional dependency files
+//deps:
+//Required cflags (autoconf vars may be used)
+//cflags:
+//Required link options (autoconf vars may be used)
+//libs:
+#include "test.h"
+
+TEST_BEGIN;
+
+// TODO: Put some testcode here (see test.h for usable macros).
+
+TEST_END;
+
+#endif/*TEST_AUDIOINPUTENGINEJACKMIDI*/
diff --git a/drumgizmo/input/jackmidi/audioinputenginejackmidi.h b/drumgizmo/input/jackmidi/audioinputenginejackmidi.h
new file mode 100644
index 0000000..e4c6e69
--- /dev/null
+++ b/drumgizmo/input/jackmidi/audioinputenginejackmidi.h
@@ -0,0 +1,61 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/***************************************************************************
+ *            audioinputenginejackmidi.h
+ *
+ *  Sun Feb 27 11:33:31 CET 2011
+ *  Copyright 2011 Bent Bisballe Nyeng
+ *  deva@aasimon.org
+ ****************************************************************************/
+
+/*
+ *  This file is part of DrumGizmo.
+ *
+ *  DrumGizmo is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  DrumGizmo is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with DrumGizmo; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ */
+#ifndef __DRUMGIZMO_AUDIOINPUTENGINEJACKMIDI_H__
+#define __DRUMGIZMO_AUDIOINPUTENGINEJACKMIDI_H__
+
+#include <jack/jack.h>
+#include <jack/midiport.h>
+
+#include "audioinputengine.h"
+#include "event.h"
+
+#include "jackclient.h"
+
+class AudioInputEngineJackMidi : public AudioInputEngine, public JackProcess {
+public:
+  AudioInputEngineJackMidi();
+  ~AudioInputEngineJackMidi();
+
+  bool init(EventQueue *e, DrumKit *drumkit);
+  bool activate();
+  void run(size_t pos, size_t len) {}
+
+  void thread_main();
+
+  void jack_process(jack_nframes_t nframes);
+
+private:
+  DrumKit *kit;
+  size_t pos;
+  EventQueue *eventqueue;
+
+  JackClient *jackclient;
+  jack_port_t *midi_port;
+};
+
+#endif/*__DRUMGIZMO_AUDIOINPUTENGINEJACKMIDI_H__*/
+
diff --git a/drumgizmo/input/jackmidi/jackclient.cc b/drumgizmo/input/jackmidi/jackclient.cc
new file mode 100644
index 0000000..4fbafb5
--- /dev/null
+++ b/drumgizmo/input/jackmidi/jackclient.cc
@@ -0,0 +1,96 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/***************************************************************************
+ *            jackclient.cc
+ *
+ *  Sun Jul 20 21:48:44 CEST 2008
+ *  Copyright 2008 Bent Bisballe Nyeng
+ *  deva@aasimon.org
+ ****************************************************************************/
+
+/*
+ *  This file is part of DrumGizmo.
+ *
+ *  DrumGizmo is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  DrumGizmo is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with DrumGizmo; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ */
+#include "jackclient.h"
+
+extern "C"
+{
+  int _wrap_jack_process(jack_nframes_t nframes, void *arg){
+    return ((JackClient*)arg)->process(nframes);}
+}  // extern "C"
+
+JackClient::JackClient()
+  : refcnt(0)
+{
+	jack_status_t status;
+
+	jack_client = jack_client_open("DrumGizmo", JackNullOption, &status);
+
+  jack_set_process_callback(jack_client, _wrap_jack_process, this);
+}
+
+JackClient::~JackClient()
+{
+	jack_client_close(jack_client);
+}
+
+void JackClient::addJackProcess(JackProcess *process)
+{
+  jack_processes.insert(process);
+}
+
+void JackClient::removeJackProcess(JackProcess *process)
+{
+  jack_processes.erase(process);
+}
+
+void JackClient::activate()
+{
+	if(!active) jack_activate(jack_client);
+  active = true;
+}
+
+int JackClient::process(jack_nframes_t nframes)
+{
+  std::set<JackProcess *>::iterator i = jack_processes.begin();
+  while(i != jack_processes.end()) {
+    JackProcess *jp = *i;
+    jp->jack_process(nframes);
+    i++;
+  }
+
+	return 0;
+}
+
+JackClient *jackclient = NULL;
+
+JackClient *init_jack_client()
+{
+  if(jackclient == NULL) jackclient = new JackClient();
+  jackclient->refcnt++;
+  return jackclient;
+
+}
+void close_jack_client()
+{
+  if(jackclient) {
+    jackclient->refcnt--;
+    if(jackclient->refcnt == 0) {
+      delete jackclient;
+      jackclient = NULL;
+    }
+  }
+}
diff --git a/drumgizmo/input/jackmidi/jackclient.h b/drumgizmo/input/jackmidi/jackclient.h
new file mode 100644
index 0000000..88e4bbf
--- /dev/null
+++ b/drumgizmo/input/jackmidi/jackclient.h
@@ -0,0 +1,64 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/***************************************************************************
+ *            jackclient.h
+ *
+ *  Sun Jul 20 21:48:44 CEST 2008
+ *  Copyright 2008 Bent Bisballe Nyeng
+ *  deva@aasimon.org
+ ****************************************************************************/
+
+/*
+ *  This file is part of DrumGizmo.
+ *
+ *  DrumGizmo is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  DrumGizmo is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with DrumGizmo; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ */
+#ifndef __DRUMGIZMO_JACKCLIENT_H__
+#define __DRUMGIZMO_JACKCLIENT_H__
+
+#include <jack/jack.h>
+#include <set>
+
+class JackProcess {
+public:
+  virtual void jack_process(jack_nframes_t nframes) = 0;
+};
+
+class JackClient {
+public:
+  JackClient();
+  ~JackClient();
+
+  void addJackProcess(JackProcess *process);
+  void removeJackProcess(JackProcess *process);
+
+  void activate();
+  int process(jack_nframes_t nframes);
+
+	jack_client_t *jack_client;
+
+  // Sort of private...
+  int refcnt;
+
+private:
+  std::set<JackProcess *> jack_processes;
+  bool active;
+};
+
+extern JackClient *jackclient;
+
+JackClient *init_jack_client();
+void close_jack_client();
+
+#endif/*__DRUMGIZMO_JACKCLIENT_H__*/
diff --git a/drumgizmo/input/jackmidi/jackmidi.cc b/drumgizmo/input/jackmidi/jackmidi.cc
new file mode 100644
index 0000000..f9faabd
--- /dev/null
+++ b/drumgizmo/input/jackmidi/jackmidi.cc
@@ -0,0 +1,232 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/***************************************************************************
+ *            jackmidi.cc
+ *
+ *  Sat Apr 30 21:11:54 CEST 2011
+ *  Copyright 2011 Bent Bisballe Nyeng
+ *  deva@aasimon.org
+ ****************************************************************************/
+
+/*
+ *  This file is part of DrumGizmo.
+ *
+ *  DrumGizmo is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  DrumGizmo is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with DrumGizmo; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ */
+#include <stdlib.h>
+
+#include <event.h>
+#include <string>
+
+#include <stdio.h>
+
+#define NOTE_ON 0x90
+
+#include "jackclient.h"
+
+#include <jack/midiport.h>
+
+class JackMidi : public JackProcess {
+public:
+  JackMidi();
+  ~JackMidi();
+
+  bool init(int instruments, char *inames[]);
+
+  void setParm(std::string parm, std::string value);
+
+  bool start();
+  void stop();
+
+  void pre();
+  event_t *run(size_t pos, size_t len, size_t *nevents);
+  void post();
+
+  void jack_process(jack_nframes_t nframes);
+
+private:
+  void loadMap(std::string map) {}
+
+  JackClient *jackclient;
+  jack_port_t *midi_port;
+
+  size_t pos;
+
+  event_t *list;
+  size_t listsize;
+};
+
+JackMidi::JackMidi()
+{
+  jackclient = init_jack_client();
+  jackclient->addJackProcess(this);
+  pos = 0;
+
+  list = (event_t *)malloc(sizeof(event_t) * 1000);
+  listsize = 0;
+}
+
+JackMidi::~JackMidi()
+{
+  jackclient->removeJackProcess(this);
+  close_jack_client();
+}
+
+bool JackMidi::init(int instruments, char *inames[])
+{
+	midi_port = jack_port_register(jackclient->jack_client,
+                                 "drumgizmo_midiin",
+                                 JACK_DEFAULT_MIDI_TYPE,
+                                 JackPortIsInput,// | JackPortIsTerminal,
+                                 0);
+
+  return true;
+}
+
+void JackMidi::setParm(std::string parm, std::string value)
+{
+  if(parm == "map") loadMap(value);
+}
+
+bool JackMidi::start()
+{
+  jackclient->activate();
+  return true;
+}
+
+void JackMidi::stop()
+{
+}
+
+void JackMidi::pre()
+{
+}
+
+event_t *JackMidi::run(size_t pos, size_t len, size_t *nevents)
+{
+  *nevents = listsize;
+  event_t *l = list;
+  list = (event_t *)malloc(sizeof(event_t) * 1000);
+  listsize = 0;
+  return l;
+}
+
+void JackMidi::jack_process(jack_nframes_t nframes)
+{
+  void *midibuffer = jack_port_get_buffer(midi_port, nframes);
+
+  jack_nframes_t midievents = jack_midi_get_event_count(midibuffer);
+
+  for(jack_nframes_t i = 0; i < midievents; i++) {
+    jack_midi_event_t event;
+    jack_midi_event_get(&event, midibuffer, i);
+    
+    if(event.size != 3) continue;
+    if((event.buffer[0] & NOTE_ON) != NOTE_ON) continue;
+    
+    int key = event.buffer[1];
+    int velocity = event.buffer[2];
+    
+    printf("Event key:%d vel:%d\n", key, velocity);
+    
+    if(velocity) {
+      list[listsize].type = TYPE_ONSET;
+      list[listsize].instrument = key;
+      list[listsize].velocity = velocity / 127.0;
+      list[listsize].offset = event.time;
+      listsize++;
+    }
+  }
+  
+  jack_midi_clear_buffer(midibuffer);
+    
+  pos += nframes;
+}
+
+
+void JackMidi::post()
+{
+}
+
+extern "C" {
+  void *create()
+  {
+    return new JackMidi();
+  }
+  
+  void destroy(void *h)
+  {
+    JackMidi *jackmidi = (JackMidi*)h;
+    delete jackmidi;
+  }
+
+  bool init(void *h, int i, char *inames[])
+  {
+    JackMidi *jackmidi = (JackMidi*)h;
+    return jackmidi->init(i, inames);
+  }
+
+  void setparm(void *h, const char *parm, const char *value)
+  {
+    JackMidi *jackmidi = (JackMidi*)h;
+    jackmidi->setParm(parm, value);
+  }
+
+  bool start(void *h)
+  {
+    JackMidi *jackmidi = (JackMidi*)h;
+    return jackmidi->start();
+  }
+
+  void stop(void *h)
+  {
+    JackMidi *jackmidi = (JackMidi*)h;
+    jackmidi->stop();
+  }
+
+  void pre(void *h)
+  {
+    JackMidi *jackmidi = (JackMidi*)h;
+    jackmidi->pre();
+  }
+
+  event_t *run(void *h, size_t pos, size_t len, size_t *nev)
+  {
+    JackMidi *jackmidi = (JackMidi*)h;
+    return jackmidi->run(pos, len, nev);
+  }
+
+  void post(void *h)
+  {
+    JackMidi *jackmidi = (JackMidi*)h;
+    jackmidi->post();
+  }
+}
+
+#ifdef TEST_AUDIOINPUTENGINEJACKMIDI
+//Additional dependency files
+//deps:
+//Required cflags (autoconf vars may be used)
+//cflags:
+//Required link options (autoconf vars may be used)
+//libs:
+#include "test.h"
+
+TEST_BEGIN;
+
+// TODO: Put some testcode here (see test.h for usable macros).
+
+TEST_END;
+
+#endif/*TEST_AUDIOINPUTENGINEJACKMIDI*/