summaryrefslogtreecommitdiffstats
path: root/src/server
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2020-08-01 18:59:18 +0200
committerDavid Robillard <d@drobilla.net>2020-08-02 01:48:48 +0200
commit7b70b455e6199b508217b021d9a0dfc08f9a7794 (patch)
treecb005e7cd9414cc3eb4b7c1baa52de69664dcd02 /src/server
parent848bb52824657c20b1d758aebcecefb5d8c37fb9 (diff)
downloadingen-7b70b455e6199b508217b021d9a0dfc08f9a7794.tar.gz
ingen-7b70b455e6199b508217b021d9a0dfc08f9a7794.tar.bz2
ingen-7b70b455e6199b508217b021d9a0dfc08f9a7794.zip
Use default member initialization
Diffstat (limited to 'src/server')
-rw-r--r--src/server/Broadcaster.cpp5
-rw-r--r--src/server/Broadcaster.hpp6
-rw-r--r--src/server/PortImpl.hpp8
-rw-r--r--src/server/ingen_lv2.cpp13
-rw-r--r--src/server/internals/Note.hpp16
5 files changed, 18 insertions, 30 deletions
diff --git a/src/server/Broadcaster.cpp b/src/server/Broadcaster.cpp
index 914b891b..b7dc4526 100644
--- a/src/server/Broadcaster.cpp
+++ b/src/server/Broadcaster.cpp
@@ -27,11 +27,6 @@
namespace ingen {
namespace server {
-Broadcaster::Broadcaster()
- : _must_broadcast(false)
- , _bundle_depth(0)
-{}
-
Broadcaster::~Broadcaster()
{
std::lock_guard<std::mutex> lock(_clients_mutex);
diff --git a/src/server/Broadcaster.hpp b/src/server/Broadcaster.hpp
index d8857356..66487766 100644
--- a/src/server/Broadcaster.hpp
+++ b/src/server/Broadcaster.hpp
@@ -42,7 +42,7 @@ namespace server {
class Broadcaster : public Interface
{
public:
- Broadcaster();
+ Broadcaster() = default;
~Broadcaster();
void register_client(const SPtr<Interface>& client);
@@ -114,8 +114,8 @@ private:
std::mutex _clients_mutex;
Clients _clients;
std::set< SPtr<Interface> > _broadcastees;
- std::atomic<bool> _must_broadcast;
- unsigned _bundle_depth;
+ std::atomic<bool> _must_broadcast{false};
+ unsigned _bundle_depth{0};
SPtr<Interface> _ignore_client;
};
diff --git a/src/server/PortImpl.hpp b/src/server/PortImpl.hpp
index 05664ee5..fa204310 100644
--- a/src/server/PortImpl.hpp
+++ b/src/server/PortImpl.hpp
@@ -61,7 +61,7 @@ public:
SET
};
- SetState() : state(State::SET), value(0), time(0) {}
+ SetState() = default;
void set(const RunContext& ctx, FrameTime t, Sample v) {
time = t;
@@ -71,9 +71,9 @@ public:
: State::HALF_SET_CYCLE_1);
}
- State state; ///< State of buffer for setting control value
- Sample value; ///< Value currently being set
- FrameTime time; ///< Time value was set
+ State state = State::SET; ///< State for setting control value
+ Sample value = 0; ///< Value currently being set
+ FrameTime time = 0; ///< Time value was set
};
struct Voice {
diff --git a/src/server/ingen_lv2.cpp b/src/server/ingen_lv2.cpp
index 998ca28a..a38be08b 100644
--- a/src/server/ingen_lv2.cpp
+++ b/src/server/ingen_lv2.cpp
@@ -451,19 +451,12 @@ ingen_lv2_main(const SPtr<Engine>& engine, const SPtr<LV2Driver>& driver)
}
struct IngenPlugin {
- IngenPlugin()
- : main(nullptr)
- , map(nullptr)
- , argc(0)
- , argv(nullptr)
- {}
-
UPtr<ingen::World> world;
SPtr<Engine> engine;
UPtr<std::thread> main;
- LV2_URID_Map* map;
- int argc;
- char** argv;
+ LV2_URID_Map* map = nullptr;
+ int argc = 0;
+ char** argv = nullptr;
};
static Lib::Graphs
diff --git a/src/server/internals/Note.hpp b/src/server/internals/Note.hpp
index c986a745..0a7d80c9 100644
--- a/src/server/internals/Note.hpp
+++ b/src/server/internals/Note.hpp
@@ -69,19 +69,19 @@ private:
/** Key, one for each key on the keyboard */
struct Key {
enum class State { OFF, ON_ASSIGNED, ON_UNASSIGNED };
- Key() : state(State::OFF), voice(0), time(0) {}
- State state;
- uint32_t voice;
- SampleCount time;
+
+ State state = State::OFF;
+ uint32_t voice = 0;
+ SampleCount time = 0;
};
/** Voice, one of these always exists for each voice */
struct Voice {
enum class State { FREE, ACTIVE, HOLDING };
- Voice() : state(State::FREE), note(0), time(0) {}
- State state;
- uint8_t note;
- SampleCount time;
+
+ State state = State::FREE;
+ uint8_t note = 0;
+ SampleCount time = 0;
};
using Voices = Raul::Array<Voice>;