AxioDL/amuse
2
0
Fork 0
mirror of https://github.com/AxioDL/amuse.git synced 2025-12-08 13:14:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Better CMake dependency handling

Browse Source
This commit is contained in:
Jack Andersen
2019-06-11 16:02:52 -10:00
parent 1b10016369
commit 2a3444400e
22 changed files with 141 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
VST/AudioGroupFilePresenter.cpp
View File

@@ -206,7 +206,7 @@ bool AudioGroupDataCollection::loadMeta() {
athena::io::FileReader r(path, 1024 * 32, false);
if (r.hasError())
return false;
std::experimental::optional<MetaData>& ret = m_metaData;
std::optional<MetaData>& ret = m_metaData;
ret.emplace(r);
return ret.operator bool();
}

6
VST/AudioGroupFilePresenter.hpp
View File

@@ -2,7 +2,7 @@
#include <map>
#include <memory>
#include "optional.hpp"
#include <optional>
#include <amuse/amuse.hpp>
#include <athena/FileReader.hpp>
@@ -33,9 +33,9 @@ struct AudioGroupDataCollection {
MetaData(athena::io::FileReader& r)
: fmt(amuse::DataFormat(r.readUint32Little())), absOffs(r.readUint32Little()), active(r.readUint32Little()) {}
};
std::experimental::optional<MetaData> m_metaData;
std::optional<MetaData> m_metaData;
std::experimental::optional<amuse::AudioGroupData> m_loadedData;
std::optional<amuse::AudioGroupData> m_loadedData;
const amuse::AudioGroup* m_loadedGroup;
struct GroupToken {
int m_groupId;

6
VST/VSTBackend.hpp
View File

@@ -3,7 +3,7 @@
#include "audioeffectx.h"
#include "VSTEditor.hpp"
#include <memory>
#include "optional.hpp"
#include <optional>
#include "amuse/BooBackend.hpp"
#include "amuse/Engine.hpp"
@@ -25,8 +25,8 @@ public:
class VSTBackend : public AudioEffectX {
std::mutex m_lock;
std::unique_ptr<boo::IAudioVoiceEngine> m_booBackend;
std::experimental::optional<amuse::VSTBackendVoiceAllocator> m_voxAlloc;
std::experimental::optional<amuse::Engine> m_engine;
std::optional<amuse::VSTBackendVoiceAllocator> m_voxAlloc;
std::optional<amuse::Engine> m_engine;
std::shared_ptr<amuse::Sequencer> m_curSeq;
int m_reqGroup = -1;
int m_curGroup = -1;