diff options
| author | Volker Hilsheimer <volker.hilsheimer@nokia.com> | 2009-07-01 13:50:50 (GMT) |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@nokia.com> | 2009-07-01 13:50:50 (GMT) |
| commit | 7863bb9b96b482d74ad2f5fb3cb3b5716c8e45ef (patch) | |
| tree | f4558113ca2723b5de3443a289b03b98a49371cf /src/3rdparty | |
| parent | 0b3eaca3f40bde96380544f19c9b8874a60bbdeb (diff) | |
| parent | 7ab895f576b8ef8380838778958fae651a550f79 (diff) | |
| download | Qt-7863bb9b96b482d74ad2f5fb3cb3b5716c8e45ef.zip Qt-7863bb9b96b482d74ad2f5fb3cb3b5716c8e45ef.tar.gz Qt-7863bb9b96b482d74ad2f5fb3cb3b5716c8e45ef.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/phonon/ds9/qaudiocdreader.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/3rdparty/phonon/ds9/qaudiocdreader.cpp b/src/3rdparty/phonon/ds9/qaudiocdreader.cpp index b9f9fd6..d5bdce2 100644 --- a/src/3rdparty/phonon/ds9/qaudiocdreader.cpp +++ b/src/3rdparty/phonon/ds9/qaudiocdreader.cpp @@ -154,10 +154,7 @@ namespace Phonon path = QString::fromLatin1("\\\\.\\%1:").arg(drive); } - m_cddrive = QT_WA_INLINE ( - ::CreateFile( (TCHAR*)path.utf16(), GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL ), - ::CreateFileA( path.toLocal8Bit().constData(), GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL ) - ); + m_cddrive = ::CreateFile((const wchar_t *)path.utf16(), GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); qMemSet(m_toc, 0, sizeof(CDROM_TOC)); //read the TOC |