diff options
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | raul/Quantizer.hpp | 47 | ||||
| -rw-r--r-- | test/quantize_test.cpp | 40 | ||||
| -rw-r--r-- | wscript | 1 |
4 files changed, 2 insertions, 88 deletions
@@ -3,10 +3,12 @@ raul (9999) unstable; * Remove glib dpendency * Improve RingBuffer * Add ThreadVar, a thread-specific variable class + * Implement Semaphore for Windows * Improve test suite * Remove EventRingBuffer * Remove SMFReader and SMFWriter * Remove OSC and RDF library dependent code + * Remove Quantizer * Remove Thread context stuff in favour of ThreadVar * Add INSTALL file * Update license to GPL3+ diff --git a/raul/Quantizer.hpp b/raul/Quantizer.hpp deleted file mode 100644 index 078f5e2..0000000 --- a/raul/Quantizer.hpp +++ /dev/null @@ -1,47 +0,0 @@ -/* - This file is part of Raul. - Copyright 2007-2012 David Robillard <http://drobilla.net> - - Raul 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 3 of the License, or any later version. - - Raul 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 Raul. If not, see <http://www.gnu.org/licenses/>. -*/ - -#ifndef RAUL_QUANTIZER_HPP -#define RAUL_QUANTIZER_HPP - -#include <cmath> -#include "raul/TimeStamp.hpp" - -namespace Raul { - -/** Quantizer. - * \ingroup raul - */ -class Quantizer { -public: - inline static TimeStamp quantize(TimeStamp q, TimeStamp t) { - assert(q.unit() == t.unit()); - // FIXME: Precision problem? Should probably stay in discrete domain - const double qd = q.to_double(); - const double td = t.to_double(); - return TimeStamp(t.unit(), (qd > 0) ? lrint(td / qd) * qd : td); - } - - inline static double quantize(double q, double t) { - return (q > 0) - ? lrint(t / q) * q - : t; - } -}; - -} // namespace Raul - -#endif // RAUL_QUANTIZER_HPP diff --git a/test/quantize_test.cpp b/test/quantize_test.cpp deleted file mode 100644 index 9cc165d..0000000 --- a/test/quantize_test.cpp +++ /dev/null @@ -1,40 +0,0 @@ -/* - This file is part of Raul. - Copyright 2007-2012 David Robillard <http://drobilla.net> - - Raul 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 3 of the License, or any later version. - - Raul 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 Raul. If not, see <http://www.gnu.org/licenses/>. -*/ - -#include "raul/Quantizer.hpp" -#include <iostream> - -using namespace std; -using namespace Raul; - -int -main() -{ - TimeStamp q(TimeUnit(TimeUnit::BEATS, 19200), 0.25); - - for (double in = 0.0; in < 32; in += 0.23) { - TimeStamp beats(TimeUnit(TimeUnit::BEATS, 19200), in); - - /*cout << "Q(" << in << ", 1/4) = " - << Quantizer::quantize(q, beats) << endl;*/ - - if (Quantizer::quantize(q, beats).subticks() % (19200/4) != 0) - return 1; - } - - return 0; -} - @@ -87,7 +87,6 @@ tests = ''' test/list_test test/path_test test/ptr_test - test/quantize_test test/queue_test test/ringbuffer_test test/sem_test |