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

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

Browse Source 
Change-Id: I84b36fa41f3d5f8fea2dec2545f72ebe6a0c7908
This commit is contained in:
Oswald Buddenhagen
2014-02-19 10:04:30 +01:00
parent 391e8a7147 01714ef0c5
commit 13882cd5da
103 changed files with 955 additions and 625 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/wmf/decoder/mfdecoderservice.cpp
View File

@@ -64,4 +64,4 @@ void MFAudioDecoderService::releaseControl(QMediaControl *control)
if (control && control->inherits("MFAudioDecoderControl")) {
delete control;
}
}
}

2
src/plugins/wmf/decoder/mfdecodersourcereader.cpp
View File

@@ -196,4 +196,4 @@ STDMETHODIMP MFDecoderSourceReader::OnFlush(DWORD)
STDMETHODIMP MFDecoderSourceReader::OnEvent(DWORD, IMFMediaEvent*)
{
return S_OK;
}
}

2
src/plugins/wmf/player/mfplayercontrol.cpp
View File

@@ -58,7 +58,7 @@ MFPlayerControl::MFPlayerControl(MFPlayerSession *session)
QObject::connect(m_session, SIGNAL(audioAvailable()), this, SLOT(handleAudioAvailable()));
QObject::connect(m_session, SIGNAL(durationUpdate(qint64)), this, SLOT(handleDurationUpdate(qint64)));
QObject::connect(m_session, SIGNAL(seekableUpdate(bool)), this, SLOT(handleSeekableUpdate(bool)));
QObject::connect(m_session, SIGNAL(error(QMediaPlayer::Error, QString, bool)), this, SLOT(handleError(QMediaPlayer::Error, QString, bool)));
QObject::connect(m_session, SIGNAL(error(QMediaPlayer::Error,QString,bool)), this, SLOT(handleError(QMediaPlayer::Error,QString,bool)));
QObject::connect(m_session, SIGNAL(positionChanged(qint64)), this, SIGNAL(positionChanged(qint64)));
QObject::connect(m_session, SIGNAL(volumeChanged(int)), this, SIGNAL(volumeChanged(int)));
QObject::connect(m_session, SIGNAL(mutedChanged(bool)), this, SIGNAL(mutedChanged(bool)));

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

@@ -93,7 +93,7 @@ MFPlayerSession::MFPlayerSession(MFPlayerService *playerService)
, m_audioSampleGrabberNode(0)
, m_videoProbeMFT(0)
{
QObject::connect(this, SIGNAL(sessionEvent(IMFMediaEvent *)), this, SLOT(handleSessionEvent(IMFMediaEvent *)));
QObject::connect(this, SIGNAL(sessionEvent(IMFMediaEvent*)), this, SLOT(handleSessionEvent(IMFMediaEvent*)));
m_pendingState = NoPending;
ZeroMemory(&m_state, sizeof(m_state));