summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew den Exter <andrew.den-exter@nokia.com>2010-04-27 05:34:12 (GMT)
committerAndrew den Exter <andrew.den-exter@nokia.com>2010-04-27 05:38:36 (GMT)
commite22b5c40225b90aa3042ed1091e8e75f576a07df (patch)
tree5c22454913663a9710c1f43e229552f1100eed1c
parent113fe7369e0eaeb6a77d97e3d73cedb062c21abb (diff)
downloadQt-e22b5c40225b90aa3042ed1091e8e75f576a07df.zip
Qt-e22b5c40225b90aa3042ed1091e8e75f576a07df.tar.gz
Qt-e22b5c40225b90aa3042ed1091e8e75f576a07df.tar.bz2
Fix attempted invocation of non-existent timerActivated() slot.
The slot in question was changed to an event handler that emitted a signal. Invoke the signal instead. Task-number: QTBUG-10145 Reviewed-by: Justin McPherson
-rw-r--r--src/plugins/mediaservices/directshow/mediaplayer/directshowsamplescheduler.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/mediaservices/directshow/mediaplayer/directshowsamplescheduler.cpp b/src/plugins/mediaservices/directshow/mediaplayer/directshowsamplescheduler.cpp
index 733080e..150860f 100644
--- a/src/plugins/mediaservices/directshow/mediaplayer/directshowsamplescheduler.cpp
+++ b/src/plugins/mediaservices/directshow/mediaplayer/directshowsamplescheduler.cpp
@@ -255,11 +255,11 @@ HRESULT DirectShowSampleScheduler::Receive(IMediaSample *pSample)
if (m_state == Running) {
if (!timedSample->schedule(m_clock, m_startTime, m_timeoutEvent)) {
// Timing information is unavailable, so schedule frames immediately.
- QMetaObject::invokeMethod(this, "timerActivated", Qt::QueuedConnection);
+ QMetaObject::invokeMethod(this, "sampleReady", Qt::QueuedConnection);
}
} else if (m_tail == m_head) {
// If this is the first frame make is available.
- QMetaObject::invokeMethod(this, "timerActivated", Qt::QueuedConnection);
+ QMetaObject::invokeMethod(this, "sampleReady", Qt::QueuedConnection);
}
return S_OK;