New message system. New common midi input class. Some compiler warning fixes.

2 files changed, 110 insertions, 0 deletions

diff --git a/src/audioinputenginemidi.cc b/src/audioinputenginemidi.cc
new file mode 100644
index 0000000..5986471
--- /dev/null
+++ b/src/audioinputenginemidi.cc
@@ -0,0 +1,56 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/***************************************************************************
+ *            audioinputenginemidi.cc
+ *
+ *  Mon Apr  1 20:13:25 CEST 2013
+ *  Copyright 2013 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 "audioinputenginemidi.h"
+
+void InputLV2::loadMidiMap(std::string f)
+{
+  if(f == "") return;
+  MidiMapParser p(f);
+  if(p.parse()) {/*return false;*/}
+  mmap.midimap = p.midimap;
+
+  for(size_t i = 0; i < instruments->size(); i++) {
+    mmap.instrmap[(*instruments)[i]->name()] = i;
+  }
+}
+
+#ifdef TEST_AUDIOINPUTENGINEMIDI
+//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_AUDIOINPUTENGINEMIDI*/
diff --git a/src/audioinputenginemidi.h b/src/audioinputenginemidi.h
new file mode 100644
index 0000000..e52a54f
--- /dev/null
+++ b/src/audioinputenginemidi.h
@@ -0,0 +1,54 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/***************************************************************************
+ *            audioinputenginemidi.h
+ *
+ *  Mon Apr  1 20:13:24 CEST 2013
+ *  Copyright 2013 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_AUDIOINPUTENGINEMIDI_H__
+#define __DRUMGIZMO_AUDIOINPUTENGINEMIDI_H__
+
+#include "audioinputengine.h"
+
+class AudioInputEngineMidi {
+public:
+  virtual ~AudioInputEngineMidi() {}
+
+  virtual bool init(Instruments &instruments) = 0;
+
+  virtual void setParm(std::string parm, std::string value) = 0;
+
+  virtual bool start() = 0;
+  virtual void stop() = 0;
+
+  virtual void pre() = 0;
+  virtual event_t *run(size_t pos, size_t len, size_t *nevents) = 0;
+  virtual void post() = 0;
+
+  void loadMidiMap(std::string file);
+
+protected:
+
+  MidiMapper mmap;
+};
+
+#endif/*__DRUMGIZMO_AUDIOINPUTENGINEMIDI_H__*/