From afb5b6bcf095ddcf6afb4f0185b6a06ceefd5a40 Mon Sep 17 00:00:00 2001 From: CrSjimo Date: Thu, 25 Jul 2024 22:09:17 +0800 Subject: [PATCH] update audio plugin --- .../audio/audioclip/audioclipinterface.cpp | 18 ++--- .../audio/audioclip/audioclipinterface_p.h | 6 +- .../audiocontext/audiocontextinterface.cpp | 26 ++++++- .../audiocontext/audiocontextinterface_p.h | 4 ++ .../audioplugin/audio/format/formatentry.cpp | 14 ---- .../audioplugin/audio/format/formatentry.h | 30 -------- .../audio/format/formatmanager.cpp | 72 ------------------- .../audioplugin/audio/format/formatmanager.h | 45 ------------ .../audio/format/formatmanager_p.h | 21 ------ src/plugins/audioplugin/audio/iaudio.cpp | 2 +- src/plugins/audioplugin/audio/iaudio.h | 8 ++- src/plugins/audioplugin/audio/iaudio_p.h | 2 +- .../audio/track/trackinterface.cpp | 24 +++---- .../audio/track/trackinterface_p.h | 8 +-- .../internal/addon/projectaddon.cpp | 6 ++ .../audioplugin/internal/audioplugin.cpp | 5 +- .../internal/format/builtinformatentry.cpp | 2 +- .../internal/format/builtinformatentry.h | 4 +- 18 files changed, 75 insertions(+), 222 deletions(-) delete mode 100644 src/plugins/audioplugin/audio/format/formatentry.cpp delete mode 100644 src/plugins/audioplugin/audio/format/formatentry.h delete mode 100644 src/plugins/audioplugin/audio/format/formatmanager.cpp delete mode 100644 src/plugins/audioplugin/audio/format/formatmanager.h delete mode 100644 src/plugins/audioplugin/audio/format/formatmanager_p.h diff --git a/src/plugins/audioplugin/audio/audioclip/audioclipinterface.cpp b/src/plugins/audioplugin/audio/audioclip/audioclipinterface.cpp index 32cd04e..7b2e581 100644 --- a/src/plugins/audioplugin/audio/audioclip/audioclipinterface.cpp +++ b/src/plugins/audioplugin/audio/audioclip/audioclipinterface.cpp @@ -20,13 +20,13 @@ namespace Audio { - void AudioClipInterfacePrivate::handleEntityGainChanged(double gainDecibel) const { + void AudioClipInterfacePrivate::handleGainChanged(double gainDecibel) const { audioClipContext->controlMixer()->setGain(talcs::Decibels::decibelsToGain(gainDecibel)); } - void AudioClipInterfacePrivate::handleEntityPanChanged(double pan) const { + void AudioClipInterfacePrivate::handlePanChanged(double pan) const { audioClipContext->controlMixer()->setPan(static_cast(pan)); } - void AudioClipInterfacePrivate::handleEntityMuteChanged(bool isMute) const { + void AudioClipInterfacePrivate::handleMuteChanged(bool isMute) const { audioClipContext->controlMixer()->setSilentFlags(isMute ? -1 : 0); } void AudioClipInterfacePrivate::handleStartChanged(int start) const { @@ -60,13 +60,13 @@ namespace Audio { d->trackInterface = trackInterface; connect(entity->control(), &QDspx::BusControlEntity::gainChanged, this, [=](double gainDecibel) { - d->handleEntityGainChanged(gainDecibel); + d->handleGainChanged(gainDecibel); }); connect(entity->control(), &QDspx::BusControlEntity::panChanged, this, [=](double pan) { - d->handleEntityPanChanged(pan); + d->handlePanChanged(pan); }); connect(entity->control(), &QDspx::BusControlEntity::muteChanged, this, [=](bool isMuted) { - d->handleEntityMuteChanged(isMuted); + d->handleMuteChanged(isMuted); }); connect(entity->time(), &QDspx::ClipTimeEntity::startChanged, this, [=](int start) { @@ -86,9 +86,9 @@ namespace Audio { d->handlePathChanged(path); }); - d->handleEntityGainChanged(entity->control()->gain()); - d->handleEntityPanChanged(entity->control()->pan()); - d->handleEntityMuteChanged(entity->control()->mute()); + d->handleGainChanged(entity->control()->gain()); + d->handlePanChanged(entity->control()->pan()); + d->handleMuteChanged(entity->control()->mute()); d->handleStartChanged(entity->time()->start()); d->handleClipStartChanged(entity->time()->clipStart()); d->handleClipLenChanged(entity->time()->clipLength()); diff --git a/src/plugins/audioplugin/audio/audioclip/audioclipinterface_p.h b/src/plugins/audioplugin/audio/audioclip/audioclipinterface_p.h index 74cbff0..ed9ea36 100644 --- a/src/plugins/audioplugin/audio/audioclip/audioclipinterface_p.h +++ b/src/plugins/audioplugin/audio/audioclip/audioclipinterface_p.h @@ -16,9 +16,9 @@ namespace Audio { TrackInterface *trackInterface; - void handleEntityGainChanged(double gainDecibel) const; - void handleEntityPanChanged(double pan) const; - void handleEntityMuteChanged(bool isMute) const; + void handleGainChanged(double gainDecibel) const; + void handlePanChanged(double pan) const; + void handleMuteChanged(bool isMute) const; void handleStartChanged(int start) const; void handleClipStartChanged(int clipStart) const; diff --git a/src/plugins/audioplugin/audio/audiocontext/audiocontextinterface.cpp b/src/plugins/audioplugin/audio/audiocontext/audiocontextinterface.cpp index 4ce6c47..a296fa2 100644 --- a/src/plugins/audioplugin/audio/audiocontext/audiocontextinterface.cpp +++ b/src/plugins/audioplugin/audio/audiocontext/audiocontextinterface.cpp @@ -1,6 +1,8 @@ #include "audiocontextinterface.h" #include "audiocontextinterface_p.h" +#include +#include #include #include #include @@ -22,7 +24,17 @@ namespace Audio { Q_Q(AudioContextInterface); projectAddOn = projectAddOn_; projectContext = projectAddOn->projectContext(); + auto model = q->windowHandle()->doc()->dataModel().model(); + QObject::connect(model->master()->control(), &QDspx::BusControlEntity::gainChanged, q, [=] (double gainDecibel) { + handleGainChanged(gainDecibel); + }); + QObject::connect(model->master()->control(), &QDspx::BusControlEntity::panChanged, q, [=] (double pan) { + handlePanChanged(pan); + }); + QObject::connect(model->master()->control(), &QDspx::BusControlEntity::muteChanged, q, [=] (bool isMuted) { + handleMuteChanged(isMuted); + }); QObject::connect(model->tracks(), &QDspx::TrackListEntity::inserted, q, [=](int index, const QVector &trackEntities) { DEVICE_LOCKER; for (auto trackEntity : trackEntities) { @@ -40,14 +52,24 @@ namespace Audio { } }); - // TODO connect doc signals - + handleGainChanged(model->master()->control()->gain()); + handlePanChanged(model->master()->control()->pan()); + handleMuteChanged(model->master()->control()->mute()); for (int i = 0; i < model->tracks()->size(); i++) { auto trackEntity = model->tracks()->at(i); handleTrackInserted(i, trackEntity); } + } + void AudioContextInterfacePrivate::handleGainChanged(double gainDecibel) const { + projectContext->masterControlMixer()->setGain(talcs::Decibels::decibelsToGain(gainDecibel)); + } + void AudioContextInterfacePrivate::handlePanChanged(double pan) const { + projectContext->masterControlMixer()->setPan(static_cast(pan)); + } + void AudioContextInterfacePrivate::handleMuteChanged(bool isMuted) const { + projectContext->masterControlMixer()->setSilentFlags(isMuted ? -1 : 0); } void AudioContextInterfacePrivate::handleTrackInserted(int index, QDspx::TrackEntity *trackEntity) { Q_Q(AudioContextInterface); diff --git a/src/plugins/audioplugin/audio/audiocontext/audiocontextinterface_p.h b/src/plugins/audioplugin/audio/audiocontext/audiocontextinterface_p.h index ad30f9f..4328b59 100644 --- a/src/plugins/audioplugin/audio/audiocontext/audiocontextinterface_p.h +++ b/src/plugins/audioplugin/audio/audiocontext/audiocontextinterface_p.h @@ -36,6 +36,10 @@ namespace Audio { void init(Internal::ProjectAddOn *projectAddOn); + void handleGainChanged(double gainDecibel) const; + void handlePanChanged(double pan) const; + void handleMuteChanged(bool isMuted) const; + void handleTrackInserted(int index, QDspx::TrackEntity *trackEntity); void handleTrackAboutToRemove(int index, QDspx::TrackEntity *trackEntity); void handleTrackMoved(int index, int count, int dest) const; diff --git a/src/plugins/audioplugin/audio/format/formatentry.cpp b/src/plugins/audioplugin/audio/format/formatentry.cpp deleted file mode 100644 index 37c58ff..0000000 --- a/src/plugins/audioplugin/audio/format/formatentry.cpp +++ /dev/null @@ -1,14 +0,0 @@ -#include "formatentry.h" - -namespace Audio { - - FormatEntry::FormatEntry(QObject *parent) : QObject(parent) { - } - - FormatEntry::~FormatEntry() = default; - - QStringList FormatEntry::extensionHints() const { - return {}; - } - -} \ No newline at end of file diff --git a/src/plugins/audioplugin/audio/format/formatentry.h b/src/plugins/audioplugin/audio/format/formatentry.h deleted file mode 100644 index 4f786f6..0000000 --- a/src/plugins/audioplugin/audio/format/formatentry.h +++ /dev/null @@ -1,30 +0,0 @@ -#ifndef AUDIO_FORMATENTRY_H -#define AUDIO_FORMATENTRY_H - -#include - -#include - -namespace talcs { - class AbstractAudioFormatIO; -} - -namespace Audio { - - class AUDIO_EXPORT FormatEntry : public QObject { - Q_OBJECT - public: - ~FormatEntry() override; - - virtual QStringList filters() const = 0; - virtual QStringList extensionHints() const; - virtual talcs::AbstractAudioFormatIO *getFormatOpen(const QString &filename, QVariant &userData, QWidget *win) = 0; - virtual talcs::AbstractAudioFormatIO *getFormatLoad(const QString &filename, const QVariant &userData) = 0; - - protected: - explicit FormatEntry(QObject *parent = nullptr); - }; - -} - -#endif // AUDIO_FORMATENTRY_H diff --git a/src/plugins/audioplugin/audio/format/formatmanager.cpp b/src/plugins/audioplugin/audio/format/formatmanager.cpp deleted file mode 100644 index 8f28a46..0000000 --- a/src/plugins/audioplugin/audio/format/formatmanager.cpp +++ /dev/null @@ -1,72 +0,0 @@ -#include "formatmanager.h" -#include "formatmanager_p.h" - -#include - -#include - -namespace Audio { - FormatManager::FormatManager(QObject *parent) : QObject(parent), d_ptr(new FormatManagerPrivate) { - Q_D(FormatManager); - d->q_ptr = this; - } - - FormatManager::~FormatManager() = default; - - void FormatManager::addEntry(FormatEntry *entry) { - Q_D(FormatManager); - d->entries.append(entry); - for (const auto &extensionHint : entry->extensionHints()) { - if (!d->extensionHintDict.contains(extensionHint)) - d->extensionHintDict.insert(extensionHint, entry); - } - } - - QList FormatManager::entries() const { - Q_D(const FormatManager); - return d->entries; - } - - QStringList FormatManager::extensionHints() const { - Q_D(const FormatManager); - std::set extensionHintSet; - for (auto entry : d->entries) { - auto entryExtensionHints = entry->extensionHints(); - extensionHintSet.insert(entryExtensionHints.cbegin(), entryExtensionHints.cend()); - } - return {extensionHintSet.cbegin(), extensionHintSet.cend()}; - } - - QStringList FormatManager::filters() const { - Q_D(const FormatManager); - QStringList list; - for (auto entry : d->entries) - list += entry->filters(); - return list; - } - - FormatEntry *FormatManager::hintFromExtension(const QString &extension) const { - Q_D(const FormatManager); - return d->extensionHintDict.value(extension); - } - - talcs::AbstractAudioFormatIO *FormatManager::getFormatLoad(const QString &filename, const QVariant &userData) const { - Q_D(const FormatManager); - auto extension = (filename + ".").split(".").last(); - auto hintedEntry = extension.isEmpty() ? nullptr : hintFromExtension(extension); - if (hintedEntry) { - auto io = hintedEntry->getFormatLoad(filename, userData); - if (io) - return io; - } - for (auto entry : entries()) { - if (entry == hintedEntry) - continue; - auto io = entry->getFormatLoad(filename, userData); - if (io) - return io; - } - return nullptr; - } - -} \ No newline at end of file diff --git a/src/plugins/audioplugin/audio/format/formatmanager.h b/src/plugins/audioplugin/audio/format/formatmanager.h deleted file mode 100644 index ad2c9b4..0000000 --- a/src/plugins/audioplugin/audio/format/formatmanager.h +++ /dev/null @@ -1,45 +0,0 @@ -#ifndef AUDIO_FORMATMANAGER_H -#define AUDIO_FORMATMANAGER_H - -#include - -#include - -namespace talcs { - class AbstractAudioFormatIO; -} - -namespace Audio { - - namespace Internal { - class AudioPlugin; - } - - class FormatEntry; - - class FormatManagerPrivate; - - class AUDIO_EXPORT FormatManager : public QObject { - Q_OBJECT - Q_DECLARE_PRIVATE(FormatManager) - friend class Internal::AudioPlugin; - public: - ~FormatManager() override; - - void addEntry(FormatEntry *entry); - QList entries() const; - QStringList extensionHints() const; - QStringList filters() const; - - FormatEntry *hintFromExtension(const QString &extension) const; - - talcs::AbstractAudioFormatIO *getFormatLoad(const QString &filename, const QVariant &userData) const; - - private: - explicit FormatManager(QObject *parent = nullptr); - QScopedPointer d_ptr; - }; - -} - -#endif // AUDIO_FORMATMANAGER_H diff --git a/src/plugins/audioplugin/audio/format/formatmanager_p.h b/src/plugins/audioplugin/audio/format/formatmanager_p.h deleted file mode 100644 index 2b074f5..0000000 --- a/src/plugins/audioplugin/audio/format/formatmanager_p.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef AUDIO_FORMATMANAGER_P_H -#define AUDIO_FORMATMANAGER_P_H - -#include -#include - -#include - -namespace Audio { - - class FormatManagerPrivate { - Q_DECLARE_PUBLIC(FormatManager) - public: - FormatManager *q_ptr; - QList entries; - QHash extensionHintDict; - }; - -} - -#endif // AUDIO_FORMATMANAGER_P_H diff --git a/src/plugins/audioplugin/audio/iaudio.cpp b/src/plugins/audioplugin/audio/iaudio.cpp index cd7ba6f..16f8f7d 100644 --- a/src/plugins/audioplugin/audio/iaudio.cpp +++ b/src/plugins/audioplugin/audio/iaudio.cpp @@ -16,7 +16,7 @@ namespace Audio { Q_D(const IAudio); return isVST ? d->vstOutputSystemInterface : d->outputSystemInterface; } - FormatManager *IAudio::formatManager() const { + talcs::FormatManager *IAudio::formatManager() const { Q_D(const IAudio); return d->formatManager; } diff --git a/src/plugins/audioplugin/audio/iaudio.h b/src/plugins/audioplugin/audio/iaudio.h index 1513b9b..1ec6851 100644 --- a/src/plugins/audioplugin/audio/iaudio.h +++ b/src/plugins/audioplugin/audio/iaudio.h @@ -5,6 +5,10 @@ #include +namespace talcs { + class FormatManager; +} + namespace Audio { namespace Internal { @@ -12,8 +16,6 @@ namespace Audio { } class OutputSystemInterface; - class FormatManager; - class IAudioPrivate; class AUDIO_EXPORT IAudio : public QObject { @@ -26,7 +28,7 @@ namespace Audio { OutputSystemInterface *outputSystemInterface(bool isVST) const; - FormatManager *formatManager() const; + talcs::FormatManager *formatManager() const; private: explicit IAudio(QObject *parent = nullptr); diff --git a/src/plugins/audioplugin/audio/iaudio_p.h b/src/plugins/audioplugin/audio/iaudio_p.h index 58f0fda..82bbc66 100644 --- a/src/plugins/audioplugin/audio/iaudio_p.h +++ b/src/plugins/audioplugin/audio/iaudio_p.h @@ -10,7 +10,7 @@ namespace Audio { IAudio *q_ptr; OutputSystemInterface *outputSystemInterface; OutputSystemInterface *vstOutputSystemInterface; - FormatManager *formatManager; + talcs::FormatManager *formatManager; }; } diff --git a/src/plugins/audioplugin/audio/track/trackinterface.cpp b/src/plugins/audioplugin/audio/track/trackinterface.cpp index d52b79f..6838724 100644 --- a/src/plugins/audioplugin/audio/track/trackinterface.cpp +++ b/src/plugins/audioplugin/audio/track/trackinterface.cpp @@ -18,16 +18,16 @@ namespace Audio { - void TrackInterfacePrivate::handleEntityGainChanged(double gainDecibel) const { + void TrackInterfacePrivate::handleGainChanged(double gainDecibel) const { trackContext->controlMixer()->setGain(talcs::Decibels::decibelsToGain(gainDecibel)); } - void TrackInterfacePrivate::handleEntityPanChanged(double pan) const { + void TrackInterfacePrivate::handlePanChanged(double pan) const { trackContext->controlMixer()->setPan(static_cast(pan)); } - void TrackInterfacePrivate::handleEntityMuteChanged(bool isMuted) const { + void TrackInterfacePrivate::handleMuteChanged(bool isMuted) const { trackContext->controlMixer()->setSilentFlags(isMuted ? -1 : 0); } - void TrackInterfacePrivate::handleEntitySoloChanged(bool isSolo) const { + void TrackInterfacePrivate::handleSoloChanged(bool isSolo) const { audioContextInterface->masterTrackMixer()->setSourceSolo(trackContext->controlMixer(), isSolo); } void TrackInterfacePrivate::handleAudioClipInserted(int id, QDspx::AudioClipEntity *audioClipEntity) { @@ -56,16 +56,16 @@ namespace Audio { d->audioContextInterface = audioContextInterface; connect(entity->control(), &QDspx::TrackControlEntity::gainChanged, this, [=](double gainDecibel) { - d->handleEntityGainChanged(gainDecibel); + d->handleGainChanged(gainDecibel); }); connect(entity->control(), &QDspx::TrackControlEntity::panChanged, this, [=](double pan) { - d->handleEntityPanChanged(pan); + d->handlePanChanged(pan); }); connect(entity->control(), &QDspx::TrackControlEntity::muteChanged, this, [=](bool isMuted) { - d->handleEntityMuteChanged(isMuted); + d->handleMuteChanged(isMuted); }); connect(entity->control(), &QDspx::TrackControlEntity::soloChanged, this, [=](bool isSolo) { - d->handleEntitySoloChanged(isSolo); + d->handleSoloChanged(isSolo); }); connect(entity->clips(), &QDspx::ClipListEntity::inserted, this, [=](int id, QDspx::ClipEntity *clipEntity) { DEVICE_LOCKER; @@ -78,10 +78,10 @@ namespace Audio { d->handleAudioClipAboutToRemove(id, static_cast(clipEntity)); }); - d->handleEntityGainChanged(entity->control()->gain()); - d->handleEntityPanChanged(entity->control()->pan()); - d->handleEntityMuteChanged(entity->control()->mute()); - d->handleEntitySoloChanged(entity->control()->solo()); + d->handleGainChanged(entity->control()->gain()); + d->handlePanChanged(entity->control()->pan()); + d->handleMuteChanged(entity->control()->mute()); + d->handleSoloChanged(entity->control()->solo()); for (int id : entity->clips()->ids()) { auto clipEntity = entity->clips()->value(id); if (clipEntity->type() == QDspx::ClipEntity::Audio) diff --git a/src/plugins/audioplugin/audio/track/trackinterface_p.h b/src/plugins/audioplugin/audio/track/trackinterface_p.h index a49d0aa..6381c6e 100644 --- a/src/plugins/audioplugin/audio/track/trackinterface_p.h +++ b/src/plugins/audioplugin/audio/track/trackinterface_p.h @@ -24,10 +24,10 @@ namespace Audio { AudioContextInterface *audioContextInterface; QHash clips; - void handleEntityGainChanged(double gainDecibel) const; - void handleEntityPanChanged(double pan) const; - void handleEntityMuteChanged(bool isMuted) const; - void handleEntitySoloChanged(bool isSolo) const; + void handleGainChanged(double gainDecibel) const; + void handlePanChanged(double pan) const; + void handleMuteChanged(bool isMuted) const; + void handleSoloChanged(bool isSolo) const; void handleAudioClipInserted(int id, QDspx::AudioClipEntity *audioClipEntity); void handleAudioClipAboutToRemove(int id, QDspx::AudioClipEntity *audioClipEntity); diff --git a/src/plugins/audioplugin/internal/addon/projectaddon.cpp b/src/plugins/audioplugin/internal/addon/projectaddon.cpp index 846b5bf..4aeff7e 100644 --- a/src/plugins/audioplugin/internal/addon/projectaddon.cpp +++ b/src/plugins/audioplugin/internal/addon/projectaddon.cpp @@ -17,9 +17,14 @@ namespace Audio::Internal { ProjectAddOn::ProjectAddOn(QObject *parent) : Core::IWindowAddOn(parent) { m_audioContextInterface = new AudioContextInterface(this); m_projectContext = new talcs::DspxProjectContext(m_audioContextInterface); + m_projectContext->setFormatManager(IAudio::instance()->formatManager()); + m_projectContext->setTimeConverter({}); // TODO + m_projectContext->setBufferingReadAheadSize(AudioSystem::outputSystem()->fileBufferingReadAheadSize()); + connect(AudioSystem::outputSystem(), &AbstractOutputSystem::fileBufferingReadAheadSizeChanged, m_projectContext, &talcs::DspxProjectContext::setBufferingReadAheadSize); } ProjectAddOn::~ProjectAddOn() { + m_audioContextInterface->outputSystemInterface()->preMixer()->removeSource(m_projectContext->preMixer()); } void ProjectAddOn::initialize() { @@ -27,6 +32,7 @@ namespace Audio::Internal { iAudio->outputSystemInterface(isVST())->preMixer()->addSource(m_projectContext->preMixer()); windowHandle()->addObject("Audio.AudioContextInterface", m_audioContextInterface); m_audioContextInterface->d_func()->init(this); + m_audioContextInterface->outputSystemInterface()->preMixer()->addSource(m_projectContext->preMixer()); } void ProjectAddOn::extensionsInitialized() { diff --git a/src/plugins/audioplugin/internal/audioplugin.cpp b/src/plugins/audioplugin/internal/audioplugin.cpp index 5159288..b199bd0 100644 --- a/src/plugins/audioplugin/internal/audioplugin.cpp +++ b/src/plugins/audioplugin/internal/audioplugin.cpp @@ -3,6 +3,8 @@ #include #include +#include + #include #include @@ -26,7 +28,6 @@ #include #include #include -#include #include #include #include @@ -65,7 +66,7 @@ namespace Audio::Internal { iAudio->d_func()->outputSystemInterface->d_func()->init(AudioSystem::outputSystem(), false); iAudio->d_func()->vstOutputSystemInterface = new OutputSystemInterface(AudioSystem::vstConnectionSystem()); iAudio->d_func()->vstOutputSystemInterface->d_func()->init(AudioSystem::vstConnectionSystem(), true); - iAudio->d_func()->formatManager = new FormatManager(this); + iAudio->d_func()->formatManager = new talcs::FormatManager(this); iAudio->formatManager()->addEntry(new BuiltInFormatEntry); diff --git a/src/plugins/audioplugin/internal/format/builtinformatentry.cpp b/src/plugins/audioplugin/internal/format/builtinformatentry.cpp index 8766b66..420b2e4 100644 --- a/src/plugins/audioplugin/internal/format/builtinformatentry.cpp +++ b/src/plugins/audioplugin/internal/format/builtinformatentry.cpp @@ -28,7 +28,7 @@ namespace Audio { ~AudioFormatIOObject() override = default; }; - BuiltInFormatEntry::BuiltInFormatEntry(QObject *parent) : FormatEntry(parent) { + BuiltInFormatEntry::BuiltInFormatEntry(QObject *parent) : talcs::FormatEntry(parent) { std::set extensionHintSet; for (const auto &fmtInfo : talcs::AudioFormatIO::availableFormats()) { QStringList fmtExtensions; diff --git a/src/plugins/audioplugin/internal/format/builtinformatentry.h b/src/plugins/audioplugin/internal/format/builtinformatentry.h index 7e0dba6..db4b15c 100644 --- a/src/plugins/audioplugin/internal/format/builtinformatentry.h +++ b/src/plugins/audioplugin/internal/format/builtinformatentry.h @@ -1,11 +1,11 @@ #ifndef AUDIO_BUILTINFORMATENTRY_H #define AUDIO_BUILTINFORMATENTRY_H -#include +#include namespace Audio { - class BuiltInFormatEntry : public FormatEntry { + class BuiltInFormatEntry : public talcs::FormatEntry { Q_OBJECT public: explicit BuiltInFormatEntry(QObject *parent = nullptr);