diff --git a/src/Magnum/Audio/AbstractImporter.cpp b/src/Magnum/Audio/AbstractImporter.cpp index 10673412d..e48da7450 100644 --- a/src/Magnum/Audio/AbstractImporter.cpp +++ b/src/Magnum/Audio/AbstractImporter.cpp @@ -31,10 +31,8 @@ #include #include #include -#include /** @todo remove once AbstractImporter is -free */ #include #include -#include /** @todo remove once AbstractImporter is -free */ #include #ifndef CORRADE_PLUGINMANAGER_NO_DYNAMIC_PLUGIN_SUPPORT @@ -97,13 +95,13 @@ void AbstractImporter::doOpenData(Containers::ArrayView) { CORRADE_ASSERT_UNREACHABLE("Audio::AbstractImporter::openData(): feature advertised but not implemented", ); } -bool AbstractImporter::openFile(const std::string& filename) { +bool AbstractImporter::openFile(const Containers::StringView filename) { close(); doOpenFile(filename); return isOpened(); } -void AbstractImporter::doOpenFile(const std::string& filename) { +void AbstractImporter::doOpenFile(const Containers::StringView filename) { CORRADE_ASSERT(features() & ImporterFeature::OpenData, "Audio::AbstractImporter::openFile(): not implemented", ); /* Open file */ diff --git a/src/Magnum/Audio/AbstractImporter.h b/src/Magnum/Audio/AbstractImporter.h index 00e0e9357..e86a53131 100644 --- a/src/Magnum/Audio/AbstractImporter.h +++ b/src/Magnum/Audio/AbstractImporter.h @@ -31,11 +31,15 @@ */ #include -#include #include "Magnum/Magnum.h" #include "Magnum/Audio/BufferFormat.h" +#ifdef MAGNUM_BUILD_DEPRECATED +/* For APIs that used to take a std::string */ +#include +#endif + namespace Magnum { namespace Audio { /** @@ -185,7 +189,7 @@ class MAGNUM_AUDIO_EXPORT AbstractImporter: public PluginManager::AbstractManagi * returns @cpp false @ce. * @see @ref features(), @ref openData() */ - bool openFile(const std::string& filename); + bool openFile(Containers::StringView filename); /** @brief Close file */ void close(); @@ -224,7 +228,7 @@ class MAGNUM_AUDIO_EXPORT AbstractImporter: public PluginManager::AbstractManagi * implementation opens the file and calls @ref doOpenData() with its * contents. */ - virtual void doOpenFile(const std::string& filename); + virtual void doOpenFile(Containers::StringView filename); /** @brief Implementation for @ref close() */ virtual void doClose() = 0; @@ -257,7 +261,7 @@ updated interface string. */ /* Silly indentation to make the string appear in pluginInterface() docs */ #define MAGNUM_AUDIO_ABSTRACTIMPORTER_PLUGIN_INTERFACE /* [interface] */ \ -"cz.mosra.magnum.Audio.AbstractImporter/0.1" +"cz.mosra.magnum.Audio.AbstractImporter/0.1.1" /* [interface] */ }} diff --git a/src/Magnum/Audio/Test/AbstractImporterTest.cpp b/src/Magnum/Audio/Test/AbstractImporterTest.cpp index 4184660dc..5c18143fc 100644 --- a/src/Magnum/Audio/Test/AbstractImporterTest.cpp +++ b/src/Magnum/Audio/Test/AbstractImporterTest.cpp @@ -24,10 +24,8 @@ DEALINGS IN THE SOFTWARE. */ -#include /** @todo remove once AbstractImporter is -free */ #include #include -#include /** @todo remove once AbstractImporter is -free */ #include #include #include diff --git a/src/MagnumPlugins/AnyAudioImporter/AnyImporter.cpp b/src/MagnumPlugins/AnyAudioImporter/AnyImporter.cpp index fe6603cff..deba2f936 100644 --- a/src/MagnumPlugins/AnyAudioImporter/AnyImporter.cpp +++ b/src/MagnumPlugins/AnyAudioImporter/AnyImporter.cpp @@ -52,7 +52,7 @@ bool AnyImporter::doIsOpened() const { return !!_in; } void AnyImporter::doClose() { _in = nullptr; } -void AnyImporter::doOpenFile(const std::string& filename) { +void AnyImporter::doOpenFile(const Containers::StringView filename) { CORRADE_INTERNAL_ASSERT(manager()); /* We don't detect any double extensions yet, so we can normalize just the diff --git a/src/MagnumPlugins/AnyAudioImporter/AnyImporter.h b/src/MagnumPlugins/AnyAudioImporter/AnyImporter.h index 8490c52fa..93d1cb4df 100644 --- a/src/MagnumPlugins/AnyAudioImporter/AnyImporter.h +++ b/src/MagnumPlugins/AnyAudioImporter/AnyImporter.h @@ -134,7 +134,7 @@ class MAGNUM_ANYAUDIOIMPORTER_EXPORT AnyImporter: public AbstractImporter { MAGNUM_ANYAUDIOIMPORTER_LOCAL ImporterFeatures doFeatures() const override; MAGNUM_ANYAUDIOIMPORTER_LOCAL bool doIsOpened() const override; MAGNUM_ANYAUDIOIMPORTER_LOCAL void doClose() override; - MAGNUM_ANYAUDIOIMPORTER_LOCAL void doOpenFile(const std::string& filename) override; + MAGNUM_ANYAUDIOIMPORTER_LOCAL void doOpenFile(const Containers::StringView filename) override; MAGNUM_ANYAUDIOIMPORTER_LOCAL BufferFormat doFormat() const override; MAGNUM_ANYAUDIOIMPORTER_LOCAL UnsignedInt doFrequency() const override;