diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/JackDriver.cpp | 7 | ||||
| -rw-r--r-- | src/RDFWriter.cpp | 2 | ||||
| -rw-r--r-- | src/TimeSlice.cpp | 54 |
3 files changed, 62 insertions, 1 deletions
diff --git a/src/JackDriver.cpp b/src/JackDriver.cpp index fb529eb..cededca 100644 --- a/src/JackDriver.cpp +++ b/src/JackDriver.cpp @@ -58,7 +58,12 @@ JackDriver::attach(const string& client_name, string server_name) jack_set_error_function(error_cb); - _client = jack_client_open(client_name.c_str(), JackServerName, NULL, server_name.c_str(), NULL); + if (server_name.length() > 0) + _client = jack_client_open(client_name.c_str(), JackServerName, NULL, + server_name.c_str(), NULL); + else + _client = jack_client_open(client_name.c_str(), JackNullOption, NULL, NULL); + if (_client == NULL) { //_app->status_message("[JACK] Unable to create client"); _is_activated = false; diff --git a/src/RDFWriter.cpp b/src/RDFWriter.cpp index 625d1fc..33bc220 100644 --- a/src/RDFWriter.cpp +++ b/src/RDFWriter.cpp @@ -21,6 +21,8 @@ #define U(x) ((const unsigned char*)(x)) +using namespace std; + namespace Raul { diff --git a/src/TimeSlice.cpp b/src/TimeSlice.cpp new file mode 100644 index 0000000..d6b7fc6 --- /dev/null +++ b/src/TimeSlice.cpp @@ -0,0 +1,54 @@ +/* This file is part of Raul. + * Copyright (C) 2007 Dave 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 2 of the License, or (at your option) 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 details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include <raul/TimeSlice.h> + +namespace Raul { + + +TimeSlice::TimeSlice(double tick_rate, double bpm) + : _tick_rate(tick_rate) + , _beat_rate(60.0/bpm) + , _start_ticks(0) + , _offset(0) + , _length(0) + , _start_beats(0) +{} + + +/** Update beat time to match real (tick) time. + */ +void +TimeSlice::update_beat_time() +{ + _start_beats = (start_ticks() * _tick_rate) / _beat_rate; +} + + +TickTime +TimeSlice::beats_to_ticks(BeatTime beats) +{ + return static_cast<TickTime>(beats_to_seconds(beats) / _tick_rate); +} + +Seconds +TimeSlice::beats_to_seconds(BeatTime beats) +{ + return (beats * _beat_rate); +} + +} // namespace Raul |