summaryrefslogtreecommitdiffstats
path: root/src/server
diff options
context:
space:
mode:
Diffstat (limited to 'src/server')
-rw-r--r--src/server/Buffer.cpp16
-rw-r--r--src/server/Buffer.hpp4
-rw-r--r--src/server/JackDriver.cpp2
-rw-r--r--src/server/JackDriver.hpp2
-rw-r--r--src/server/internals/Controller.cpp4
5 files changed, 4 insertions, 24 deletions
diff --git a/src/server/Buffer.cpp b/src/server/Buffer.cpp
index 3a09762f..084e8e72 100644
--- a/src/server/Buffer.cpp
+++ b/src/server/Buffer.cpp
@@ -429,22 +429,6 @@ Buffer::update_value_buffer(SampleCount offset)
}
}
-#ifndef NDEBUG
-void
-Buffer::dump_cv(const RunContext& ctx) const
-{
- float value = samples()[0];
- fprintf(stderr, "{ 0000: %.02f\n", value);
- for (uint32_t i = 0; i < ctx.nframes(); ++i) {
- if (samples()[i] != value) {
- value = samples()[i];
- fprintf(stderr, " %4u: %.02f\n", i, value);
- }
- }
- fprintf(stderr, "}\n");
-}
-#endif
-
void* Buffer::aligned_alloc(size_t size)
{
#ifdef HAVE_POSIX_MEMALIGN
diff --git a/src/server/Buffer.hpp b/src/server/Buffer.hpp
index 57db16dd..e22e89e6 100644
--- a/src/server/Buffer.hpp
+++ b/src/server/Buffer.hpp
@@ -204,10 +204,6 @@ public:
/// Set/add to audio buffer from the Sequence of Float in `src`
void render_sequence(const RunContext& ctx, const Buffer* src, bool add);
-#ifndef NDEBUG
- void dump_cv(const RunContext& ctx) const;
-#endif
-
void set_capacity(uint32_t capacity) { _capacity = capacity; }
void set_buffer(void* buf) { assert(_external); _buf = buf; }
diff --git a/src/server/JackDriver.cpp b/src/server/JackDriver.cpp
index 1e27207b..b4594cda 100644
--- a/src/server/JackDriver.cpp
+++ b/src/server/JackDriver.cpp
@@ -71,7 +71,7 @@ JackDriver::JackDriver(Engine& engine)
, _is_activated(false)
, _position()
, _transport_state()
- , _old_bpm(120.0f)
+ , _old_bpm(120.0)
, _old_frame(0)
, _old_rolling(false)
{
diff --git a/src/server/JackDriver.hpp b/src/server/JackDriver.hpp
index 99aa7a7f..ecaaec5f 100644
--- a/src/server/JackDriver.hpp
+++ b/src/server/JackDriver.hpp
@@ -159,7 +159,7 @@ protected:
bool _is_activated;
jack_position_t _position;
jack_transport_state_t _transport_state;
- float _old_bpm;
+ double _old_bpm;
jack_nframes_t _old_frame;
bool _old_rolling;
};
diff --git a/src/server/internals/Controller.cpp b/src/server/internals/Controller.cpp
index 0d38bc43..f2498eba 100644
--- a/src/server/internals/Controller.cpp
+++ b/src/server/internals/Controller.cpp
@@ -157,9 +157,9 @@ ControllerNode::control(RunContext& ctx, uint8_t control_num, uint8_t val, Frame
Sample scaled_value = 0.0f;
if (log_port_val > 0.0f) {
// haaaaack, stupid negatives and logarithms
- Sample log_offset = 0;
+ Sample log_offset = 0.0f;
if (min_port_val < 0) {
- log_offset = fabs(min_port_val);
+ log_offset = fabsf(min_port_val);
}
const Sample min = logf(min_port_val + 1 + log_offset);
const Sample max = logf(max_port_val + 1 + log_offset);