diff options
| -rw-r--r-- | drumgizmo/Makefile.am | 1 | ||||
| -rw-r--r-- | drumgizmo/drumgizmoc.cc | 95 | ||||
| -rw-r--r-- | drumgizmo/drumgizmoc.h | 45 | ||||
| -rw-r--r-- | drumgizmo/output/wavfile/Makefile.am | 2 | ||||
| -rw-r--r-- | src/drumgizmo.cc | 23 | ||||
| -rw-r--r-- | src/drumgizmo.h | 13 |
6 files changed, 154 insertions, 25 deletions
diff --git a/drumgizmo/Makefile.am b/drumgizmo/Makefile.am index b01b41f..5220ae3 100644 --- a/drumgizmo/Makefile.am +++ b/drumgizmo/Makefile.am @@ -27,6 +27,7 @@ drumgizmo_SOURCES = \ EXTRA_DIST = \ audioinputenginedl.h \ audiooutputenginedl.h \ + drumgizmoc.h \ jackclient.h endif diff --git a/drumgizmo/drumgizmoc.cc b/drumgizmo/drumgizmoc.cc index ce4d9e2..6315491 100644 --- a/drumgizmo/drumgizmoc.cc +++ b/drumgizmo/drumgizmoc.cc @@ -30,8 +30,10 @@ #include <string.h> #include <stdio.h> #include <stdlib.h> +#include <unistd.h> #include "drumgizmo.h" +#include "drumgizmoc.h" #include "audiooutputenginedl.h" #include "audioinputenginedl.h" @@ -54,17 +56,60 @@ static const char copyright_str[] = static const char usage_str[] = "Usage: %s [options] drumkitfile\n" "Options:\n" -" -p, --preload Load entire kit audio files into memory (uses ALOT of memory).\n" -" -i, --inputengine dummy|test|jackmidi|midifile Use said event input engine.\n" -" -I, --inputparms parmlist Set input engine parameters.\n" -" -o, --outputengine dummy|alsa|jackaudio|wavfile Use said audio output engine.\n" -" -O, --outputparms parmlist Set output engine parameters.\n" -" -e, --endpos Number of samples to process, -1: infinite.\n" +" -a, --async-load Load drumkit in the background and start the engine immediately.\n" +" -i, --inputengine dummy|test|jackmidi|midifile Use said event input engine.\n" +" -I, --inputparms parmlist Set input engine parameters.\n" +" -o, --outputengine dummy|alsa|jackaudio|sndfile Use said audio output engine.\n" +" -O, --outputparms parmlist Set output engine parameters.\n" +" -e, --endpos Number of samples to process, -1: infinite.\n" " -v, --version Print version information and exit.\n" " -h, --help Print this message and exit.\n" +"\n" +"Input engine parameters:\n" +" jackmidi: midimap=<midimapfile>\n" +" midifile: file=<midifile>, speed=<tempo> (default 1.0),\n" +" track=<miditrack> (default -1, all tracks)\n" +" midimap=<midimapfile>, loop=<true|false>\n" +" test: p=<hit_propability> (default 0.1)\n" +" instr=<instrument> (default -1, random instrument)\n" +" len=<seconds> (default -1, forever)\n" +" dummy:\n" +"\n" +"Output engine parameters:\n" +" alsa: dev=<device> (default 'default'), frames=<frames> (default 32)\n" +" srate=<samplerate> (default 441000)\n" +" wavfile: file=<filename> (default 'output'), srate=<samplerate> (default 44100)\n" +" jackaudio:\n" +" dummy:\n" +"\n" ; -int main(int argc, char *argv[]) +CliMain::CliMain() : MessageReceiver(MSGRCV_UI) +{ + loading = true; // Block by default +} + +CliMain::~CliMain() +{ +} + +void CliMain::handleMessage(Message *msg) +{ + switch(msg->type()) { + case Message::LoadStatus: + { + LoadStatusMessage *ls = (LoadStatusMessage*)msg; + if(ls->numer_of_files_loaded == ls->number_of_files) { + loading = false; + } + } + break; + default: + break; + } +} + +int CliMain::run(int argc, char *argv[]) { int c; @@ -72,13 +117,13 @@ int main(int argc, char *argv[]) std::string inputengine; std::string iparms; std::string oparms; - bool preload = false; + bool async = false; int endpos = -1; int option_index = 0; while(1) { static struct option long_options[] = { - {"preload", no_argument, 0, 'p'}, + {"async-load", no_argument, 0, 'a'}, {"inputengine", required_argument, 0, 'i'}, {"inputparms", required_argument, 0, 'I'}, {"outputengine", required_argument, 0, 'o'}, @@ -119,8 +164,8 @@ int main(int argc, char *argv[]) oparms = optarg; break; - case 'p': - preload = true; + case 'a': + async = true; break; case 'e': @@ -243,14 +288,30 @@ int main(int argc, char *argv[]) printf("Using kitfile: %s\n", kitfile.c_str()); DrumGizmo gizmo(oe, ie); + if(kitfile == "" || !gizmo.loadkit(kitfile)) { printf("Failed to load \"%s\".\n", kitfile.c_str()); return 1; } + printf("Loading drumkit, this may take a while..."); + fflush(stdout); + loading = true; + while(async == false && loading) { +#ifdef WIN32 + SleepEx(500, FALSE); +#else + usleep(500000); +#endif/*WIN32*/ + handleMessages(); + printf("."); + fflush(stdout); + } + printf("done.\n"); + gizmo.setSamplerate(oe->samplerate()); - if(!gizmo.init(preload)) { + if(!gizmo.init()) { printf("Failed init engine.\n"); return 1; } @@ -264,3 +325,13 @@ int main(int argc, char *argv[]) return 0; } + +int main(int argc, char *argv[]) +{ + CliMain cli; + + cli.run(argc, argv); + + return 0; + +} diff --git a/drumgizmo/drumgizmoc.h b/drumgizmo/drumgizmoc.h new file mode 100644 index 0000000..4b6d4a1 --- /dev/null +++ b/drumgizmo/drumgizmoc.h @@ -0,0 +1,45 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/*************************************************************************** + * drumgizmoc.h + * + * Mon Jan 12 00:36:37 CET 2015 + * Copyright 2015 Sergey 'Jin' Bostandzhyan + * jin@mediatomb.cc + ****************************************************************************/ + +/* + * 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 __DRUMGIZMOC_H__ +#define __DRUMGIZMOC_H__ + +#include "messagereceiver.h" + +class CliMain : public MessageReceiver { +public: + CliMain(); + virtual ~CliMain(); + + int run(int argc, char *argv[]); + void handleMessage(Message *msg); +private: + bool loading; +}; + +#endif//__DRUMGIZMOC_H__ + diff --git a/drumgizmo/output/wavfile/Makefile.am b/drumgizmo/output/wavfile/Makefile.am index ae0eb76..ad26294 100644 --- a/drumgizmo/output/wavfile/Makefile.am +++ b/drumgizmo/output/wavfile/Makefile.am @@ -26,4 +26,4 @@ wavfile_la_LIBADD = wavfile_la_SOURCES = $(wavfilebuildsources) install-exec-hook: - rm -f $(DESTDIR)$(libdir)/alsa.la + rm -f $(DESTDIR)$(libdir)/wavfile.la diff --git a/src/drumgizmo.cc b/src/drumgizmo.cc index 5d7de70..2f2232c 100644 --- a/src/drumgizmo.cc +++ b/src/drumgizmo.cc @@ -49,6 +49,7 @@ DrumGizmo::DrumGizmo(AudioOutputEngine *o, AudioInputEngine *i) : MessageReceiver(MSGRCV_ENGINE), loader(), oe(o), ie(i) { + is_stopping = false; } DrumGizmo::~DrumGizmo() @@ -86,10 +87,8 @@ bool DrumGizmo::loadkit(std::string file) return true; } -bool DrumGizmo::init(bool preload) +bool DrumGizmo::init() { - (void)preload; - if(!ie->init(kit.instruments)) return false; if(!oe->init(kit.channels)) return false; @@ -257,7 +256,23 @@ bool DrumGizmo::run(size_t pos, sample_t *samples, size_t nsamples) } if(evs[e].type == TYPE_STOP) { - return false; + is_stopping = true; + } + + if(is_stopping) { + // Count the number of active events. + int num_active_events = 0; + Channels::iterator j = kit.channels.begin(); + while(j != kit.channels.end()) { + Channel &ch = *j; + num_active_events += activeevents[ch.num].size(); + j++; + } + + if(num_active_events == 0) { + // No more active events - now we can stop the engine. + return false; + } } } diff --git a/src/drumgizmo.h b/src/drumgizmo.h index 138e61c..f8d45f5 100644 --- a/src/drumgizmo.h +++ b/src/drumgizmo.h @@ -51,14 +51,13 @@ class DrumGizmo : public MessageReceiver { public: - DrumGizmo(AudioOutputEngine *outputengine, - AudioInputEngine *inputengine); + DrumGizmo(AudioOutputEngine *outputengine, AudioInputEngine *inputengine); virtual ~DrumGizmo(); bool loadkit(std::string kitfile); - bool init(bool preload = true); - + bool init(); + /** * @param endpos number of samples to process, -1 := never stop. */ @@ -68,8 +67,6 @@ public: void getSamples(int ch, int pos, sample_t *s, size_t sz); - bool isRunning() { return is_running; } - std::string configString(); bool setConfigString(std::string cfg); @@ -77,12 +74,12 @@ public: int samplerate(); void setSamplerate(int samplerate); - + private: DrumKitLoader loader; Mutex mutex; - bool is_running; + bool is_stopping; ///< Is set to true when a TYPE_STOP event has been seen. AudioOutputEngine *oe; AudioInputEngine *ie; |