From 8c1627c4e39c67238d3a4b0aa99baf52ea9026c9 Mon Sep 17 00:00:00 2001 From: casey langen Date: Sun, 8 Oct 2017 13:56:24 -0700 Subject: [PATCH] Migrated all Destroy() methods to be Release() instead. Freeing SDK resources is now consistent. --- src/core/audio/Buffer.h | 2 +- src/core/audio/Outputs.cpp | 2 +- src/core/audio/PlaybackService.cpp | 2 +- src/core/audio/Streams.cpp | 8 +++--- src/core/audio/Visualizer.cpp | 4 +-- src/core/core.vcxproj.filters | 28 +++++++++---------- src/core/io/DataStreamFactory.cpp | 8 +++--- src/core/io/LocalFileStream.cpp | 2 +- src/core/io/LocalFileStream.h | 2 +- src/core/library/Indexer.cpp | 8 +++--- src/core/plugin/PluginFactory.cpp | 2 +- src/core/plugin/PluginFactory.h | 4 +-- src/core/sdk/IAnalyzer.h | 2 +- src/core/sdk/IBuffer.h | 2 +- src/core/sdk/IDSP.h | 2 +- src/core/sdk/IDataStream.h | 5 +--- src/core/sdk/IDataStreamFactory.h | 2 +- src/core/sdk/IDecoder.h | 2 +- src/core/sdk/IDecoderFactory.h | 2 +- src/core/sdk/IDevice.h | 8 +++--- src/core/sdk/IIndexerSource.h | 2 +- src/core/sdk/IIndexerWriter.h | 7 +---- src/core/sdk/IOutput.h | 2 +- src/core/sdk/IPcmVisualizer.h | 2 +- src/core/sdk/IPlaybackRemote.h | 2 +- src/core/sdk/IPlugin.h | 2 +- src/core/sdk/ISpectrumVisualizer.h | 2 +- src/core/sdk/ITagReader.h | 2 +- src/core/sdk/IVisualizer.h | 2 +- src/musikcube/app/layout/SettingsLayout.cpp | 2 +- .../app/overlay/PlaybackOverlays.cpp | 8 +++--- src/musikcube/app/overlay/ServerOverlay.cpp | 2 +- src/plugins/alsaout/AlsaOut.cpp | 8 +++--- src/plugins/alsaout/AlsaOut.h | 2 +- src/plugins/cddadecoder/CddaDataStream.cpp | 2 +- src/plugins/cddadecoder/CddaDataStream.h | 2 +- .../cddadecoder/CddaDataStreamFactory.cpp | 2 +- .../cddadecoder/CddaDataStreamFactory.h | 2 +- src/plugins/cddadecoder/CddaDecoder.cpp | 2 +- src/plugins/cddadecoder/CddaDecoder.h | 2 +- .../cddadecoder/CddaDecoderFactory.cpp | 2 +- src/plugins/cddadecoder/CddaDecoderFactory.h | 2 +- src/plugins/cddadecoder/CddaIndexerSource.cpp | 2 +- src/plugins/cddadecoder/CddaIndexerSource.h | 2 +- .../cddadecoder/cddadecoder_plugin.cpp | 2 +- src/plugins/coreaudioout/CoreAudioOut.cpp | 8 +++--- src/plugins/coreaudioout/CoreAudioOut.h | 2 +- src/plugins/directsoundout/DirectSoundOut.cpp | 10 +++---- src/plugins/directsoundout/DirectSoundOut.h | 2 +- .../directsoundout/directsoundout_plugin.cpp | 2 +- src/plugins/flacdecoder/FlacDecoder.cpp | 2 +- src/plugins/flacdecoder/FlacDecoder.h | 2 +- .../flacdecoder/FlacDecoderFactory.cpp | 2 +- src/plugins/flacdecoder/FlacDecoderFactory.h | 2 +- .../flacdecoder/flacdecoder_plugin.cpp | 2 +- src/plugins/httpdatastream/HttpDataStream.cpp | 2 +- src/plugins/httpdatastream/HttpDataStream.h | 2 +- .../httpdatastream/HttpDataStreamFactory.cpp | 2 +- .../httpdatastream/HttpDataStreamFactory.h | 2 +- .../httpdatastream/httpdatastream_plugin.cpp | 2 +- src/plugins/m4adecoder/M4aDecoder.cpp | 2 +- src/plugins/m4adecoder/M4aDecoder.h | 2 +- src/plugins/m4adecoder/M4aDecoderFactory.cpp | 2 +- src/plugins/m4adecoder/M4aDecoderFactory.h | 2 +- src/plugins/m4adecoder/m4adecoder_plugin.cpp | 2 +- src/plugins/nomaddecoder/NomadDecoder.cpp | 2 +- src/plugins/nomaddecoder/NomadDecoder.h | 2 +- .../nomaddecoder/NomadDecoderFactory.cpp | 2 +- .../nomaddecoder/NomadDecoderFactory.h | 2 +- .../nomaddecoder/nomaddecoder_plugin.cpp | 2 +- src/plugins/nullout/NullOut.cpp | 2 +- src/plugins/nullout/NullOut.h | 2 +- src/plugins/nullout/nullout_plugin.cpp | 2 +- src/plugins/oggdecoder/OggDecoder.cpp | 2 +- src/plugins/oggdecoder/OggDecoder.h | 2 +- src/plugins/oggdecoder/OggDecoderFactory.cpp | 2 +- src/plugins/oggdecoder/OggDecoderFactory.h | 2 +- src/plugins/oggdecoder/oggdecoder_plugin.cpp | 2 +- src/plugins/pulseout/PulseOut.cpp | 8 +++--- src/plugins/pulseout/PulseOut.h | 2 +- .../taglib_plugin/TaglibMetadataReader.cpp | 2 +- .../taglib_plugin/TaglibMetadataReader.h | 2 +- src/plugins/taglib_plugin/taglib_plugin.cpp | 2 +- src/plugins/wasapiout/WasapiOut.cpp | 6 ++-- src/plugins/wasapiout/WasapiOut.h | 2 +- src/plugins/wasapiout/wasapiout_plugin.cpp | 2 +- src/plugins/waveout/WaveOut.cpp | 6 ++-- src/plugins/waveout/WaveOut.h | 2 +- src/plugins/waveout/waveout_plugin.cpp | 2 +- src/plugins/websocket_remote/HttpServer.cpp | 4 +-- src/plugins/websocket_remote/Transcoder.cpp | 2 +- .../TranscodingDataStream.cpp | 8 +++--- .../websocket_remote/TranscodingDataStream.h | 2 +- src/plugins/websocket_remote/main.cpp | 4 +-- src/plugins/win32gdivis/GdiVis.cpp | 4 +-- .../win32globalhotkeys_plugin.cpp | 2 +- 96 files changed, 149 insertions(+), 157 deletions(-) diff --git a/src/core/audio/Buffer.h b/src/core/audio/Buffer.h index bee301e3b..4aa48d4b7 100644 --- a/src/core/audio/Buffer.h +++ b/src/core/audio/Buffer.h @@ -64,7 +64,7 @@ namespace musik { namespace core { namespace audio { virtual long Samples() const override; virtual void SetSamples(long samples) override; virtual long Bytes() const override; - virtual void Destroy() override { delete this; } + virtual void Release() override { delete this; } double Position() const; void SetPosition(double position); diff --git a/src/core/audio/Outputs.cpp b/src/core/audio/Outputs.cpp index d3306751d..afc7da2ba 100644 --- a/src/core/audio/Outputs.cpp +++ b/src/core/audio/Outputs.cpp @@ -77,7 +77,7 @@ namespace musik { } OutputList GetAllOutputs() { - using OutputDeleter = PluginFactory::DestroyDeleter; + using OutputDeleter = PluginFactory::ReleaseDeleter; OutputList result = PluginFactory::Instance() .QueryInterface("GetAudioOutput"); diff --git a/src/core/audio/PlaybackService.cpp b/src/core/audio/PlaybackService.cpp index 5dc4e1977..f9d4e0c9d 100755 --- a/src/core/audio/PlaybackService.cpp +++ b/src/core/audio/PlaybackService.cpp @@ -157,7 +157,7 @@ PlaybackService::~PlaybackService() { } void PlaybackService::InitRemotes() { - typedef PluginFactory::DestroyDeleter Deleter; + typedef PluginFactory::ReleaseDeleter Deleter; this->remotes = PluginFactory::Instance() .QueryInterface("GetPlaybackRemote"); diff --git a/src/core/audio/Streams.cpp b/src/core/audio/Streams.cpp index 20d895055..842b13536 100644 --- a/src/core/audio/Streams.cpp +++ b/src/core/audio/Streams.cpp @@ -49,7 +49,7 @@ using musik::core::PluginFactory; using DataStreamPtr = musik::core::io::DataStreamFactory::DataStreamPtr; using DecoderFactoryList = std::vector >; using DspList = std::vector >; -using Deleter = PluginFactory::DestroyDeleter; +using Deleter = PluginFactory::ReleaseDeleter; using DecoderPtr = std::shared_ptr; static std::mutex initLock; @@ -58,7 +58,7 @@ static DecoderFactoryList decoders; static void init() { std::unique_lock lock(initLock); if (!decoders.size()) { - typedef PluginFactory::DestroyDeleter Deleter; + typedef PluginFactory::ReleaseDeleter Deleter; decoders = PluginFactory::Instance() .QueryInterface("GetDecoderFactory"); @@ -103,7 +103,7 @@ namespace musik { namespace core { namespace audio { good to start pulling data out of it! */ if (!decoder->Open(dataStream)) { musik::debug::err(TAG, "open ok, but decode failed " + uri); - decoder->Destroy(); + decoder->Release(); return nullptr; } @@ -118,7 +118,7 @@ namespace musik { namespace core { namespace audio { } DspList GetDspPlugins() { - typedef PluginFactory::DestroyDeleter Deleter; + typedef PluginFactory::ReleaseDeleter Deleter; return PluginFactory::Instance().QueryInterface("GetDSP"); } }; diff --git a/src/core/audio/Visualizer.cpp b/src/core/audio/Visualizer.cpp index 097afdc29..4da5326e5 100644 --- a/src/core/audio/Visualizer.cpp +++ b/src/core/audio/Visualizer.cpp @@ -57,7 +57,7 @@ namespace musik { namespace vis { static void init() { /* spectrum visualizers */ - typedef PluginFactory::DestroyDeleter SpectrumDeleter; + typedef PluginFactory::ReleaseDeleter SpectrumDeleter; std::vector > spectrum; spectrum = PluginFactory::Instance() @@ -68,7 +68,7 @@ namespace musik { } /* pcm visualizers */ - typedef PluginFactory::DestroyDeleter PcmDeleter; + typedef PluginFactory::ReleaseDeleter PcmDeleter; std::vector > pcm; pcm = PluginFactory::Instance() diff --git a/src/core/core.vcxproj.filters b/src/core/core.vcxproj.filters index 33648e023..1578b1b22 100755 --- a/src/core/core.vcxproj.filters +++ b/src/core/core.vcxproj.filters @@ -53,12 +53,12 @@ {578b0af6-0dc3-4a69-a784-5e0293a5708a} - - {a39a447a-65ad-465c-839d-b96cc4a8e2e9} - {d35af273-0f2b-4669-aa83-d7eee8c2c5c5} + + {a39a447a-65ad-465c-839d-b96cc4a8e2e9} + @@ -412,7 +412,7 @@ src\sdk\vis - src\sdk\library + src\sdk\metadata src\sdk\audio @@ -433,37 +433,37 @@ src\sdk\indexer - src\sdk\library + src\sdk\metadata - src\sdk\library + src\sdk\metadata - src\sdk\library + src\sdk\metadata src\sdk\audio - src\sdk\library + src\sdk\metadata - src\sdk\library + src\sdk\metadata - src\sdk\library + src\sdk\metadata - src\sdk\library + src\sdk\metadata - src\sdk\library + src\sdk\metadata - src\sdk\library + src\sdk\metadata - src\sdk\library + src\sdk\metadata \ No newline at end of file diff --git a/src/core/io/DataStreamFactory.cpp b/src/core/io/DataStreamFactory.cpp index 1b7c71765..0516b9299 100644 --- a/src/core/io/DataStreamFactory.cpp +++ b/src/core/io/DataStreamFactory.cpp @@ -43,11 +43,11 @@ using namespace musik::core::io; using namespace musik::core::sdk; using DataStreamPtr = DataStreamFactory::DataStreamPtr; -using StreamDeleter = musik::core::PluginFactory::DestroyDeleter; +using StreamDeleter = musik::core::PluginFactory::ReleaseDeleter; DataStreamFactory::DataStreamFactory() { typedef IDataStreamFactory PluginType; - typedef musik::core::PluginFactory::DestroyDeleter Deleter; + typedef musik::core::PluginFactory::ReleaseDeleter Deleter; this->dataStreamFactories = musik::core::PluginFactory::Instance() .QueryInterface("GetDataStreamFactory"); @@ -64,7 +64,7 @@ DataStreamFactory* DataStreamFactory::Instance() { } IDataStream* DataStreamFactory::OpenDataStream(const char* uri) { - typedef musik::core::PluginFactory::DestroyDeleter StreamDeleter; + typedef musik::core::PluginFactory::ReleaseDeleter StreamDeleter; if (uri) { DataStreamFactoryVector::iterator it = @@ -87,7 +87,7 @@ IDataStream* DataStreamFactory::OpenDataStream(const char* uri) { return regularFile; } else { - regularFile->Destroy(); + regularFile->Release(); } } diff --git a/src/core/io/LocalFileStream.cpp b/src/core/io/LocalFileStream.cpp index e7852a779..50c185925 100644 --- a/src/core/io/LocalFileStream.cpp +++ b/src/core/io/LocalFileStream.cpp @@ -118,7 +118,7 @@ bool LocalFileStream::Close() { return false; } -void LocalFileStream::Destroy() { +void LocalFileStream::Release() { delete this; } diff --git a/src/core/io/LocalFileStream.h b/src/core/io/LocalFileStream.h index 3e89685a5..2ea7d0791 100644 --- a/src/core/io/LocalFileStream.h +++ b/src/core/io/LocalFileStream.h @@ -50,7 +50,7 @@ namespace musik { namespace core { namespace io { virtual bool Open(const char *filename, unsigned int options = 0); virtual bool Close(); virtual void Interrupt(); - virtual void Destroy(); + virtual void Release(); virtual PositionType Read(void* buffer, PositionType readBytes); virtual bool SetPosition(PositionType position); virtual PositionType Position(); diff --git a/src/core/library/Indexer.cpp b/src/core/library/Indexer.cpp index c254e33d2..0293bfb9d 100644 --- a/src/core/library/Indexer.cpp +++ b/src/core/library/Indexer.cpp @@ -79,9 +79,9 @@ using namespace musik::core::library; using Thread = std::unique_ptr; -using TagReaderDestroyer = PluginFactory::DestroyDeleter; -using DecoderDeleter = PluginFactory::DestroyDeleter; -using SourceDeleter = PluginFactory::DestroyDeleter; +using TagReaderDestroyer = PluginFactory::ReleaseDeleter; +using DecoderDeleter = PluginFactory::ReleaseDeleter; +using SourceDeleter = PluginFactory::ReleaseDeleter; static std::string normalizeDir(std::string path) { path = boost::filesystem::path(path).make_preferred().string(); @@ -768,7 +768,7 @@ void Indexer::ProcessAddRemoveQueue() { void Indexer::RunAnalyzers() { typedef sdk::IAnalyzer PluginType; - typedef PluginFactory::DestroyDeleter Deleter; + typedef PluginFactory::ReleaseDeleter Deleter; typedef std::shared_ptr PluginPtr; typedef std::vector PluginVector; diff --git a/src/core/plugin/PluginFactory.cpp b/src/core/plugin/PluginFactory.cpp index 239aad9d6..c13c1d9c7 100644 --- a/src/core/plugin/PluginFactory.cpp +++ b/src/core/plugin/PluginFactory.cpp @@ -76,7 +76,7 @@ PluginFactory::PluginFactory() { PluginFactory::~PluginFactory() { for (std::shared_ptr plugin : this->plugins) { - plugin->plugin->Destroy(); + plugin->plugin->Release(); closeNativeHandle(plugin->nativeHandle); } plugins.clear(); diff --git a/src/core/plugin/PluginFactory.h b/src/core/plugin/PluginFactory.h index 968b03e7d..5d3ab12d9 100644 --- a/src/core/plugin/PluginFactory.h +++ b/src/core/plugin/PluginFactory.h @@ -58,9 +58,9 @@ namespace musik { namespace core { static PluginFactory& Instance(); template - struct DestroyDeleter { + struct ReleaseDeleter { void operator()(T* t) { - t->Destroy(); + t->Release(); } }; diff --git a/src/core/sdk/IAnalyzer.h b/src/core/sdk/IAnalyzer.h index c701551e2..92a532ec2 100644 --- a/src/core/sdk/IAnalyzer.h +++ b/src/core/sdk/IAnalyzer.h @@ -41,7 +41,7 @@ namespace musik { namespace core { namespace sdk { class IAnalyzer { public: - virtual void Destroy() = 0; + virtual void Release() = 0; virtual bool Start(musik::core::sdk::ITagStore *target) = 0; virtual bool Analyze(musik::core::sdk::ITagStore *target, IBuffer *buffer) = 0; virtual bool End(musik::core::sdk::ITagStore *target) = 0; diff --git a/src/core/sdk/IBuffer.h b/src/core/sdk/IBuffer.h index 27dcf47de..83a68582f 100644 --- a/src/core/sdk/IBuffer.h +++ b/src/core/sdk/IBuffer.h @@ -46,7 +46,7 @@ namespace musik { namespace core { namespace sdk { virtual long Samples() const = 0; virtual void SetSamples(long samples) = 0; virtual long Bytes() const = 0; - virtual void Destroy() = 0; + virtual void Release() = 0; }; } } } diff --git a/src/core/sdk/IDSP.h b/src/core/sdk/IDSP.h index 6c68008e4..bcde85779 100644 --- a/src/core/sdk/IDSP.h +++ b/src/core/sdk/IDSP.h @@ -40,7 +40,7 @@ namespace musik { namespace core { namespace sdk { class IDSP { public: - virtual void Destroy() = 0; + virtual void Release() = 0; virtual bool Process(IBuffer *buffer) = 0; }; diff --git a/src/core/sdk/IDataStream.h b/src/core/sdk/IDataStream.h index ea0ab3d32..3099bca8e 100644 --- a/src/core/sdk/IDataStream.h +++ b/src/core/sdk/IDataStream.h @@ -40,11 +40,10 @@ namespace musik { namespace core { namespace sdk { class IDataStream { public: - /* v1 */ virtual bool Open(const char *uri, unsigned int options = 0) = 0; virtual bool Close() = 0; virtual void Interrupt() = 0; - virtual void Destroy() = 0; + virtual void Release() = 0; virtual PositionType Read(void *buffer, PositionType readBytes) = 0; virtual bool SetPosition(PositionType position) = 0; virtual PositionType Position() = 0; @@ -53,8 +52,6 @@ namespace musik { namespace core { namespace sdk { virtual long Length() = 0; virtual const char* Type() = 0; virtual const char* Uri() = 0; - - /* v5 */ virtual bool CanPrefetch() = 0; }; diff --git a/src/core/sdk/IDataStreamFactory.h b/src/core/sdk/IDataStreamFactory.h index 85005d43a..09b580a4a 100644 --- a/src/core/sdk/IDataStreamFactory.h +++ b/src/core/sdk/IDataStreamFactory.h @@ -41,7 +41,7 @@ namespace musik { namespace core { namespace sdk { public: virtual bool CanRead(const char *uri) = 0; virtual IDataStream* Open(const char *uri, unsigned int options = 0) = 0; - virtual void Destroy() = 0; + virtual void Release() = 0; }; } } } diff --git a/src/core/sdk/IDecoder.h b/src/core/sdk/IDecoder.h index c7d0bb179..89a493059 100644 --- a/src/core/sdk/IDecoder.h +++ b/src/core/sdk/IDecoder.h @@ -41,7 +41,7 @@ namespace musik { namespace core { namespace sdk { class IDecoder { public: - virtual void Destroy() = 0; + virtual void Release() = 0; virtual double SetPosition(double seconds) = 0; virtual bool GetBuffer(IBuffer *buffer) = 0; virtual double GetDuration() = 0; diff --git a/src/core/sdk/IDecoderFactory.h b/src/core/sdk/IDecoderFactory.h index a745edef7..10e85c06d 100644 --- a/src/core/sdk/IDecoderFactory.h +++ b/src/core/sdk/IDecoderFactory.h @@ -41,7 +41,7 @@ namespace musik { namespace core { namespace sdk { class IDecoderFactory{ public: virtual IDecoder* CreateDecoder() = 0; - virtual void Destroy() = 0; + virtual void Release() = 0; virtual bool CanHandle(const char* type) const = 0; }; diff --git a/src/core/sdk/IDevice.h b/src/core/sdk/IDevice.h index 1e163c88c..9eb17a56e 100644 --- a/src/core/sdk/IDevice.h +++ b/src/core/sdk/IDevice.h @@ -41,14 +41,14 @@ namespace musik { namespace core { namespace sdk { class IDevice { public: - virtual void Destroy() = 0; + virtual void Release() = 0; virtual const char* Name() const = 0; virtual const char* Id() const = 0; }; class IDeviceList { public: - virtual void Destroy() = 0; + virtual void Release() = 0; virtual size_t Count() const = 0; virtual const IDevice* At(size_t index) const = 0; }; @@ -64,7 +64,7 @@ namespace musik { namespace core { namespace sdk { return new Device(device->Id(), device->Name()); } } - deviceList->Destroy(); + deviceList->Release(); } return result; } @@ -78,7 +78,7 @@ namespace musik { namespace core { namespace sdk { auto device = findDeviceById(output, deviceId); if (device) { - device->Destroy(); + device->Release(); prefs->SetString(key, deviceId); return true; } diff --git a/src/core/sdk/IIndexerSource.h b/src/core/sdk/IIndexerSource.h index c3fdaf9a6..845851403 100644 --- a/src/core/sdk/IIndexerSource.h +++ b/src/core/sdk/IIndexerSource.h @@ -42,7 +42,7 @@ namespace musik { namespace core { namespace sdk { class IIndexerSource { public: - virtual void Destroy() = 0; + virtual void Release() = 0; virtual void OnBeforeScan() = 0; diff --git a/src/core/sdk/IIndexerWriter.h b/src/core/sdk/IIndexerWriter.h index 52361605e..3468057d0 100644 --- a/src/core/sdk/IIndexerWriter.h +++ b/src/core/sdk/IIndexerWriter.h @@ -43,12 +43,7 @@ namespace musik { namespace core { namespace sdk { class IIndexerWriter { public: virtual ITagStore* CreateWriter() = 0; - - virtual bool Save( - IIndexerSource* source, - ITagStore* track, - const char* externalId = "") = 0; - + virtual bool Save(IIndexerSource* source, ITagStore* track, const char* externalId = "") = 0; virtual bool RemoveByUri(IIndexerSource* source, const char* uri) = 0; virtual bool RemoveByExternalId(IIndexerSource* source, const char* id) = 0; virtual int RemoveAll(IIndexerSource* source) = 0; diff --git a/src/core/sdk/IOutput.h b/src/core/sdk/IOutput.h index 80e9453ba..b3d6edcb9 100644 --- a/src/core/sdk/IOutput.h +++ b/src/core/sdk/IOutput.h @@ -44,7 +44,7 @@ namespace musik { namespace core { namespace sdk { class IOutput { public: - virtual void Destroy() = 0; + virtual void Release() = 0; virtual void Pause() = 0; virtual void Resume() = 0; virtual void SetVolume(double volume) = 0; diff --git a/src/core/sdk/IPcmVisualizer.h b/src/core/sdk/IPcmVisualizer.h index 57fd49a84..75943ce59 100644 --- a/src/core/sdk/IPcmVisualizer.h +++ b/src/core/sdk/IPcmVisualizer.h @@ -41,7 +41,7 @@ namespace musik { namespace core { namespace sdk { class IPcmVisualizer : public IVisualizer { public: - virtual void Destroy() = 0; + virtual void Release() = 0; virtual void Write(IBuffer *target) = 0; }; diff --git a/src/core/sdk/IPlaybackRemote.h b/src/core/sdk/IPlaybackRemote.h index 1948b4100..acb837628 100644 --- a/src/core/sdk/IPlaybackRemote.h +++ b/src/core/sdk/IPlaybackRemote.h @@ -41,7 +41,7 @@ namespace musik { namespace core { namespace sdk { class IPlaybackRemote { public: - virtual void Destroy() = 0; + virtual void Release() = 0; virtual void SetPlaybackService(IPlaybackService* playback) = 0; virtual void OnTrackChanged(ITrack* track) = 0; virtual void OnPlaybackStateChanged(PlaybackState state) = 0; diff --git a/src/core/sdk/IPlugin.h b/src/core/sdk/IPlugin.h index 820cd822c..831659678 100644 --- a/src/core/sdk/IPlugin.h +++ b/src/core/sdk/IPlugin.h @@ -38,7 +38,7 @@ namespace musik { namespace core { namespace sdk { class IPlugin { public: - virtual void Destroy() = 0; + virtual void Release() = 0; virtual const char* Name() = 0; virtual const char* Version() = 0; virtual const char* Author() = 0; diff --git a/src/core/sdk/ISpectrumVisualizer.h b/src/core/sdk/ISpectrumVisualizer.h index 62321ee52..29b27c06e 100644 --- a/src/core/sdk/ISpectrumVisualizer.h +++ b/src/core/sdk/ISpectrumVisualizer.h @@ -41,7 +41,7 @@ namespace musik { namespace core { namespace sdk { class ISpectrumVisualizer : public IVisualizer { public: - virtual void Destroy() = 0; + virtual void Release() = 0; virtual void Write(float *spectrum, int size) = 0; }; diff --git a/src/core/sdk/ITagReader.h b/src/core/sdk/ITagReader.h index 67a5ec63b..6e6bb81c8 100644 --- a/src/core/sdk/ITagReader.h +++ b/src/core/sdk/ITagReader.h @@ -42,7 +42,7 @@ namespace musik { namespace core { namespace sdk { public: virtual bool Read(const char *uri, musik::core::sdk::ITagStore *target) = 0; virtual bool CanRead(const char *extension) = 0; - virtual void Destroy() = 0; + virtual void Release() = 0; }; } } } diff --git a/src/core/sdk/IVisualizer.h b/src/core/sdk/IVisualizer.h index 99d009b7f..0964c7121 100644 --- a/src/core/sdk/IVisualizer.h +++ b/src/core/sdk/IVisualizer.h @@ -40,7 +40,7 @@ namespace musik { namespace core { namespace sdk { class IVisualizer { public: - virtual void Destroy() = 0; + virtual void Release() = 0; virtual void Show() = 0; virtual void Hide() = 0; virtual bool Visible() = 0; diff --git a/src/musikcube/app/layout/SettingsLayout.cpp b/src/musikcube/app/layout/SettingsLayout.cpp index cea5aaeed..092390d20 100755 --- a/src/musikcube/app/layout/SettingsLayout.cpp +++ b/src/musikcube/app/layout/SettingsLayout.cpp @@ -107,7 +107,7 @@ static std::string getOutputDeviceName() { IDevice* device = output->GetDefaultDevice(); if (device) { deviceName = device->Name(); - device->Destroy(); + device->Release(); } } diff --git a/src/musikcube/app/overlay/PlaybackOverlays.cpp b/src/musikcube/app/overlay/PlaybackOverlays.cpp index 992469ba3..131ffd2c4 100644 --- a/src/musikcube/app/overlay/PlaybackOverlays.cpp +++ b/src/musikcube/app/overlay/PlaybackOverlays.cpp @@ -55,9 +55,9 @@ static std::vector > plugins; static std::set invalidCrossfadeOutputs = { "WaveOut" }; template -struct DestroyDeleter { +struct ReleaseDeleter { void operator()(T* t) { - if (t) t->Destroy(); + if (t) t->Release(); } }; @@ -164,10 +164,10 @@ void PlaybackOverlays::ShowOutputDeviceOverlay(std::function callback) { std::string currentDeviceName = _TSTR("settings_output_device_default"); std::shared_ptr deviceList = std::shared_ptr( - output->GetDeviceList(), DestroyDeleter()); + output->GetDeviceList(), ReleaseDeleter()); std::shared_ptr device = std::shared_ptr( - output->GetDefaultDevice(), DestroyDeleter()); + output->GetDefaultDevice(), ReleaseDeleter()); if (device) { currentDeviceName = device->Name(); diff --git a/src/musikcube/app/overlay/ServerOverlay.cpp b/src/musikcube/app/overlay/ServerOverlay.cpp index a61dabf99..f6df07efd 100644 --- a/src/musikcube/app/overlay/ServerOverlay.cpp +++ b/src/musikcube/app/overlay/ServerOverlay.cpp @@ -270,7 +270,7 @@ void ServerOverlay::Show(Callback callback) { std::shared_ptr ServerOverlay::FindServerPlugin() { std::shared_ptr result; - using Deleter = PluginFactory::DestroyDeleter; + using Deleter = PluginFactory::ReleaseDeleter; PluginFactory::Instance().QueryInterface( "GetPlugin", [&result](std::shared_ptr plugin, const std::string& fn) { diff --git a/src/plugins/alsaout/AlsaOut.cpp b/src/plugins/alsaout/AlsaOut.cpp index 6bc86ce1d..ee86d102a 100755 --- a/src/plugins/alsaout/AlsaOut.cpp +++ b/src/plugins/alsaout/AlsaOut.cpp @@ -84,7 +84,7 @@ class AlsaDevice : public IDevice { this->name = name; } - virtual void Destroy() override { + virtual void Release() override { delete this; } @@ -102,7 +102,7 @@ class AlsaDevice : public IDevice { class AlsaDeviceList : public musik::core::sdk::IDeviceList { public: - virtual void Destroy() override { + virtual void Release() override { delete this; } @@ -221,7 +221,7 @@ std::string AlsaOut::GetPreferredDeviceId() { break; } } - deviceList->Destroy(); + deviceList->Release(); } } @@ -302,7 +302,7 @@ error: this->CloseDevice(); } -void AlsaOut::Destroy() { +void AlsaOut::Release() { delete this; } diff --git a/src/plugins/alsaout/AlsaOut.h b/src/plugins/alsaout/AlsaOut.h index 4e3e900c4..e5bf002b9 100755 --- a/src/plugins/alsaout/AlsaOut.h +++ b/src/plugins/alsaout/AlsaOut.h @@ -54,7 +54,7 @@ class AlsaOut : public musik::core::sdk::IOutput { virtual const char* Name() override { return "AlsaOut"; } /* IOutput */ - virtual void Destroy() override; + virtual void Release() override; virtual void Pause() override ; virtual void Resume() override; virtual void SetVolume(double volume) override; diff --git a/src/plugins/cddadecoder/CddaDataStream.cpp b/src/plugins/cddadecoder/CddaDataStream.cpp index 4ab2f427a..b3d58a149 100755 --- a/src/plugins/cddadecoder/CddaDataStream.cpp +++ b/src/plugins/cddadecoder/CddaDataStream.cpp @@ -154,7 +154,7 @@ void CddaDataStream::Interrupt() { } -void CddaDataStream::Destroy() { +void CddaDataStream::Release() { delete this; } diff --git a/src/plugins/cddadecoder/CddaDataStream.h b/src/plugins/cddadecoder/CddaDataStream.h index e79d486f5..81a292c03 100755 --- a/src/plugins/cddadecoder/CddaDataStream.h +++ b/src/plugins/cddadecoder/CddaDataStream.h @@ -50,7 +50,7 @@ class CddaDataStream : public IDataStream { CddaDataStream(); ~CddaDataStream(); - virtual void Destroy(); + virtual void Release(); virtual bool Open(const char *filename, unsigned int options = 0); virtual bool Close(); virtual void Interrupt(); diff --git a/src/plugins/cddadecoder/CddaDataStreamFactory.cpp b/src/plugins/cddadecoder/CddaDataStreamFactory.cpp index 7d70b1a65..618e19bf0 100755 --- a/src/plugins/cddadecoder/CddaDataStreamFactory.cpp +++ b/src/plugins/cddadecoder/CddaDataStreamFactory.cpp @@ -61,6 +61,6 @@ IDataStream* CddaDataStreamFactory::Open(const char *uri, unsigned int options) return NULL; } -void CddaDataStreamFactory::Destroy() { +void CddaDataStreamFactory::Release() { delete this; } \ No newline at end of file diff --git a/src/plugins/cddadecoder/CddaDataStreamFactory.h b/src/plugins/cddadecoder/CddaDataStreamFactory.h index 7218c2b34..a0ae6817c 100755 --- a/src/plugins/cddadecoder/CddaDataStreamFactory.h +++ b/src/plugins/cddadecoder/CddaDataStreamFactory.h @@ -45,5 +45,5 @@ class CddaDataStreamFactory : public IDataStreamFactory { virtual bool CanRead(const char *uri); virtual IDataStream* Open(const char *uri, unsigned int options = 0); - virtual void Destroy(); + virtual void Release(); }; \ No newline at end of file diff --git a/src/plugins/cddadecoder/CddaDecoder.cpp b/src/plugins/cddadecoder/CddaDecoder.cpp index 4f0f01157..4be53345d 100644 --- a/src/plugins/cddadecoder/CddaDecoder.cpp +++ b/src/plugins/cddadecoder/CddaDecoder.cpp @@ -50,7 +50,7 @@ CddaDecoder::~CddaDecoder() { delete[] this->buffer; } -void CddaDecoder::Destroy() { +void CddaDecoder::Release() { delete this; } diff --git a/src/plugins/cddadecoder/CddaDecoder.h b/src/plugins/cddadecoder/CddaDecoder.h index 6b4cbd4fb..6ae5aaffe 100644 --- a/src/plugins/cddadecoder/CddaDecoder.h +++ b/src/plugins/cddadecoder/CddaDecoder.h @@ -48,7 +48,7 @@ class CddaDecoder : public IDecoder { ~CddaDecoder(); virtual bool Open(IDataStream* data) override; - virtual void Destroy() override; + virtual void Release() override; virtual double SetPosition(double seconds) override; virtual double GetDuration() override; virtual bool GetBuffer(IBuffer *buffer) override; diff --git a/src/plugins/cddadecoder/CddaDecoderFactory.cpp b/src/plugins/cddadecoder/CddaDecoderFactory.cpp index c222b2567..1f6264d9e 100644 --- a/src/plugins/cddadecoder/CddaDecoderFactory.cpp +++ b/src/plugins/cddadecoder/CddaDecoderFactory.cpp @@ -43,7 +43,7 @@ CddaDecoderFactory::CddaDecoderFactory() { CddaDecoderFactory::~CddaDecoderFactory() { } -void CddaDecoderFactory::Destroy() { +void CddaDecoderFactory::Release() { delete this; } diff --git a/src/plugins/cddadecoder/CddaDecoderFactory.h b/src/plugins/cddadecoder/CddaDecoderFactory.h index 69e6d59a7..a2e6d7009 100644 --- a/src/plugins/cddadecoder/CddaDecoderFactory.h +++ b/src/plugins/cddadecoder/CddaDecoderFactory.h @@ -43,6 +43,6 @@ public: CddaDecoderFactory(); ~CddaDecoderFactory(); virtual IDecoder* CreateDecoder(); - virtual void Destroy(); + virtual void Release(); virtual bool CanHandle(const char* type) const; }; diff --git a/src/plugins/cddadecoder/CddaIndexerSource.cpp b/src/plugins/cddadecoder/CddaIndexerSource.cpp index c5d300194..d608a13f6 100644 --- a/src/plugins/cddadecoder/CddaIndexerSource.cpp +++ b/src/plugins/cddadecoder/CddaIndexerSource.cpp @@ -277,7 +277,7 @@ CddaIndexerSource::~CddaIndexerSource() { model.RemoveEventListener(this); } -void CddaIndexerSource::Destroy() { +void CddaIndexerSource::Release() { delete this; } diff --git a/src/plugins/cddadecoder/CddaIndexerSource.h b/src/plugins/cddadecoder/CddaIndexerSource.h index 701504472..b83002cbe 100644 --- a/src/plugins/cddadecoder/CddaIndexerSource.h +++ b/src/plugins/cddadecoder/CddaIndexerSource.h @@ -47,7 +47,7 @@ class CddaIndexerSource : ~CddaIndexerSource(); /* IIndexerSource */ - virtual void Destroy(); + virtual void Release(); virtual void OnBeforeScan(); virtual void OnAfterScan(); virtual int SourceId(); diff --git a/src/plugins/cddadecoder/cddadecoder_plugin.cpp b/src/plugins/cddadecoder/cddadecoder_plugin.cpp index 4fd41fe40..3cb8a721b 100644 --- a/src/plugins/cddadecoder/cddadecoder_plugin.cpp +++ b/src/plugins/cddadecoder/cddadecoder_plugin.cpp @@ -50,7 +50,7 @@ BOOL APIENTRY DllMain(HMODULE module, DWORD reason, LPVOID reserved) { } class CddaDecoderPlugin : public musik::core::sdk::IPlugin { - virtual void Destroy() { delete this; }; + virtual void Release() { delete this; }; virtual const char* Name() { return PLUGIN_NAME; } virtual const char* Version() { return "0.5.0"; } virtual const char* Author() { return "Björn Olievier, clangen"; } diff --git a/src/plugins/coreaudioout/CoreAudioOut.cpp b/src/plugins/coreaudioout/CoreAudioOut.cpp index 6b8e2534b..d989b9127 100644 --- a/src/plugins/coreaudioout/CoreAudioOut.cpp +++ b/src/plugins/coreaudioout/CoreAudioOut.cpp @@ -50,7 +50,7 @@ class CoreAudioDevice : public IDevice { this->name = name; } - virtual void Destroy() { delete this; } + virtual void Release() { delete this; } virtual const char* Name() const { return name.c_str(); } virtual const char* Id() const { return id.c_str(); } @@ -60,7 +60,7 @@ class CoreAudioDevice : public IDevice { class CoreAudioDeviceList : public IDeviceList { public: - virtual void Destroy() { delete this; } + virtual void Release() { delete this; } virtual size_t Count() const { return devices.size(); } virtual const IDevice* At(size_t index) const { return &devices.at(index); } @@ -197,7 +197,7 @@ int CoreAudioOut::Play(IBuffer *buffer, IBufferProvider *provider) { CFRelease(deviceUid); } - device->Destroy(); + device->Release(); } /* get it running! */ @@ -254,7 +254,7 @@ CoreAudioOut::~CoreAudioOut() { this->Stop(); } -void CoreAudioOut::Destroy() { +void CoreAudioOut::Release() { delete this; } diff --git a/src/plugins/coreaudioout/CoreAudioOut.h b/src/plugins/coreaudioout/CoreAudioOut.h index c2f3b600e..c22f4a807 100644 --- a/src/plugins/coreaudioout/CoreAudioOut.h +++ b/src/plugins/coreaudioout/CoreAudioOut.h @@ -58,7 +58,7 @@ class CoreAudioOut : public musik::core::sdk::IOutput { virtual const char* Name() override { return "CoreAudio"; } /* IOutput */ - virtual void Destroy() override; + virtual void Release() override; virtual void Pause() override; virtual void Resume() override; virtual void SetVolume(double volume) override; diff --git a/src/plugins/directsoundout/DirectSoundOut.cpp b/src/plugins/directsoundout/DirectSoundOut.cpp index eb79c74ca..e1fbfc6b6 100644 --- a/src/plugins/directsoundout/DirectSoundOut.cpp +++ b/src/plugins/directsoundout/DirectSoundOut.cpp @@ -70,7 +70,7 @@ class DxDevice : public musik::core::sdk::IDevice { this->name = name; } - virtual void Destroy() override { delete this; } + virtual void Release() override { delete this; } virtual const char* Name() const override { return name.c_str(); } virtual const char* Id() const override { return id.c_str(); } @@ -80,7 +80,7 @@ class DxDevice : public musik::core::sdk::IDevice { class DxDeviceList : public musik::core::sdk::IDeviceList { public: - virtual void Destroy() { delete this; } + virtual void Release() { delete this; } virtual size_t Count() const override { return devices.size(); } virtual const IDevice* At(size_t index) const override { return &devices.at(index); } @@ -121,7 +121,7 @@ class DrainBuffer : virtual void SetSamples(long samples) { this->samples = samples; } virtual long Bytes() const { return this->samples * sizeof(float); } virtual void OnBufferProcessed(IBuffer *buffer) { } - virtual void Destroy() { delete this; } + virtual void Release() { delete this; } private: int channels, samples, rate; @@ -172,7 +172,7 @@ DirectSoundOut::DirectSoundOut() DirectSoundOut::~DirectSoundOut() { } -void DirectSoundOut::Destroy() { +void DirectSoundOut::Release() { this->Reset(); delete this; } @@ -452,7 +452,7 @@ LPCGUID DirectSoundOut::GetPreferredDeviceId() { } } } - devices->Destroy(); + devices->Release(); } } diff --git a/src/plugins/directsoundout/DirectSoundOut.h b/src/plugins/directsoundout/DirectSoundOut.h index 4f8ab752f..faae2e580 100644 --- a/src/plugins/directsoundout/DirectSoundOut.h +++ b/src/plugins/directsoundout/DirectSoundOut.h @@ -59,7 +59,7 @@ class DirectSoundOut : public IOutput { /* IPlugin */ virtual const char* Name() { return "DirectSound"; }; - virtual void Destroy(); + virtual void Release(); /* IOutput */ virtual void Pause() override; diff --git a/src/plugins/directsoundout/directsoundout_plugin.cpp b/src/plugins/directsoundout/directsoundout_plugin.cpp index 32c5f384f..35d5ed4dd 100644 --- a/src/plugins/directsoundout/directsoundout_plugin.cpp +++ b/src/plugins/directsoundout/directsoundout_plugin.cpp @@ -41,7 +41,7 @@ class DirectSoundPlugin : public musik::core::sdk::IPlugin { public: - virtual void Destroy() { delete this; } + virtual void Release() { delete this; } virtual const char* Name() { return "DirectSound IOutput"; }; virtual const char* Version() { return "0.5.0"; }; virtual const char* Author() { return "clangen"; }; diff --git a/src/plugins/flacdecoder/FlacDecoder.cpp b/src/plugins/flacdecoder/FlacDecoder.cpp index cdeaef625..4f0780550 100644 --- a/src/plugins/flacdecoder/FlacDecoder.cpp +++ b/src/plugins/flacdecoder/FlacDecoder.cpp @@ -209,7 +209,7 @@ FLAC__StreamDecoderWriteStatus FlacDecoder::FlacWrite( return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE; } -void FlacDecoder::Destroy() { +void FlacDecoder::Release() { delete this; } diff --git a/src/plugins/flacdecoder/FlacDecoder.h b/src/plugins/flacdecoder/FlacDecoder.h index c6a9f5791..fc71d6619 100644 --- a/src/plugins/flacdecoder/FlacDecoder.h +++ b/src/plugins/flacdecoder/FlacDecoder.h @@ -47,7 +47,7 @@ class FlacDecoder : public musik::core::sdk::IDecoder { FlacDecoder(); ~FlacDecoder(); - virtual void Destroy() override; + virtual void Release() override; virtual double SetPosition(double seconds) override; virtual bool GetBuffer(IBuffer *buffer) override; virtual double GetDuration() override; diff --git a/src/plugins/flacdecoder/FlacDecoderFactory.cpp b/src/plugins/flacdecoder/FlacDecoderFactory.cpp index d66574382..462c271b8 100644 --- a/src/plugins/flacdecoder/FlacDecoderFactory.cpp +++ b/src/plugins/flacdecoder/FlacDecoderFactory.cpp @@ -54,7 +54,7 @@ FlacDecoderFactory::FlacDecoderFactory() { FlacDecoderFactory::~FlacDecoderFactory() { } -void FlacDecoderFactory::Destroy() { +void FlacDecoderFactory::Release() { delete this; } diff --git a/src/plugins/flacdecoder/FlacDecoderFactory.h b/src/plugins/flacdecoder/FlacDecoderFactory.h index 235940a31..1f9123ebd 100644 --- a/src/plugins/flacdecoder/FlacDecoderFactory.h +++ b/src/plugins/flacdecoder/FlacDecoderFactory.h @@ -41,6 +41,6 @@ class FlacDecoderFactory : public musik::core::sdk::IDecoderFactory { FlacDecoderFactory(); ~FlacDecoderFactory(); virtual musik::core::sdk::IDecoder* CreateDecoder(); - virtual void Destroy(); + virtual void Release(); virtual bool CanHandle(const char* type) const; }; diff --git a/src/plugins/flacdecoder/flacdecoder_plugin.cpp b/src/plugins/flacdecoder/flacdecoder_plugin.cpp index e06348d23..894f9e835 100644 --- a/src/plugins/flacdecoder/flacdecoder_plugin.cpp +++ b/src/plugins/flacdecoder/flacdecoder_plugin.cpp @@ -53,7 +53,7 @@ class FlacPlugin : public musik::core::sdk::IPlugin { public: - virtual void Destroy() { delete this; }; + virtual void Release() { delete this; }; virtual const char* Name() { return "FLAC IDecoder"; } virtual const char* Version() { return "0.4.0"; } virtual const char* Author() { return "Daniel Önnerby, clangen"; } diff --git a/src/plugins/httpdatastream/HttpDataStream.cpp b/src/plugins/httpdatastream/HttpDataStream.cpp index ff17fdd88..8d16462b2 100755 --- a/src/plugins/httpdatastream/HttpDataStream.cpp +++ b/src/plugins/httpdatastream/HttpDataStream.cpp @@ -340,7 +340,7 @@ bool HttpDataStream::Close() { return true; } -void HttpDataStream::Destroy() { +void HttpDataStream::Release() { this->Close(); delete this; } diff --git a/src/plugins/httpdatastream/HttpDataStream.h b/src/plugins/httpdatastream/HttpDataStream.h index 901474cb6..db8c0f335 100755 --- a/src/plugins/httpdatastream/HttpDataStream.h +++ b/src/plugins/httpdatastream/HttpDataStream.h @@ -50,7 +50,7 @@ class HttpDataStream : public IDataStream { HttpDataStream(); ~HttpDataStream(); - virtual void Destroy(); + virtual void Release(); virtual bool Open(const char *uri, unsigned int options = 0); virtual bool Close(); virtual PositionType Read(void* buffer, PositionType readBytes); diff --git a/src/plugins/httpdatastream/HttpDataStreamFactory.cpp b/src/plugins/httpdatastream/HttpDataStreamFactory.cpp index 89d2977b3..665fc08be 100755 --- a/src/plugins/httpdatastream/HttpDataStreamFactory.cpp +++ b/src/plugins/httpdatastream/HttpDataStreamFactory.cpp @@ -62,6 +62,6 @@ IDataStream* HttpDataStreamFactory::Open(const char *uri, unsigned int options) return nullptr; } -void HttpDataStreamFactory::Destroy() { +void HttpDataStreamFactory::Release() { delete this; } \ No newline at end of file diff --git a/src/plugins/httpdatastream/HttpDataStreamFactory.h b/src/plugins/httpdatastream/HttpDataStreamFactory.h index bc46ac05d..1106e463b 100755 --- a/src/plugins/httpdatastream/HttpDataStreamFactory.h +++ b/src/plugins/httpdatastream/HttpDataStreamFactory.h @@ -43,5 +43,5 @@ class HttpDataStreamFactory : public IDataStreamFactory { virtual bool CanRead(const char *uri); virtual IDataStream* Open(const char *uri, unsigned int options = 0); - virtual void Destroy(); + virtual void Release(); }; \ No newline at end of file diff --git a/src/plugins/httpdatastream/httpdatastream_plugin.cpp b/src/plugins/httpdatastream/httpdatastream_plugin.cpp index 3b423d2c0..ac34a0fd3 100644 --- a/src/plugins/httpdatastream/httpdatastream_plugin.cpp +++ b/src/plugins/httpdatastream/httpdatastream_plugin.cpp @@ -61,7 +61,7 @@ static class HttpDataStreamPlugin : public musik::core::sdk::IPlugin { boost::filesystem::path::imbue(utf8Locale); } - virtual void Destroy() { }; + virtual void Release() { }; virtual const char* Name() { return "HTTP IDataStream"; } virtual const char* Version() { return "0.1.0"; } virtual const char* Author() { return "clangen"; } diff --git a/src/plugins/m4adecoder/M4aDecoder.cpp b/src/plugins/m4adecoder/M4aDecoder.cpp index 3fd93cf0a..60f940f29 100644 --- a/src/plugins/m4adecoder/M4aDecoder.cpp +++ b/src/plugins/m4adecoder/M4aDecoder.cpp @@ -151,7 +151,7 @@ bool M4aDecoder::Open(musik::core::sdk::IDataStream *stream) { return false; } -void M4aDecoder::Destroy() { +void M4aDecoder::Release() { mp4ff_close(decoderFile); if (decoder) { diff --git a/src/plugins/m4adecoder/M4aDecoder.h b/src/plugins/m4adecoder/M4aDecoder.h index 5b847dbee..6813bd974 100644 --- a/src/plugins/m4adecoder/M4aDecoder.h +++ b/src/plugins/m4adecoder/M4aDecoder.h @@ -43,7 +43,7 @@ class M4aDecoder : public musik::core::sdk::IDecoder { M4aDecoder(); ~M4aDecoder(); - virtual void Destroy() override; + virtual void Release() override; virtual double SetPosition(double seconds) override; virtual bool GetBuffer(musik::core::sdk::IBuffer *buffer) override; virtual double GetDuration() override; diff --git a/src/plugins/m4adecoder/M4aDecoderFactory.cpp b/src/plugins/m4adecoder/M4aDecoderFactory.cpp index da9143732..8d196491b 100644 --- a/src/plugins/m4adecoder/M4aDecoderFactory.cpp +++ b/src/plugins/m4adecoder/M4aDecoderFactory.cpp @@ -53,7 +53,7 @@ M4aDecoderFactory::M4aDecoderFactory() { M4aDecoderFactory::~M4aDecoderFactory() { } -void M4aDecoderFactory::Destroy() { +void M4aDecoderFactory::Release() { delete this; } diff --git a/src/plugins/m4adecoder/M4aDecoderFactory.h b/src/plugins/m4adecoder/M4aDecoderFactory.h index dc5e21a16..6dec15c29 100644 --- a/src/plugins/m4adecoder/M4aDecoderFactory.h +++ b/src/plugins/m4adecoder/M4aDecoderFactory.h @@ -41,6 +41,6 @@ class M4aDecoderFactory : public musik::core::sdk::IDecoderFactory { M4aDecoderFactory(); ~M4aDecoderFactory(); virtual musik::core::sdk::IDecoder* CreateDecoder(); - virtual void Destroy(); + virtual void Release(); virtual bool CanHandle(const char* source) const; }; diff --git a/src/plugins/m4adecoder/m4adecoder_plugin.cpp b/src/plugins/m4adecoder/m4adecoder_plugin.cpp index d4d78fa37..b9ef17596 100644 --- a/src/plugins/m4adecoder/m4adecoder_plugin.cpp +++ b/src/plugins/m4adecoder/m4adecoder_plugin.cpp @@ -53,7 +53,7 @@ class AacDecoderPlugin : public musik::core::sdk::IPlugin { public: - virtual void Destroy() { delete this; }; + virtual void Release() { delete this; }; virtual const char* Name() { return "M4A IDecoder"; }; virtual const char* Version() { return "0.4.0"; }; virtual const char* Author() { return "Björn Olievier, clangen"; }; diff --git a/src/plugins/nomaddecoder/NomadDecoder.cpp b/src/plugins/nomaddecoder/NomadDecoder.cpp index c104d6603..49bb56738 100644 --- a/src/plugins/nomaddecoder/NomadDecoder.cpp +++ b/src/plugins/nomaddecoder/NomadDecoder.cpp @@ -88,7 +88,7 @@ NomadDecoder::NomadDecoder() { NomadDecoder::~NomadDecoder() { } -void NomadDecoder::Destroy() { +void NomadDecoder::Release() { if (this->nomadContext) { nomad_close(this->nomadContext); this->nomadContext = nullptr; diff --git a/src/plugins/nomaddecoder/NomadDecoder.h b/src/plugins/nomaddecoder/NomadDecoder.h index 0b48bb44a..6b37dc914 100644 --- a/src/plugins/nomaddecoder/NomadDecoder.h +++ b/src/plugins/nomaddecoder/NomadDecoder.h @@ -50,7 +50,7 @@ class NomadDecoder : public musik::core::sdk::IDecoder { virtual double SetPosition(double seconds) override; virtual bool GetBuffer(musik::core::sdk::IBuffer *buffer) override; virtual double GetDuration() override; - virtual void Destroy() override; + virtual void Release() override; virtual bool Exhausted() override { return this->exhausted; } private: diff --git a/src/plugins/nomaddecoder/NomadDecoderFactory.cpp b/src/plugins/nomaddecoder/NomadDecoderFactory.cpp index 34ee3063e..6a3a40c28 100644 --- a/src/plugins/nomaddecoder/NomadDecoderFactory.cpp +++ b/src/plugins/nomaddecoder/NomadDecoderFactory.cpp @@ -53,7 +53,7 @@ NomadDecoderFactory::NomadDecoderFactory() { NomadDecoderFactory::~NomadDecoderFactory() { } -void NomadDecoderFactory::Destroy() { +void NomadDecoderFactory::Release() { delete this; } diff --git a/src/plugins/nomaddecoder/NomadDecoderFactory.h b/src/plugins/nomaddecoder/NomadDecoderFactory.h index fe96be66c..8a1a375a8 100644 --- a/src/plugins/nomaddecoder/NomadDecoderFactory.h +++ b/src/plugins/nomaddecoder/NomadDecoderFactory.h @@ -41,6 +41,6 @@ class NomadDecoderFactory : public musik::core::sdk::IDecoderFactory { NomadDecoderFactory(); ~NomadDecoderFactory(); virtual musik::core::sdk::IDecoder* CreateDecoder(); - virtual void Destroy(); + virtual void Release(); virtual bool CanHandle(const char* type) const; }; diff --git a/src/plugins/nomaddecoder/nomaddecoder_plugin.cpp b/src/plugins/nomaddecoder/nomaddecoder_plugin.cpp index c337dd65c..e119cbb4c 100644 --- a/src/plugins/nomaddecoder/nomaddecoder_plugin.cpp +++ b/src/plugins/nomaddecoder/nomaddecoder_plugin.cpp @@ -52,7 +52,7 @@ #endif class NomadPlugin : public musik::core::sdk::IPlugin { - virtual void Destroy() { delete this; } + virtual void Release() { delete this; } virtual const char* Name() { return "nomad IDecoder"; } virtual const char* Version() { return "0.2.0"; } virtual const char* Author() { return "clangen"; } diff --git a/src/plugins/nullout/NullOut.cpp b/src/plugins/nullout/NullOut.cpp index 42bdd423c..caa5b5564 100644 --- a/src/plugins/nullout/NullOut.cpp +++ b/src/plugins/nullout/NullOut.cpp @@ -53,7 +53,7 @@ NullOut::NullOut() { NullOut::~NullOut() { } -void NullOut::Destroy() { +void NullOut::Release() { delete this; } diff --git a/src/plugins/nullout/NullOut.h b/src/plugins/nullout/NullOut.h index 78a9ca6a4..8e73f1210 100644 --- a/src/plugins/nullout/NullOut.h +++ b/src/plugins/nullout/NullOut.h @@ -46,7 +46,7 @@ class NullOut : public IOutput { /* IPlugin */ virtual const char* Name() override { return "Null"; }; - virtual void Destroy() override; + virtual void Release() override; /* IOutput */ virtual void Pause() override; diff --git a/src/plugins/nullout/nullout_plugin.cpp b/src/plugins/nullout/nullout_plugin.cpp index 08fa9f089..e6a08364b 100644 --- a/src/plugins/nullout/nullout_plugin.cpp +++ b/src/plugins/nullout/nullout_plugin.cpp @@ -46,7 +46,7 @@ class NullPlugin : public musik::core::sdk::IPlugin { public: - virtual void Destroy() { delete this; } + virtual void Release() { delete this; } virtual const char* Name() { return "Null IOutput"; } virtual const char* Version() { return "0.2.0"; } virtual const char* Author() { return "clangen"; } diff --git a/src/plugins/oggdecoder/OggDecoder.cpp b/src/plugins/oggdecoder/OggDecoder.cpp index d66928ecd..1e58688bd 100644 --- a/src/plugins/oggdecoder/OggDecoder.cpp +++ b/src/plugins/oggdecoder/OggDecoder.cpp @@ -109,7 +109,7 @@ bool OggDecoder::Open(musik::core::sdk::IDataStream *fileStream) { return true; } -void OggDecoder::Destroy() { +void OggDecoder::Release() { ov_clear(&this->oggFile); delete this; } diff --git a/src/plugins/oggdecoder/OggDecoder.h b/src/plugins/oggdecoder/OggDecoder.h index 204535494..cfcada9d1 100644 --- a/src/plugins/oggdecoder/OggDecoder.h +++ b/src/plugins/oggdecoder/OggDecoder.h @@ -45,7 +45,7 @@ class OggDecoder : public IDecoder { OggDecoder(); ~OggDecoder(); - virtual void Destroy() override; + virtual void Release() override; virtual double SetPosition(double second) override; virtual bool GetBuffer(IBuffer *buffer) override; virtual double GetDuration() override; diff --git a/src/plugins/oggdecoder/OggDecoderFactory.cpp b/src/plugins/oggdecoder/OggDecoderFactory.cpp index 280bd2fce..4929f0c7e 100644 --- a/src/plugins/oggdecoder/OggDecoderFactory.cpp +++ b/src/plugins/oggdecoder/OggDecoderFactory.cpp @@ -51,7 +51,7 @@ OggDecoderFactory::OggDecoderFactory() { OggDecoderFactory::~OggDecoderFactory() { } -void OggDecoderFactory::Destroy() { +void OggDecoderFactory::Release() { delete this; } diff --git a/src/plugins/oggdecoder/OggDecoderFactory.h b/src/plugins/oggdecoder/OggDecoderFactory.h index b6ac313b7..e70b61c89 100644 --- a/src/plugins/oggdecoder/OggDecoderFactory.h +++ b/src/plugins/oggdecoder/OggDecoderFactory.h @@ -44,6 +44,6 @@ class OggDecoderFactory : public IDecoderFactory { ~OggDecoderFactory(); virtual IDecoder* CreateDecoder(); - virtual void Destroy(); + virtual void Release(); virtual bool CanHandle(const char* type) const; }; diff --git a/src/plugins/oggdecoder/oggdecoder_plugin.cpp b/src/plugins/oggdecoder/oggdecoder_plugin.cpp index 96b2a44b8..009a26d19 100644 --- a/src/plugins/oggdecoder/oggdecoder_plugin.cpp +++ b/src/plugins/oggdecoder/oggdecoder_plugin.cpp @@ -51,7 +51,7 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserv class OggDecoderPlugin : public musik::core::sdk::IPlugin { public: - virtual void Destroy() { delete this; }; + virtual void Release() { delete this; }; virtual const char* Name() { return "Ogg IDecoder"; } virtual const char* Version() { return "0.4.0"; } virtual const char* Author() { return "Björn Olievier, clangen"; } diff --git a/src/plugins/pulseout/PulseOut.cpp b/src/plugins/pulseout/PulseOut.cpp index 2185d6eaf..c620b5fee 100755 --- a/src/plugins/pulseout/PulseOut.cpp +++ b/src/plugins/pulseout/PulseOut.cpp @@ -57,7 +57,7 @@ class PulseDevice : public musik::core::sdk::IDevice { this->name = name; } - virtual void Destroy() { + virtual void Release() { delete this; } @@ -75,7 +75,7 @@ class PulseDevice : public musik::core::sdk::IDevice { class PulseDeviceList : public musik::core::sdk::IDeviceList { public: - virtual void Destroy() { + virtual void Release() { delete this; } @@ -231,7 +231,7 @@ std::string PulseOut::GetPreferredDeviceId() { std::string deviceId = getDeviceId(); auto device = findDeviceById(this, deviceId); if (device) { - device->Destroy(); + device->Release(); return deviceId; } return ""; @@ -289,7 +289,7 @@ void PulseOut::OpenDevice(musik::core::sdk::IBuffer* buffer) { } } -void PulseOut::Destroy() { +void PulseOut::Release() { std::cerr << "PulseOut: destroy\n"; delete this; } diff --git a/src/plugins/pulseout/PulseOut.h b/src/plugins/pulseout/PulseOut.h index e9c96ed06..c107e81c6 100755 --- a/src/plugins/pulseout/PulseOut.h +++ b/src/plugins/pulseout/PulseOut.h @@ -50,7 +50,7 @@ class PulseOut : public musik::core::sdk::IOutput { virtual const char* Name() override { return "PulseAudio"; } /* IOutput */ - virtual void Destroy() override; + virtual void Release() override; virtual void Pause() override; virtual void Resume() override; virtual void SetVolume(double volume) override; diff --git a/src/plugins/taglib_plugin/TaglibMetadataReader.cpp b/src/plugins/taglib_plugin/TaglibMetadataReader.cpp index 68b5f45b6..62d9f09d6 100644 --- a/src/plugins/taglib_plugin/TaglibMetadataReader.cpp +++ b/src/plugins/taglib_plugin/TaglibMetadataReader.cpp @@ -99,7 +99,7 @@ TaglibMetadataReader::TaglibMetadataReader() { TaglibMetadataReader::~TaglibMetadataReader() { } -void TaglibMetadataReader::Destroy() { +void TaglibMetadataReader::Release() { delete this; } diff --git a/src/plugins/taglib_plugin/TaglibMetadataReader.h b/src/plugins/taglib_plugin/TaglibMetadataReader.h index 57cd45cb1..ca085f3b8 100644 --- a/src/plugins/taglib_plugin/TaglibMetadataReader.h +++ b/src/plugins/taglib_plugin/TaglibMetadataReader.h @@ -65,7 +65,7 @@ class TaglibMetadataReader : public musik::core::sdk::ITagReader { virtual bool Read(const char *uri, musik::core::sdk::ITagStore *target); virtual bool CanRead(const char *extension); - virtual void Destroy(); + virtual void Release(); private: template void ReadFromMap( diff --git a/src/plugins/taglib_plugin/taglib_plugin.cpp b/src/plugins/taglib_plugin/taglib_plugin.cpp index 17bc0eb70..7f772ad2c 100644 --- a/src/plugins/taglib_plugin/taglib_plugin.cpp +++ b/src/plugins/taglib_plugin/taglib_plugin.cpp @@ -51,7 +51,7 @@ class TaglibPlugin : public musik::core::sdk::IPlugin { public: - virtual void Destroy() { delete this; } + virtual void Release() { delete this; } virtual const char* Name() { return "Taglib 1.11 ITagReader"; } virtual const char* Version() { return "0.6.0"; } virtual const char* Author() { return "Daniel Önnerby, clangen"; } diff --git a/src/plugins/wasapiout/WasapiOut.cpp b/src/plugins/wasapiout/WasapiOut.cpp index d0bc6f9dc..9e68363e6 100644 --- a/src/plugins/wasapiout/WasapiOut.cpp +++ b/src/plugins/wasapiout/WasapiOut.cpp @@ -80,7 +80,7 @@ class WasapiDevice : public musik::core::sdk::IDevice { this->name = name; } - virtual void Destroy() override { delete this; } + virtual void Release() override { delete this; } virtual const char* Name() const override { return name.c_str(); } virtual const char* Id() const override { return id.c_str(); } @@ -90,7 +90,7 @@ class WasapiDevice : public musik::core::sdk::IDevice { class WasapiDeviceList : public musik::core::sdk::IDeviceList { public: - virtual void Destroy() override { delete this; } + virtual void Release() override { delete this; } virtual size_t Count() const override { return devices.size(); } virtual const IDevice* At(size_t index) const override { return &devices.at(index); } @@ -219,7 +219,7 @@ WasapiOut::WasapiOut() WasapiOut::~WasapiOut() { } -void WasapiOut::Destroy() { +void WasapiOut::Release() { this->Reset(); if (this->enumerator) { diff --git a/src/plugins/wasapiout/WasapiOut.h b/src/plugins/wasapiout/WasapiOut.h index b39345e3a..aa4b595c0 100644 --- a/src/plugins/wasapiout/WasapiOut.h +++ b/src/plugins/wasapiout/WasapiOut.h @@ -57,7 +57,7 @@ class WasapiOut : public IOutput { /* IPlugin */ virtual const char* Name() { return "WASAPI"; }; - virtual void Destroy(); + virtual void Release(); /* IOutput */ virtual void Pause() override; diff --git a/src/plugins/wasapiout/wasapiout_plugin.cpp b/src/plugins/wasapiout/wasapiout_plugin.cpp index 7ba8ffb93..37caebb01 100644 --- a/src/plugins/wasapiout/wasapiout_plugin.cpp +++ b/src/plugins/wasapiout/wasapiout_plugin.cpp @@ -41,7 +41,7 @@ class WasapiPlugin : public musik::core::sdk::IPlugin { public: - virtual void Destroy() { delete this; } + virtual void Release() { delete this; } virtual const char* Name() { return "Wasapi IOutput"; } virtual const char* Version() { return "0.5.0"; } virtual const char* Author() { return "clangen"; } diff --git a/src/plugins/waveout/WaveOut.cpp b/src/plugins/waveout/WaveOut.cpp index f0e87e07e..374ee6cef 100644 --- a/src/plugins/waveout/WaveOut.cpp +++ b/src/plugins/waveout/WaveOut.cpp @@ -54,7 +54,7 @@ class WaveOutDevice : public musik::core::sdk::IDevice { this->name = name; } - virtual void Destroy() override { delete this; } + virtual void Release() override { delete this; } virtual const char* Name() const override { return name.c_str(); } virtual const char* Id() const override { return id.c_str(); } @@ -64,7 +64,7 @@ class WaveOutDevice : public musik::core::sdk::IDevice { class WaveOutDeviceList : public musik::core::sdk::IDeviceList { public: - virtual void Destroy() override { delete this; } + virtual void Release() override { delete this; } virtual size_t Count() const override { return devices.size(); } virtual const IDevice* At(size_t index) const override { return &devices.at(index); } @@ -119,7 +119,7 @@ WaveOut::WaveOut() WaveOut::~WaveOut() { } -void WaveOut::Destroy() { +void WaveOut::Release() { { LockT lock(this->outputDeviceMutex); diff --git a/src/plugins/waveout/WaveOut.h b/src/plugins/waveout/WaveOut.h index 505fe1d22..e784eba4a 100644 --- a/src/plugins/waveout/WaveOut.h +++ b/src/plugins/waveout/WaveOut.h @@ -52,7 +52,7 @@ class WaveOut : public IOutput { /* IPlugin */ virtual const char* Name() { return "WaveOut"; }; - virtual void Destroy(); + virtual void Release(); /* IOutput */ virtual void Pause() override; diff --git a/src/plugins/waveout/waveout_plugin.cpp b/src/plugins/waveout/waveout_plugin.cpp index 7fdaf0bda..6b45b83db 100644 --- a/src/plugins/waveout/waveout_plugin.cpp +++ b/src/plugins/waveout/waveout_plugin.cpp @@ -39,7 +39,7 @@ class WaveOutPlugin : public musik::core::sdk::IPlugin { public: - virtual void Destroy() { delete this; } + virtual void Release() { delete this; } virtual const char* Name() { return "WaveOut IOutput"; } virtual const char* Version() { return "0.7.0"; } virtual const char* Author() { return "Bj\xC3\xB6rn Olievier, clangen"; } diff --git a/src/plugins/websocket_remote/HttpServer.cpp b/src/plugins/websocket_remote/HttpServer.cpp index c38bf9674..477738ea0 100644 --- a/src/plugins/websocket_remote/HttpServer.cpp +++ b/src/plugins/websocket_remote/HttpServer.cpp @@ -410,7 +410,7 @@ int HttpServer::HandleRequest( } else { if (file) { - file->Destroy(); + file->Release(); file = nullptr; } @@ -484,7 +484,7 @@ int HttpServer::HandleRequest( } } else { - file->Destroy(); + file->Release(); file = nullptr; } } diff --git a/src/plugins/websocket_remote/Transcoder.cpp b/src/plugins/websocket_remote/Transcoder.cpp index 12a677a41..8ccf33820 100644 --- a/src/plugins/websocket_remote/Transcoder.cpp +++ b/src/plugins/websocket_remote/Transcoder.cpp @@ -179,7 +179,7 @@ IDataStream* Transcoder::TranscodeAndWait(Context& context, const std::string& u std::this_thread::yield(); } - transcoder->Destroy(); + transcoder->Release(); PruneTranscodeCache(context); return context.environment->GetDataStream(uri.c_str()); diff --git a/src/plugins/websocket_remote/TranscodingDataStream.cpp b/src/plugins/websocket_remote/TranscodingDataStream.cpp index 1a1379b26..a9504b111 100644 --- a/src/plugins/websocket_remote/TranscodingDataStream.cpp +++ b/src/plugins/websocket_remote/TranscodingDataStream.cpp @@ -134,17 +134,17 @@ bool TranscodingDataStream::Close() { void TranscodingDataStream::Dispose() { if (this->pcmBuffer) { - this->pcmBuffer->Destroy(); + this->pcmBuffer->Release(); this->pcmBuffer = nullptr; } if (this->decoder) { - this->decoder->Destroy(); + this->decoder->Release(); this->decoder = nullptr; } if (this->input) { - this->input->Destroy(); + this->input->Release(); this->input = nullptr; } @@ -167,7 +167,7 @@ void TranscodingDataStream::Interrupt() { this->interrupted = true; } -void TranscodingDataStream::Destroy() { +void TranscodingDataStream::Release() { this->Dispose(); } diff --git a/src/plugins/websocket_remote/TranscodingDataStream.h b/src/plugins/websocket_remote/TranscodingDataStream.h index 870b98e9c..8027708c8 100644 --- a/src/plugins/websocket_remote/TranscodingDataStream.h +++ b/src/plugins/websocket_remote/TranscodingDataStream.h @@ -62,7 +62,7 @@ class TranscodingDataStream : public musik::core::sdk::IDataStream { virtual bool Open(const char *uri, unsigned int options = 0) override; virtual bool Close() override; virtual void Interrupt() override; - virtual void Destroy() override; + virtual void Release() override; virtual PositionType Read(void *buffer, PositionType readBytes) override; virtual bool SetPosition(PositionType position) override; virtual PositionType Position() override; diff --git a/src/plugins/websocket_remote/main.cpp b/src/plugins/websocket_remote/main.cpp index e79c4bec6..b6ce687ae 100644 --- a/src/plugins/websocket_remote/main.cpp +++ b/src/plugins/websocket_remote/main.cpp @@ -74,7 +74,7 @@ static class PlaybackRemote : public IPlaybackRemote { this->Stop(); } - virtual void Destroy() { + virtual void Release() { } void Reload() { @@ -158,7 +158,7 @@ static class Plugin : public IPlugin { boost::filesystem::path::imbue(utf8Locale); } - virtual void Destroy() { } + virtual void Release() { } virtual const char* Name() { return "WebSockets IPlaybackRemote"; } virtual const char* Version() { return "0.6.0"; } virtual const char* Author() { return "clangen"; } diff --git a/src/plugins/win32gdivis/GdiVis.cpp b/src/plugins/win32gdivis/GdiVis.cpp index bca5abbae..cb4fe3ecd 100644 --- a/src/plugins/win32gdivis/GdiVis.cpp +++ b/src/plugins/win32gdivis/GdiVis.cpp @@ -203,7 +203,7 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD reason, LPVOID lpReserved) { class VisualizerPlugin : public musik::core::sdk::IPlugin { public: - virtual void Destroy() { delete this; } + virtual void Release() { delete this; } virtual const char* Name() { return "GdiVis"; } virtual const char* Version() { return "0.2.0"; } virtual const char* Author() { return "clangen"; } @@ -220,7 +220,7 @@ class Visualizer : public musik::core::sdk::ISpectrumVisualizer { return "GdiVis"; } - virtual void Destroy() { + virtual void Release() { this->Hide(); delete this; } diff --git a/src/plugins/win32globalhotkeys/win32globalhotkeys_plugin.cpp b/src/plugins/win32globalhotkeys/win32globalhotkeys_plugin.cpp index 9c1659fe5..91b0518e2 100644 --- a/src/plugins/win32globalhotkeys/win32globalhotkeys_plugin.cpp +++ b/src/plugins/win32globalhotkeys/win32globalhotkeys_plugin.cpp @@ -157,7 +157,7 @@ class MMShellHook: public musik::core::sdk::IPlugin, public musik::core::sdk::IPlaybackRemote { public: - virtual void Destroy() { + virtual void Release() { } virtual const char* Name() {