summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am.drumgizmo1
-rw-r--r--src/velocity.cc69
-rw-r--r--src/velocity.h50
3 files changed, 0 insertions, 120 deletions
diff --git a/src/Makefile.am.drumgizmo b/src/Makefile.am.drumgizmo
index 818c1ce..f3a4b2c 100644
--- a/src/Makefile.am.drumgizmo
+++ b/src/Makefile.am.drumgizmo
@@ -31,7 +31,6 @@ DRUMGIZMO_SOURCES = \
$(top_srcdir)/src/semaphore.cc \
$(top_srcdir)/src/saxparser.cc \
$(top_srcdir)/src/thread.cc \
- $(top_srcdir)/src/velocity.cc \
$(top_srcdir)/src/versionstr.cc
DRUMGIZMO_LIBS = \
diff --git a/src/velocity.cc b/src/velocity.cc
deleted file mode 100644
index 2d9bf8f..0000000
--- a/src/velocity.cc
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/***************************************************************************
- * velocity.cc
- *
- * Tue Jul 22 18:04:58 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 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.
- */
-#include "velocity.h"
-
-#include <stdlib.h>
-
-Velocity::Velocity(unsigned int lower, unsigned int upper, Random& rand)
- : lower{lower}
- , upper{upper}
- , samples{}
- , rand(rand)
-{
-}
-
-void Velocity::addSample(Sample* sample, float probability)
-{
- if(samples.find(sample) != samples.end())
- {
- samples[sample] += probability;
- }
- else
- {
- samples[sample] = probability;
- }
-}
-
-Sample* Velocity::getSample()
-{
- Sample* sample{nullptr};
-
- float x = rand.floatInRange(0, 1);
- float sum = 0.0;
-
- for (auto const & pair: samples)
- {
- if (x > sum)
- {
- break;
- }
- sum += pair.second;
- sample = pair.first;
- }
-
- return sample;
-}
diff --git a/src/velocity.h b/src/velocity.h
deleted file mode 100644
index 8392494..0000000
--- a/src/velocity.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/***************************************************************************
- * velocity.h
- *
- * Tue Jul 22 18:04:58 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 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 <map>
-
-#include "sample.h"
-#include "random.h"
-
-class Velocity
-{
-public:
- Velocity(unsigned int lower, unsigned int upper, Random& rand);
-
- void addSample(Sample* sample, float probability);
- Sample* getSample();
-
- unsigned int lower;
- unsigned int upper;
-
-private:
- typedef std::map<Sample*, float> Samples;
- Samples samples;
-
- Random& rand;
-};