summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2008-11-17 06:01:02 +0000
committerDavid Robillard <d@drobilla.net>2008-11-17 06:01:02 +0000
commitaa0204c491a197f9e827c7a27bf4c1a0585363b8 (patch)
tree73d0aa0e1fb4435a0e738eef73637bc0a9ce0ddf
parentd287e5e3d23a5dfd9fda0da83ea6ec512e386655 (diff)
downloadraul-aa0204c491a197f9e827c7a27bf4c1a0585363b8.tar.gz
raul-aa0204c491a197f9e827c7a27bf4c1a0585363b8.tar.bz2
raul-aa0204c491a197f9e827c7a27bf4c1a0585363b8.zip
Run. Sorta.
git-svn-id: http://svn.drobilla.net/lad/trunk/raul@1757 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r--raul/TimeSlice.hpp6
-rw-r--r--tests/time_test.cpp2
2 files changed, 4 insertions, 4 deletions
diff --git a/raul/TimeSlice.hpp b/raul/TimeSlice.hpp
index e345c37..781ba86 100644
--- a/raul/TimeSlice.hpp
+++ b/raul/TimeSlice.hpp
@@ -49,13 +49,13 @@ namespace Raul {
*/
class TimeSlice : public boost::noncopyable {
public:
- TimeSlice(uint32_t rate, double bpm)
+ TimeSlice(uint32_t rate, uint32_t ppqn, double bpm)
: _tick_rate(rate)
, _beat_rate(60.0/bpm)
, _start_ticks(Raul::TimeUnit(Raul::TimeUnit::FRAMES, rate), 0, 0)
, _length_ticks(TimeUnit(TimeUnit::FRAMES, rate), 0, 0)
- , _start_beats(TimeUnit(TimeUnit::BEATS, LV2_EVENT_PPQN), 0, 0)
- , _length_beats(TimeUnit(TimeUnit::BEATS, LV2_EVENT_PPQN), 0, 0)
+ , _start_beats(TimeUnit(TimeUnit::BEATS, ppqn), 0, 0)
+ , _length_beats(TimeUnit(TimeUnit::BEATS, ppqn), 0, 0)
, _offset_ticks(TimeUnit(TimeUnit::FRAMES, rate), 0, 0)
{}
diff --git a/tests/time_test.cpp b/tests/time_test.cpp
index 2f87f87..a84993b 100644
--- a/tests/time_test.cpp
+++ b/tests/time_test.cpp
@@ -10,7 +10,7 @@ int
main()
{
TimeUnit unit(TimeUnit::BEATS, 19200);
- TimeSlice ts(48000, 120);
+ TimeSlice ts(48000, 19200, 120.0);
double in_double;
cout << "Beats: ";