diff options
| author | Uwe Klotz <uwe_klotz@web.de> | 2015-10-13 12:43:51 +0200 |
|---|---|---|
| committer | Uwe Klotz <uwe_klotz@web.de> | 2015-10-13 12:43:51 +0200 |
| commit | 72d77267d4ab12518d2a5af8c545f8ad7442f6f2 (patch) | |
| tree | abbbb5a6e6e25160ff7097ec1d73f9b2c197e82a /plugins | |
| parent | 344ae07a8ab8ed2058de6bb9be910286212f2170 (diff) | |
Fix conversion from std::wstring to null-terminated wchar_t*
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/soundsourcem4a/soundsourcem4a.cpp | 4 | ||||
| -rw-r--r-- | plugins/soundsourcemediafoundation/soundsourcemediafoundation.cpp | 4 | ||||
| -rw-r--r-- | plugins/soundsourcewv/soundsourcewv.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/plugins/soundsourcem4a/soundsourcem4a.cpp b/plugins/soundsourcem4a/soundsourcem4a.cpp index f252d9139c..10d9a9958b 100644 --- a/plugins/soundsourcem4a/soundsourcem4a.cpp +++ b/plugins/soundsourcem4a/soundsourcem4a.cpp @@ -182,7 +182,7 @@ inline long unsigned SoundSourceM4A::length(){ Result SoundSourceM4A::parseHeader(){ #ifdef _WIN32 - TagLib::MP4::File f(getFilename().toStdWString().data()); + TagLib::MP4::File f(getFilename().toStdWString().c_str()); #else TagLib::MP4::File f(getFilename().toLocal8Bit().constData()); #endif @@ -208,7 +208,7 @@ Result SoundSourceM4A::parseHeader(){ QImage SoundSourceM4A::parseCoverArt() { #ifdef _WIN32 - TagLib::MP4::File f(getFilename().toStdWString().data()); + TagLib::MP4::File f(getFilename().toStdWString().c_str()); #else TagLib::MP4::File f(getFilename().toLocal8Bit().constData()); #endif diff --git a/plugins/soundsourcemediafoundation/soundsourcemediafoundation.cpp b/plugins/soundsourcemediafoundation/soundsourcemediafoundation.cpp index 95f1767385..da95876f84 100644 --- a/plugins/soundsourcemediafoundation/soundsourcemediafoundation.cpp +++ b/plugins/soundsourcemediafoundation/soundsourcemediafoundation.cpp @@ -375,7 +375,7 @@ inline unsigned long SoundSourceMediaFoundation::length() Result SoundSourceMediaFoundation::parseHeader() { - TagLib::MP4::File f(getFilename().toStdWString().data()); + TagLib::MP4::File f(getFilename().toStdWString().c_str()); if (!readFileHeader(this, f)) { return ERR; } @@ -398,7 +398,7 @@ Result SoundSourceMediaFoundation::parseHeader() QImage SoundSourceMediaFoundation::parseCoverArt() { setType("m4a"); - TagLib::MP4::File f(getFilename().toStdWString().data()); + TagLib::MP4::File f(getFilename().toStdWString().c_str()); TagLib::MP4::Tag *mp4(f.tag()); if (mp4) { return Mixxx::getCoverInMP4Tag(*mp4); diff --git a/plugins/soundsourcewv/soundsourcewv.cpp b/plugins/soundsourcewv/soundsourcewv.cpp index db88fc8f8e..3d0107356f 100644 --- a/plugins/soundsourcewv/soundsourcewv.cpp +++ b/plugins/soundsourcewv/soundsourcewv.cpp @@ -161,7 +161,7 @@ inline long unsigned SoundSourceWV::length(){ Result SoundSourceWV::parseHeader() { #ifdef _WIN32 - TagLib::WavPack::File f(getFilename().toStdWString().data()); + TagLib::WavPack::File f(getFilename().toStdWString().c_str()); #else TagLib::WavPack::File f(getFilename().toLocal8Bit().constData()); #endif @@ -187,7 +187,7 @@ Result SoundSourceWV::parseHeader() { QImage SoundSourceWV::parseCoverArt() { #ifdef _WIN32 - TagLib::WavPack::File f(getFilename().toStdWString().data()); + TagLib::WavPack::File f(getFilename().toStdWString().c_str()); #else TagLib::WavPack::File f(getFilename().toLocal8Bit().constData()); #endif |