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

Merge remote-tracking branch 'origin/stable' into dev

Browse Source 
Change-Id: I9c1abddf20e85cc0f29f2da26c398b7180e4f479
This commit is contained in:
Frederik Gladhorn
2013-12-05 18:45:33 +01:00
parent c5706f05a8 99bebdbb7d
commit 75e5708832
10 changed files with 144 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qnx/mediaplayer/ppsmediaplayercontrol.cpp
View File

@@ -57,7 +57,7 @@ PpsMediaPlayerControl::PpsMediaPlayerControl(QObject *parent)
m_ppsStatusFd(-1),
m_ppsStateNotifier(0),
m_ppsStateFd(-1)
, m_previouslySeenState("STOPPED")
, m_previouslySeenState("stopped")
{
openConnection();
}
@@ -177,7 +177,7 @@ void PpsMediaPlayerControl::ppsReadyRead(int fd)
if (pps_decoder_get_string(&decoder, "state", &value) == PPS_DECODER_OK) {
const QByteArray state = value;
if (state != m_previouslySeenState && state == "STOPPED")
if (state != m_previouslySeenState && state == "stopped")
handleMmStopped();
m_previouslySeenState = state;
}