memory-related refactor

This commit is contained in:
MihailRis
2024-05-19 07:09:58 +03:00
parent f47c7d00a2
commit c5f663b7cb
16 changed files with 205 additions and 209 deletions
+2 -2
View File
@@ -389,7 +389,7 @@ std::unique_ptr<Stream> ALAudio::openStream(std::shared_ptr<PCMStream> stream, b
return std::make_unique<ALStream>(this, stream, keepSource);
}
ALAudio* ALAudio::create() {
std::unique_ptr<ALAudio> ALAudio::create() {
ALCdevice* device = alcOpenDevice(nullptr);
if (device == nullptr)
return nullptr;
@@ -400,7 +400,7 @@ ALAudio* ALAudio::create() {
}
AL_CHECK();
logger.info() << "initialized";
return new ALAudio(device, context);
return std::make_unique<ALAudio>(device, context);
}
uint ALAudio::getFreeSource(){
+2 -3
View File
@@ -136,9 +136,8 @@ namespace audio {
std::vector<uint> freebuffers;
uint maxSources = 256;
ALAudio(ALCdevice* device, ALCcontext* context);
public:
ALAudio(ALCdevice* device, ALCcontext* context);
~ALAudio();
uint getFreeSource();
@@ -164,7 +163,7 @@ namespace audio {
return false;
}
static ALAudio* create();
static std::unique_ptr<ALAudio> create();
};
}
+2 -2
View File
@@ -17,6 +17,6 @@ std::unique_ptr<Stream> NoAudio::openStream(std::shared_ptr<PCMStream> stream, b
return std::make_unique<NoStream>(stream, keepSource);
}
NoAudio* NoAudio::create() {
return new NoAudio();
std::unique_ptr<NoAudio> NoAudio::create() {
return std::make_unique<NoAudio>();
}
+1 -1
View File
@@ -81,7 +81,7 @@ namespace audio {
return true;
}
static NoAudio* create();
static std::unique_ptr<NoAudio> create();
};
}
+3 -3
View File
@@ -147,11 +147,11 @@ public:
void audio::initialize(bool enabled) {
if (enabled) {
backend = ALAudio::create();
backend = ALAudio::create().release();
}
if (backend == nullptr) {
std::cerr << "could not to initialize audio" << std::endl;
backend = NoAudio::create();
backend = NoAudio::create().release();
}
create_channel("master");
}
@@ -333,7 +333,7 @@ int audio::create_channel(const std::string& name) {
if (index != -1) {
return index;
}
channels.emplace_back(new Channel(name));
channels.emplace_back(std::make_unique<Channel>(name));
return channels.size()-1;
}