mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-15 10:33:59 +02:00
Code Issues Releases Wiki Activity

We always support complex filenames on Windows.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2014-11-08 06:29:36 +01:00
parent d78f39f24a
commit 19ce0a5f56
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libtomahawk/filemetadata/MetadataEditor.cpp
View File

@@ -90,11 +90,11 @@ MetadataEditor::writeMetadata( bool closeDlg )
QFileInfo fi( QUrl( m_result->url() ).toLocalFile() ); QFileInfo fi( QUrl( m_result->url() ).toLocalFile() );
bool changed = false; bool changed = false;
#ifdef COMPLEX_TAGLIB_FILENAME #ifdef Q_OS_WIN
const wchar_t *encodedName = fi.canonicalFilePath().toStdWString().c_str(); const wchar_t* encodedName = fi.canonicalFilePath().toStdWString().c_str();
#else #else
QByteArray fileName = QFile::encodeName( fi.canonicalFilePath() ); QByteArray fileName = QFile::encodeName( fi.canonicalFilePath() );
const char *encodedName = fileName.constData(); const char* encodedName = fileName.constData();
#endif #endif
TagLib::FileRef f( encodedName ); TagLib::FileRef f( encodedName );

6
src/libtomahawk/filemetadata/MusicScanner.cpp
View File

@@ -386,11 +386,11 @@ MusicScanner::readTags( const QFileInfo& fi )
if ( !TomahawkUtils::supportedExtensions().contains( suffix ) ) if ( !TomahawkUtils::supportedExtensions().contains( suffix ) )
return QVariantMap(); // invalid extension return QVariantMap(); // invalid extension
#ifdef COMPLEX_TAGLIB_FILENAME #ifdef Q_OS_WIN
const wchar_t *encodedName = fi.canonicalFilePath().toStdWString().c_str(); const wchar_t* encodedName = fi.canonicalFilePath().toStdWString().c_str();
#else #else
QByteArray fileName = QFile::encodeName( fi.canonicalFilePath() ); QByteArray fileName = QFile::encodeName( fi.canonicalFilePath() );
const char *encodedName = fileName.constData(); const char* encodedName = fileName.constData();
#endif #endif
TagLib::FileRef f( encodedName ); TagLib::FileRef f( encodedName );