base audio renderer classes created
This commit is contained in:
@@ -18,9 +18,8 @@ set(OLIVE_SOURCES
|
||||
${OLIVE_SOURCES}
|
||||
audio/audiohybriddevice.h
|
||||
audio/audiohybriddevice.cpp
|
||||
audio/audiolayouts.h
|
||||
audio/audiolayouts.cpp
|
||||
audio/audiomanager.h
|
||||
audio/audiomanager.cpp
|
||||
audio/sampleformat.h
|
||||
PARENT_SCOPE
|
||||
)
|
||||
|
||||
@@ -22,24 +22,24 @@
|
||||
|
||||
#include "config/config.h"
|
||||
|
||||
AudioManager* AudioManager::audio_ = nullptr;
|
||||
AudioManager* AudioManager::instance_ = nullptr;
|
||||
|
||||
void AudioManager::CreateInstance()
|
||||
{
|
||||
if (audio_ == nullptr) {
|
||||
audio_ = new AudioManager();
|
||||
if (instance_ == nullptr) {
|
||||
instance_ = new AudioManager();
|
||||
}
|
||||
}
|
||||
|
||||
void AudioManager::DestroyInstance()
|
||||
{
|
||||
delete audio_;
|
||||
audio_ = nullptr;
|
||||
delete instance_;
|
||||
instance_ = nullptr;
|
||||
}
|
||||
|
||||
AudioManager *AudioManager::instance()
|
||||
{
|
||||
return audio_;
|
||||
return instance_;
|
||||
}
|
||||
|
||||
void AudioManager::RefreshDevices()
|
||||
|
||||
@@ -95,7 +95,7 @@ private:
|
||||
|
||||
QList<QAudioDeviceInfo> output_devices_;
|
||||
|
||||
static AudioManager* audio_;
|
||||
static AudioManager* instance_;
|
||||
|
||||
AudioHybridDevice output_manager_;
|
||||
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
/***
|
||||
|
||||
Olive - Non-Linear Video Editor
|
||||
Copyright (C) 2019 Olive Team
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
***/
|
||||
|
||||
#ifndef SAMPLEFORMAT_H
|
||||
#define SAMPLEFORMAT_H
|
||||
|
||||
namespace olive {
|
||||
|
||||
/**
|
||||
* @brief Olive's internal supported sample formats
|
||||
*/
|
||||
enum SampleFormat {
|
||||
SAMPLE_FMT_INVALID = -1,
|
||||
SAMPLE_FMT_U8,
|
||||
SAMPLE_FMT_S16,
|
||||
SAMPLE_FMT_S32,
|
||||
SAMPLE_FMT_FLT,
|
||||
SAMPLE_FMT_DBL,
|
||||
SAMPLE_FMT_COUNT
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif // SAMPLEFORMAT_H
|
||||
Reference in New Issue
Block a user