diff options
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/BlockImpl.hpp | 10 | ||||
| -rw-r--r-- | src/server/LV2Block.cpp | 2 | ||||
| -rw-r--r-- | src/server/LV2Block.hpp | 6 | ||||
| -rw-r--r-- | src/server/events/Copy.cpp | 11 | ||||
| -rw-r--r-- | src/server/events/CreatePort.hpp | 5 | ||||
| -rw-r--r-- | src/server/events/Delta.hpp | 5 |
6 files changed, 19 insertions, 20 deletions
diff --git a/src/server/BlockImpl.hpp b/src/server/BlockImpl.hpp index 9d63f78e..b845c612 100644 --- a/src/server/BlockImpl.hpp +++ b/src/server/BlockImpl.hpp @@ -33,10 +33,10 @@ #include "raul/Maid.hpp" #include <boost/intrusive/slist_hook.hpp> -#include <boost/optional/optional.hpp> #include <cstdint> #include <memory> +#include <optional> #include <set> namespace raul { @@ -115,9 +115,11 @@ public: {} /** Save current state as preset. */ - virtual boost::optional<Resource> - save_preset(const URI& bundle, - const Properties& props) { return {}; } + virtual std::optional<Resource> + save_preset(const URI& bundle, const Properties& props) + { + return std::nullopt; + } /** Learn the next incoming MIDI event (for internals) */ virtual void learn() {} diff --git a/src/server/LV2Block.cpp b/src/server/LV2Block.cpp index 4cdcecd7..23e58d43 100644 --- a/src/server/LV2Block.cpp +++ b/src/server/LV2Block.cpp @@ -705,7 +705,7 @@ get_port_value(const char* port_symbol, return nullptr; } -boost::optional<Resource> +std::optional<Resource> LV2Block::save_preset(const URI& uri, const Properties& props) { diff --git a/src/server/LV2Block.hpp b/src/server/LV2Block.hpp index fa3979cd..253008c0 100644 --- a/src/server/LV2Block.hpp +++ b/src/server/LV2Block.hpp @@ -33,7 +33,6 @@ #include <boost/intrusive/slist.hpp> #include <boost/intrusive/slist_hook.hpp> -#include <boost/optional/optional.hpp> #include <cstdint> #include <cstdlib> @@ -41,6 +40,7 @@ #include <filesystem> #include <memory> #include <mutex> +#include <optional> namespace raul { class Symbol; @@ -113,8 +113,8 @@ public: void apply_state(const std::unique_ptr<Worker>& worker, const LilvState* state) override; - boost::optional<Resource> save_preset(const URI& uri, - const Properties& props) override; + std::optional<Resource> save_preset(const URI& uri, + const Properties& props) override; void set_port_buffer(uint32_t voice, uint32_t port_num, diff --git a/src/server/events/Copy.cpp b/src/server/events/Copy.cpp index 06a71fdc..c62417e0 100644 --- a/src/server/events/Copy.cpp +++ b/src/server/events/Copy.cpp @@ -34,11 +34,10 @@ #include "raul/Path.hpp" #include "raul/Symbol.hpp" -#include <boost/optional/optional.hpp> - #include <map> #include <memory> #include <mutex> +#include <optional> #include <string> #include <string_view> #include <utility> @@ -190,10 +189,10 @@ Copy::filesystem_to_engine(PreProcessContext&) std::lock_guard<std::mutex> lock(_engine.world().rdf_mutex()); // Old URI is a filesystem path and new URI is a path within the engine - const std::string src_path(_msg.old_uri.path()); - const raul::Path dst_path = uri_to_path(_msg.new_uri); - boost::optional<raul::Path> dst_parent; - boost::optional<raul::Symbol> dst_symbol; + const std::string src_path(_msg.old_uri.path()); + const raul::Path dst_path = uri_to_path(_msg.new_uri); + std::optional<raul::Path> dst_parent; + std::optional<raul::Symbol> dst_symbol; if (!dst_path.is_root()) { dst_parent = dst_path.parent(); dst_symbol = raul::Symbol(dst_path.symbol()); diff --git a/src/server/events/CreatePort.hpp b/src/server/events/CreatePort.hpp index 3351adc9..6d3e9ca2 100644 --- a/src/server/events/CreatePort.hpp +++ b/src/server/events/CreatePort.hpp @@ -27,10 +27,9 @@ #include "raul/Maid.hpp" #include "raul/Path.hpp" -#include <boost/optional/optional.hpp> - #include <cstdint> #include <memory> +#include <optional> namespace ingen { @@ -81,7 +80,7 @@ private: EnginePort* _engine_port{nullptr}; ///< Driver port if on the root Properties _properties; Properties _update; - boost::optional<Flow> _flow; + std::optional<Flow> _flow; }; } // namespace events diff --git a/src/server/events/Delta.hpp b/src/server/events/Delta.hpp index 7f79ae94..35357a26 100644 --- a/src/server/events/Delta.hpp +++ b/src/server/events/Delta.hpp @@ -29,10 +29,9 @@ #include "ingen/URI.hpp" #include "raul/Maid.hpp" -#include <boost/optional/optional.hpp> - #include <cstdint> #include <memory> +#include <optional> #include <vector> // IWYU pragma: no_include <algorithm> @@ -129,7 +128,7 @@ private: std::vector<ControlBindings::Binding*> _removed_bindings; - boost::optional<Resource> _preset; + std::optional<Resource> _preset; bool _block{false}; }; |