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

tr()-Fixes.

Browse Source 
Make WMF-player error message consistent (sentences,
no exclamation marks). Improve wording.

Change-Id: I876b26067fb374833037aa93dd9675ab556bf972
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
This commit is contained in:
Friedemann Kleint
2012-11-29 14:27:46 +01:00
committed by The Qt Project
parent 25fd41373a
commit f26ae01ec4
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/multimedia/playback/playlistfileparser.cpp
View File

@@ -275,7 +275,7 @@ Version=2
int entries = getValue(lineIndex, line).toInt(); int entries = getValue(lineIndex, line).toInt();
int count = m_readFlags == 0 ? (m_count - 1) : m_count; int count = m_readFlags == 0 ? (m_count - 1) : m_count;
if (entries != count) { if (entries != count) {
emit error(QPlaylistFileParser::FormatError, QString(tr("Error parsing pls: %1, expected count = %2")). emit error(QPlaylistFileParser::FormatError, QString(tr("Error parsing playlist: %1, expected count = %2")).
arg(line, QString::number(count))); arg(line, QString::number(count)));
} }
break; break;
@@ -289,7 +289,7 @@ Version=2
if (line.startsWith(QLatin1String("Version"))) { if (line.startsWith(QLatin1String("Version"))) {
int version = getValue(lineIndex, line).toInt(); int version = getValue(lineIndex, line).toInt();
if (version != 2) if (version != 2)
emit error(QPlaylistFileParser::FormatError, QString(tr("Error parsing pls at line[%1], expected version = 2")).arg(line)); emit error(QPlaylistFileParser::FormatError, QString(tr("Error parsing playlist at line[%1], expected version = 2")).arg(line));
} }
break; break;
} }
@@ -298,7 +298,7 @@ Version=2
QString getValue(int lineIndex, const QString& line) { QString getValue(int lineIndex, const QString& line) {
int start = line.indexOf('='); int start = line.indexOf('=');
if (start < 0) { if (start < 0) {
emit error(QPlaylistFileParser::FormatError, QString(tr("Error parsing pls at line[%1]:%2")).arg(QString::number(lineIndex), line)); emit error(QPlaylistFileParser::FormatError, QString(tr("Error parsing playlist at line[%1]:%2")).arg(QString::number(lineIndex), line));
return QString(); return QString();
} }
return line.mid(start + 1).trimmed(); return line.mid(start + 1).trimmed();

32
src/plugins/wmf/player/mfplayersession.cpp
View File

@@ -520,7 +520,7 @@ void MFPlayerSession::load(const QMediaContent &media, QIODevice *stream)
changeStatus(QMediaPlayer::NoMedia); changeStatus(QMediaPlayer::NoMedia);
} else if (stream && (!stream->isReadable())) { } else if (stream && (!stream->isReadable())) {
changeStatus(QMediaPlayer::InvalidMedia); changeStatus(QMediaPlayer::InvalidMedia);
emit error(QMediaPlayer::ResourceError, tr("Invalid stream source!"), true); emit error(QMediaPlayer::ResourceError, tr("Invalid stream source."), true);
} else { } else {
changeStatus(QMediaPlayer::LoadingMedia); changeStatus(QMediaPlayer::LoadingMedia);
m_sourceResolver->load(resources, stream); m_sourceResolver->load(resources, stream);
@@ -535,7 +535,7 @@ void MFPlayerSession::handleSourceError(long hr)
switch (hr) { switch (hr) {
case QMediaPlayer::FormatError: case QMediaPlayer::FormatError:
errorCode = QMediaPlayer::FormatError; errorCode = QMediaPlayer::FormatError;
errorString = tr("Attempting to play invalid Qt resource"); errorString = tr("Attempting to play invalid Qt resource.");
break; break;
case NS_E_FILE_NOT_FOUND: case NS_E_FILE_NOT_FOUND:
errorString = tr("The system cannot find the file specified."); errorString = tr("The system cannot find the file specified.");
@@ -571,7 +571,7 @@ void MFPlayerSession::handleMediaSourceReady()
setupPlaybackTopology(mediaSource, sourcePD); setupPlaybackTopology(mediaSource, sourcePD);
} else { } else {
changeStatus(QMediaPlayer::InvalidMedia); changeStatus(QMediaPlayer::InvalidMedia);
emit error(QMediaPlayer::ResourceError, tr("Can't create presentation descriptor!"), true); emit error(QMediaPlayer::ResourceError, tr("Cannot create presentation descriptor."), true);
} }
} }
@@ -583,7 +583,7 @@ void MFPlayerSession::setupPlaybackTopology(IMFMediaSource *source, IMFPresentat
hr = sourcePD->GetStreamDescriptorCount(&cSourceStreams); hr = sourcePD->GetStreamDescriptorCount(&cSourceStreams);
if (FAILED(hr)) { if (FAILED(hr)) {
changeStatus(QMediaPlayer::UnknownMediaStatus); changeStatus(QMediaPlayer::UnknownMediaStatus);
emit error(QMediaPlayer::ResourceError, tr("Failed to get stream count"), true); emit error(QMediaPlayer::ResourceError, tr("Failed to get stream count."), true);
return; return;
} }
@@ -591,7 +591,7 @@ void MFPlayerSession::setupPlaybackTopology(IMFMediaSource *source, IMFPresentat
hr = MFCreateTopology(&topology); hr = MFCreateTopology(&topology);
if (FAILED(hr)) { if (FAILED(hr)) {
changeStatus(QMediaPlayer::UnknownMediaStatus); changeStatus(QMediaPlayer::UnknownMediaStatus);
emit error(QMediaPlayer::ResourceError, tr("Failed to create topology!"), true); emit error(QMediaPlayer::ResourceError, tr("Failed to create topology."), true);
return; return;
} }
@@ -624,7 +624,7 @@ void MFPlayerSession::setupPlaybackTopology(IMFMediaSource *source, IMFPresentat
if (!connected) if (!connected)
hr = sourceNode->ConnectOutput(0, outputNode, 0); hr = sourceNode->ConnectOutput(0, outputNode, 0);
if (FAILED(hr)) { if (FAILED(hr)) {
emit error(QMediaPlayer::FormatError, tr("Unable to play some stream"), false); emit error(QMediaPlayer::FormatError, tr("Unable to play any stream."), false);
} }
else { else {
succeededCount++; succeededCount++;
@@ -647,7 +647,7 @@ void MFPlayerSession::setupPlaybackTopology(IMFMediaSource *source, IMFPresentat
if (succeededCount == 0) { if (succeededCount == 0) {
changeStatus(QMediaPlayer::InvalidMedia); changeStatus(QMediaPlayer::InvalidMedia);
emit error(QMediaPlayer::ResourceError, tr("Unable to play"), true); emit error(QMediaPlayer::ResourceError, tr("Unable to play."), true);
} else { } else {
if (outputNodeId != -1) { if (outputNodeId != -1) {
topology = insertMFT(topology, outputNodeId); topology = insertMFT(topology, outputNodeId);
@@ -656,7 +656,7 @@ void MFPlayerSession::setupPlaybackTopology(IMFMediaSource *source, IMFPresentat
hr = m_session->SetTopology(MFSESSION_SETTOPOLOGY_IMMEDIATE, topology); hr = m_session->SetTopology(MFSESSION_SETTOPOLOGY_IMMEDIATE, topology);
if (FAILED(hr)) { if (FAILED(hr)) {
changeStatus(QMediaPlayer::UnknownMediaStatus); changeStatus(QMediaPlayer::UnknownMediaStatus);
emit error(QMediaPlayer::ResourceError, tr("Failed to set topology!"), true); emit error(QMediaPlayer::ResourceError, tr("Failed to set topology."), true);
} }
} }
topology->Release(); topology->Release();
@@ -717,7 +717,7 @@ IMFTopologyNode* MFPlayerSession::addOutputNode(IMFStreamDescriptor *streamDesc,
} }
} else { } else {
// Unknown stream type. // Unknown stream type.
emit error(QMediaPlayer::FormatError, tr("Unknown stream type"), false); emit error(QMediaPlayer::FormatError, tr("Unknown stream type."), false);
} }
if (activate) { if (activate) {
@@ -1083,7 +1083,7 @@ void MFPlayerSession::stop(bool immediate)
m_varStart.hVal.QuadPart = 0; m_varStart.hVal.QuadPart = 0;
} }
} else { } else {
emit error(QMediaPlayer::ResourceError, tr("failed to stop"), true); emit error(QMediaPlayer::ResourceError, tr("Failed to stop."), true);
} }
} }
} }
@@ -1136,7 +1136,7 @@ void MFPlayerSession::pause()
m_state.setCommand(CmdPause); m_state.setCommand(CmdPause);
m_pendingState = CmdPending; m_pendingState = CmdPending;
} else { } else {
emit error(QMediaPlayer::ResourceError, tr("failed to pause"), false); emit error(QMediaPlayer::ResourceError, tr("Failed to pause."), false);
} }
} }
} }
@@ -1163,14 +1163,14 @@ void MFPlayerSession::createSession()
HRESULT hr = MFCreateMediaSession(NULL, &m_session); HRESULT hr = MFCreateMediaSession(NULL, &m_session);
if (FAILED(hr)) { if (FAILED(hr)) {
changeStatus(QMediaPlayer::UnknownMediaStatus); changeStatus(QMediaPlayer::UnknownMediaStatus);
emit error(QMediaPlayer::ResourceError, tr("Unable to create mediasession"), true); emit error(QMediaPlayer::ResourceError, tr("Unable to create mediasession."), true);
} }
hr = m_session->BeginGetEvent(this, m_session); hr = m_session->BeginGetEvent(this, m_session);
if (FAILED(hr)) { if (FAILED(hr)) {
changeStatus(QMediaPlayer::UnknownMediaStatus); changeStatus(QMediaPlayer::UnknownMediaStatus);
emit error(QMediaPlayer::ResourceError, tr("Unable to pulling session events"), false); emit error(QMediaPlayer::ResourceError, tr("Unable to pull session events."), false);
} }
} }
@@ -1235,7 +1235,7 @@ void MFPlayerSession::setPositionInternal(qint64 position, Command requestCmd)
m_state.start = position; m_state.start = position;
m_pendingState = SeekPending; m_pendingState = SeekPending;
} else { } else {
emit error(QMediaPlayer::ResourceError, tr("failed to seek"), true); emit error(QMediaPlayer::ResourceError, tr("Failed to seek."), true);
} }
} }
@@ -1537,14 +1537,14 @@ void MFPlayerSession::handleSessionEvent(IMFMediaEvent *sessionEvent)
sessionEvent->GetValue(&var); sessionEvent->GetValue(&var);
qWarning() << "handleSessionEvent: non fatal error = " << var.ulVal; qWarning() << "handleSessionEvent: non fatal error = " << var.ulVal;
PropVariantClear(&var); PropVariantClear(&var);
emit error(QMediaPlayer::ResourceError, tr("media session non-fatal error!"), false); emit error(QMediaPlayer::ResourceError, tr("Media session non-fatal error."), false);
} }
break; break;
case MESourceUnknown: case MESourceUnknown:
changeStatus(QMediaPlayer::InvalidMedia); changeStatus(QMediaPlayer::InvalidMedia);
case MEError: case MEError:
qWarning() << "handleSessionEvent: serious error = " << hrStatus; qWarning() << "handleSessionEvent: serious error = " << hrStatus;
emit error(QMediaPlayer::ResourceError, tr("media session serious error!"), true); emit error(QMediaPlayer::ResourceError, tr("Media session serious error."), true);
break; break;
case MESessionRateChanged: case MESessionRateChanged:
// If the rate change succeeded, we've already got the rate // If the rate change succeeded, we've already got the rate