Mercurial > hg > svcore
diff data/fileio/QuickTimeFileReader.cpp @ 742:c10cb8782576 coreaudio_tests
Merge from branch "default"
author | Chris Cannam |
---|---|
date | Sun, 01 Jul 2012 11:53:00 +0100 |
parents | 3b00c1650490 |
children | e802e550a1f2 |
line wrap: on
line diff
--- a/data/fileio/QuickTimeFileReader.cpp Mon Nov 29 12:45:39 2010 +0000 +++ b/data/fileio/QuickTimeFileReader.cpp Sun Jul 01 11:53:00 2012 +0100 @@ -66,7 +66,7 @@ Profiler profiler("QuickTimeFileReader::QuickTimeFileReader", true); -std::cerr << "QuickTimeFileReader: path is \"" << m_path.toStdString() << "\"" << std::endl; +SVDEBUG << "QuickTimeFileReader: path is \"" << m_path << "\"" << endl; long QTversion; @@ -89,10 +89,12 @@ // (0, m_path.toLocal8Bit().data(), 0); + QByteArray ba = m_path.toLocal8Bit(); + CFURLRef url = CFURLCreateFromFileSystemRepresentation (kCFAllocatorDefault, - (const UInt8 *)m_path.toLocal8Bit().data(), - (CFIndex)m_path.length(), + (const UInt8 *)ba.data(), + (CFIndex)ba.length(), false); @@ -265,12 +267,12 @@ } } - std::cerr << "QuickTimeFileReader::QuickTimeFileReader: frame count is now " << getFrameCount() << ", error is \"\"" << m_error.toStdString() << "\"" << std::endl; + std::cerr << "QuickTimeFileReader::QuickTimeFileReader: frame count is now " << getFrameCount() << ", error is \"\"" << m_error << "\"" << std::endl; } QuickTimeFileReader::~QuickTimeFileReader() { - std::cerr << "QuickTimeFileReader::~QuickTimeFileReader" << std::endl; + SVDEBUG << "QuickTimeFileReader::~QuickTimeFileReader" << endl; if (m_decodeThread) { m_cancelled = true;