diff options
Diffstat (limited to 'include/ingen')
| -rw-r--r-- | include/ingen/Clock.hpp | 4 | ||||
| -rw-r--r-- | include/ingen/EngineBase.hpp | 2 | ||||
| -rw-r--r-- | include/ingen/client/GraphModel.hpp | 9 | ||||
| -rw-r--r-- | include/ingen/fmt.hpp | 2 |
4 files changed, 6 insertions, 11 deletions
diff --git a/include/ingen/Clock.hpp b/include/ingen/Clock.hpp index 75575aa5..6a966701 100644 --- a/include/ingen/Clock.hpp +++ b/include/ingen/Clock.hpp @@ -37,7 +37,7 @@ public: uint64_t now_microseconds() const { const uint64_t now = mach_absolute_time(); - return now * _timebase.numer / _timebase.denom / 1e3; + return now * _timebase.numer / _timebase.denom / 1000U; } private: @@ -49,7 +49,7 @@ private: struct timespec time{}; clock_gettime(_clock, &time); return static_cast<uint64_t>(time.tv_sec) * 1000000U + - static_cast<uint64_t>(time.tv_nsec) / 100U; + static_cast<uint64_t>(time.tv_nsec) / 1000U; } private: diff --git a/include/ingen/EngineBase.hpp b/include/ingen/EngineBase.hpp index 1b6b105a..48a1464d 100644 --- a/include/ingen/EngineBase.hpp +++ b/include/ingen/EngineBase.hpp @@ -46,7 +46,7 @@ public: */ virtual void init(double sample_rate, uint32_t block_length, - size_t seq_size) = 0; + uint32_t seq_size) = 0; /** Return true iff the engine and driver supports dynamic ports. diff --git a/include/ingen/client/GraphModel.hpp b/include/ingen/client/GraphModel.hpp index 0ae756d8..1bc445ac 100644 --- a/include/ingen/client/GraphModel.hpp +++ b/include/ingen/client/GraphModel.hpp @@ -18,7 +18,6 @@ #define INGEN_CLIENT_GRAPHMODEL_HPP #include "ingen/Node.hpp" -#include "ingen/URIs.hpp" #include "ingen/client/BlockModel.hpp" #include "ingen/client/signal.hpp" #include "ingen/ingen.h" @@ -32,7 +31,7 @@ class Path; namespace ingen { -class URI; +class URIs; namespace client { @@ -67,11 +66,7 @@ public: private: friend class ClientStore; - GraphModel(URIs& uris, const raul::Path& graph_path) - : BlockModel(uris, - static_cast<const URI&>(uris.ingen_Graph), - graph_path) - {} + GraphModel(URIs& uris, const raul::Path& graph_path); void clear() override; void add_child(const std::shared_ptr<ObjectModel>& c) override; diff --git a/include/ingen/fmt.hpp b/include/ingen/fmt.hpp index 7ca5de9f..bfc339e5 100644 --- a/include/ingen/fmt.hpp +++ b/include/ingen/fmt.hpp @@ -29,7 +29,7 @@ fmt(const char* fmt, Args&&... args) { boost::format f{fmt}; // NOLINT(misc-const-correctness) const std::initializer_list<char> l{ - (static_cast<void>(f % args), char{})...}; + (static_cast<void>(f % std::forward<Args>(args)), char{})...}; (void)l; return boost::str(f); |