--- a/src/3rdparty/phonon/mmf/ancestormovemonitor.cpp Tue Feb 02 00:43:10 2010 +0200
+++ b/src/3rdparty/phonon/mmf/ancestormovemonitor.cpp Wed Mar 31 11:06:36 2010 +0300
@@ -18,7 +18,8 @@
#include "ancestormovemonitor.h"
#include "utils.h"
-#include "videooutput.h"
+
+#include "videooutput_dsa.h"
#include <QCoreApplication>
@@ -59,7 +60,7 @@
// Public functions
//-----------------------------------------------------------------------------
-void AncestorMoveMonitor::registerTarget(VideoOutput *target)
+void AncestorMoveMonitor::registerTarget(DsaVideoOutput *target)
{
TRACE_CONTEXT(AncestorMoveMonitor::registerTarget, EVideoInternal);
TRACE_ENTRY("target 0x%08x", target);
@@ -93,7 +94,7 @@
TRACE_EXIT_0();
}
-void AncestorMoveMonitor::unRegisterTarget(VideoOutput *target)
+void AncestorMoveMonitor::unRegisterTarget(DsaVideoOutput *target)
{
TRACE_CONTEXT(AncestorMoveMonitor::unRegisterTarget, EVideoInternal);
TRACE_ENTRY("target 0x%08x", target);
@@ -126,7 +127,7 @@
const Hash::const_iterator it = m_hash.find(watched);
if(it != m_hash.end()) {
const TargetList& targetList = it.value();
- VideoOutput* target = 0;
+ DsaVideoOutput* target = 0;
foreach(target, targetList) {
switch (event->type()) {
@@ -166,7 +167,7 @@
const QObject *ancestor = it.key();
TRACE("ancestor 0x%08x", ancestor);
const TargetList& targetList = it.value();
- VideoOutput* target = 0;
+ DsaVideoOutput* target = 0;
foreach(target, targetList) {
TRACE(" target 0x%08x", target);
}
@@ -174,7 +175,5 @@
#endif
}
-
-
QT_END_NAMESPACE