slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix debug stream operators.

Browse Source 
- Use QDebugStateSaver to restore space setting in stream operators
  instead of returning dbg.space() which breaks formatting on streams
  that already have nospace() set.
- Fix some single character string constants, streamline code.

Change-Id: I18ae7324b172ea801aa9b5fe56ddf6fe527fdde9
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
This commit is contained in:
Friedemann Kleint
2015-04-01 17:09:45 +02:00
parent 9fccf8064d
commit 4d17db19f8
9 changed files with 150 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/multimedia/audio/qaudio.cpp
View File

@@ -86,59 +86,62 @@ Q_CONSTRUCTOR_FUNCTION(qRegisterAudioMetaTypes)
#ifndef QT_NO_DEBUG_STREAM
QDebug operator<<(QDebug dbg, QAudio::Error error)
{
QDebug nospace = dbg.nospace();
QDebugStateSaver saver(dbg);
dbg.nospace();
switch (error) {
case QAudio::NoError:
nospace << "NoError";
dbg << "NoError";
break;
case QAudio::OpenError:
nospace << "OpenError";
dbg << "OpenError";
break;
case QAudio::IOError:
nospace << "IOError";
dbg << "IOError";
break;
case QAudio::UnderrunError:
nospace << "UnderrunError";
dbg << "UnderrunError";
break;
case QAudio::FatalError:
nospace << "FatalError";
dbg << "FatalError";
break;
}
return nospace;
return dbg;
}
QDebug operator<<(QDebug dbg, QAudio::State state)
{
QDebug nospace = dbg.nospace();
QDebugStateSaver saver(dbg);
dbg.nospace();
switch (state) {
case QAudio::ActiveState:
nospace << "ActiveState";
dbg << "ActiveState";
break;
case QAudio::SuspendedState:
nospace << "SuspendedState";
dbg << "SuspendedState";
break;
case QAudio::StoppedState:
nospace << "StoppedState";
dbg << "StoppedState";
break;
case QAudio::IdleState:
nospace << "IdleState";
dbg << "IdleState";
break;
}
return nospace;
return dbg;
}
QDebug operator<<(QDebug dbg, QAudio::Mode mode)
{
QDebug nospace = dbg.nospace();
QDebugStateSaver saver(dbg);
dbg.nospace();
switch (mode) {
case QAudio::AudioInput:
nospace << "AudioInput";
dbg << "AudioInput";
break;
case QAudio::AudioOutput:
nospace << "AudioOutput";
dbg << "AudioOutput";
break;
}
return nospace;
return dbg;
}
#endif

37
src/multimedia/audio/qaudioformat.cpp
View File

@@ -459,49 +459,50 @@ int QAudioFormat::bytesPerFrame() const
#ifndef QT_NO_DEBUG_STREAM
QDebug operator<<(QDebug dbg, QAudioFormat::Endian endian)
{
QDebug nospace = dbg.nospace();
QDebugStateSaver saver(dbg);
dbg.nospace();
switch (endian) {
case QAudioFormat::BigEndian:
nospace << "BigEndian";
dbg << "BigEndian";
break;
case QAudioFormat::LittleEndian:
nospace << "LittleEndian";
dbg << "LittleEndian";
break;
}
return nospace;
return dbg;
}
QDebug operator<<(QDebug dbg, QAudioFormat::SampleType type)
{
QDebug nospace = dbg.nospace();
QDebugStateSaver saver(dbg);
dbg.nospace();
switch (type) {
case QAudioFormat::SignedInt:
nospace << "SignedInt";
dbg << "SignedInt";
break;
case QAudioFormat::UnSignedInt:
nospace << "UnSignedInt";
dbg << "UnSignedInt";
break;
case QAudioFormat::Float:
nospace << "Float";
dbg << "Float";
break;
default:
nospace << "Unknown";
dbg << "Unknown";
break;
}
return nospace;
return dbg;
}
QDebug operator<<(QDebug dbg, const QAudioFormat &f)
{
dbg.nospace() << "QAudioFormat(" << f.sampleRate();
dbg.nospace() << "Hz, " << f.sampleSize();
dbg.nospace() << "bit, channelCount=" << f.channelCount();
dbg.nospace() << ", sampleType=" << f.sampleType();
dbg.nospace() << ", byteOrder=" << f.byteOrder();
dbg.nospace() << ", codec=" << f.codec();
dbg.nospace() << ")";
QDebugStateSaver saver(dbg);
dbg.nospace();
dbg << "QAudioFormat(" << f.sampleRate() << "Hz, "
<< f.sampleSize() << "bit, channelCount=" << f.channelCount()
<< ", sampleType=" << f.sampleType() << ", byteOrder=" << f.byteOrder()
<< ", codec=" << f.codec() << ')';
return dbg.space();
return dbg;
}
#endif