Merge remote-tracking branch 'origin/suhr/cli_test_input'

5 files changed, 188 insertions, 0 deletions

diff --git a/drumgizmo/Makefile.am b/drumgizmo/Makefile.am
index 01a69af..59eeb78 100644
--- a/drumgizmo/Makefile.am
+++ b/drumgizmo/Makefile.am
@@ -30,6 +30,11 @@ drumgizmo_SOURCES += input/inputdummy.cc
 drumgizmo_CXXFLAGS += -DHAVE_INPUT_DUMMY
 endif # HAVE_INPUT_DUMMY
 
+if HAVE_INPUT_TEST
+drumgizmo_SOURCES += input/test.cc
+drumgizmo_CXXFLAGS += -DHAVE_INPUT_TEST
+endif # HAVE_INPUT_TEST
+
 if HAVE_INPUT_MIDIFILE
 drumgizmo_CXXFLAGS += $(SMF_CFLAGS)
 drumgizmo_LDADD += $(SMF_LIBS)
@@ -71,11 +76,13 @@ EXTRA_DIST = \
 	jackclient.h \
 	enginefactory.h \
 	input/inputdummy.h \
+	input/test.h \
 	input/jackmidi.h \
 	input/midifile.h \
 	output/alsa.h \
 	output/jackaudio.h \
 	output/outputdummy.h \
+	output/test.h \
 	output/wavfile.h
 
 endif # ENABLE_CLI
diff --git a/drumgizmo/enginefactory.cc b/drumgizmo/enginefactory.cc
index d3e08c6..d013ef9 100644
--- a/drumgizmo/enginefactory.cc
+++ b/drumgizmo/enginefactory.cc
@@ -40,6 +40,9 @@ EngineFactory::EngineFactory()
 #ifdef HAVE_INPUT_DUMMY
 	input.push_back("inputdummy");
 #endif
+#ifdef HAVE_INPUT_TEST
+	input.push_back("test");
+#endif
 #ifdef HAVE_INPUT_MIDIFILE
 	input.push_back("midifile");
 #endif
@@ -90,6 +93,12 @@ std::unique_ptr<AudioInputEngine> EngineFactory::createInput(const std::string&
 		return std::make_unique<DummyInputEngine>();
 	}
 #endif
+#ifdef HAVE_INPUT_TEST
+	if(name == "test")
+	{
+		return std::make_unique<TestInputEngine>();
+	}
+#endif
 #ifdef HAVE_INPUT_MIDIFILE
 	if(name == "midifile")
 	{
diff --git a/drumgizmo/enginefactory.h b/drumgizmo/enginefactory.h
index 803f476..b2c0428 100644
--- a/drumgizmo/enginefactory.h
+++ b/drumgizmo/enginefactory.h
@@ -41,6 +41,10 @@
 #include "input/inputdummy.h"
 #endif
 
+#ifdef HAVE_INPUT_TEST
+#include "input/test.h"
+#endif
+
 #ifdef HAVE_INPUT_MIDIFILE
 #include "input/midifile.h"
 #endif
diff --git a/drumgizmo/input/test.cc b/drumgizmo/input/test.cc
new file mode 100644
index 0000000..4789119
--- /dev/null
+++ b/drumgizmo/input/test.cc
@@ -0,0 +1,115 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/***************************************************************************
+ *            test.cc
+ *
+ *  Sun Apr  3 13:21:26 CEST 2016
+ *  Copyright 2016 Jonas Suhr Christensen
+ *  jsc@umbraculum.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 Lesser 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 Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser 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 <string>
+
+#include "event.h"
+#include "test.h"
+
+TestInputEngine::TestInputEngine()
+	: AudioInputEngine{}
+	, probability{0.1}
+	, instrument{-1}
+	, length{-1}
+{
+}
+
+TestInputEngine::~TestInputEngine()
+{
+}
+
+bool TestInputEngine::init(const Instruments& instruments)
+{
+  return true;
+}
+
+void TestInputEngine::setParm(const std::string& parm, const std::string& value)
+{
+	if(parm == "p")
+	{
+  		probability = atof(value.c_str());
+	}
+	if(parm == "instr")
+	{
+		instrument = atoi(value.c_str());
+	}
+	if(parm == "len")
+	{
+		length = atoi(value.c_str());
+	}
+}
+
+bool TestInputEngine::start()
+{
+  return true;
+}
+
+void TestInputEngine::stop()
+{
+}
+
+void TestInputEngine::pre()
+{
+}
+
+void TestInputEngine::run(size_t pos, size_t len, std::vector<event_t>& events)
+{
+	if((float)rand() / (float)RAND_MAX > probability) 
+	{
+		return;
+	}
+
+	events.emplace_back();
+	auto& event = events.back();
+	event.type = TYPE_ONSET;
+
+	if(length != -1 && (int)pos > length * 44100) 
+	{
+		event.type = TYPE_STOP;
+	}
+	else 
+	{
+		event.type = TYPE_ONSET;
+	}
+
+
+	if(instrument != -1) 
+	{
+		event.instrument = instrument;
+	}
+	else
+	{
+		event.instrument = rand() % 32;
+	}
+
+	event.velocity = (float)rand()/(float)RAND_MAX;
+	event.offset = len;
+}
+
+void TestInputEngine::post()
+{
+}
diff --git a/drumgizmo/input/test.h b/drumgizmo/input/test.h
new file mode 100644
index 0000000..1edf386
--- /dev/null
+++ b/drumgizmo/input/test.h
@@ -0,0 +1,53 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/***************************************************************************
+ *            test.h
+ *
+ *  Sun Apr  3 11:27:25 CEST 2016
+ *  Copyright 2016 Jonas Suhr Christensen
+ *  jsc@umbraculum.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 Lesser General Public License as published by
+ *  the Free Software Foundation; either version 3 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 Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser 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.
+ */
+#pragma once
+#include <string>
+
+#include "event.h"
+#include "audioinputengine.h"
+
+class TestInputEngine
+	: public AudioInputEngine
+{
+public:
+	TestInputEngine();
+	~TestInputEngine();
+
+	// based on AudioInputEngine
+	bool init(const Instruments& instruments) override;
+	void setParm(const std::string& parm, const std::string& value) override;
+	bool start() override;
+	void stop() override;
+	void pre() override;
+	void run(size_t pos, size_t len, std::vector<event_t>& events) override;
+	void post() override;
+
+private:
+	float probability;
+	int instrument;
+	int length;
+};