SVN commit 764705 by jbache:

Submit build fixes from Andre Moreira Magalhaes



 M  +1 -0      CMakeLists.txt  
 M  +1 -3      abstractvideowidget.cpp  
 M  +8 -5      abstractvideowidget.h  
 M  +7 -3      audioeffect.h  
 M  +6 -3      audiooutput.h  
 M  +5 -3      backend.h  
 M  +7 -5      common.h  
 M  +6 -2      devicemanager.h  
 M  +6 -2      effect.h  
 M  +6 -3      effectmanager.h  
 M  +6 -0      gsthelper.h  
 M  +5 -3      medianode.h  
 M  +2 -1      medianodeevent.h  
 M  +4 -2      mediaobject.h  
 M  +4 -1      message.h  
 M  +6 -0      qwidgetvideosink.h  
 M  +3 -2      videowidget.h  
 M  +7 -3      volumefadereffect.h  
 M  +5 -0      xvideowidget.h  


--- trunk/kdereview/phonon/gstreamer/CMakeLists.txt #764704:764705
@@ -35,6 +35,7 @@
      message.cpp
      audioeffect.cpp
      xvideowidget.cpp
+     volumefadereffect.cpp
     )
 
     kde4_add_plugin(phonon_gstreamer ${phonon_gstreamer_SRCS})
--- trunk/kdereview/phonon/gstreamer/abstractvideowidget.cpp #764704:764705
@@ -22,9 +22,7 @@
 #include <QtGui/QPainter>
 #include <QtGui/QBoxLayout>
 #include <QApplication>
-#include <X11/Xlib.h>
 #include <gst/gst.h>
-#include <gst/interfaces/xoverlay.h>
 #include <gst/interfaces/propertyprobe.h>
 #include "mediaobject.h"
 #include "message.h"
@@ -106,7 +104,7 @@
                 gst_element_add_pad (m_videoBin, gst_ghost_pad_new ("sink", videopad));
                 gst_object_unref (videopad);
                 if (widget()->parentWidget())
-                    widget()->parentWidget()->winId();// Due to some existing issues with alien in 4.4, 
+                    widget()->parentWidget()->winId();// Due to some existing issues with alien in 4.4,
                                                      //  we must currently force the creation of a parent widget.
                 m_isValid = true; //initialization ok, accept input
             }
--- trunk/kdereview/phonon/gstreamer/abstractvideowidget.h #764704:764705
@@ -18,14 +18,17 @@
 #ifndef Phonon_UI_GSTREAMER_ABSTRACTVIDEOWIDGET_H
 #define Phonon_UI_GSTREAMER_ABSTRACTVIDEOWIDGET_H
 
+#include "backend.h"
+#include "common.h"
+#include "medianode.h"
+
+#include <phonon/videowidget.h>
+#include <phonon/videowidgetinterface.h>
+
 #include <QtGui/QPixmap>
 #include <QtGui/QWidget>
-#include <phonon/videowidget.h>
-#include <phonon/videowidgetinterface.h>
+
 #include <gst/gst.h>
-#include "common.h"
-#include "medianode.h"
-#include "backend.h"
 
 QT_BEGIN_NAMESPACE
 
--- trunk/kdereview/phonon/gstreamer/audioeffect.h #764704:764705
@@ -18,11 +18,15 @@
 #ifndef Phonon_GSTREAMER_AUDIOEFFECT_H
 #define Phonon_GSTREAMER_AUDIOEFFECT_H
 
-#include <QtCore/QObject>
+#include "common.h"
+#include "effect.h"
+#include "medianode.h"
+
 #include <phonon/effectparameter.h>
 #include <phonon/effectinterface.h>
-#include "medianode.h"
-#include "effect.h"
+
+#include <QtCore/QObject>
+
 #include <gst/gst.h>
 
 QT_BEGIN_NAMESPACE
--- trunk/kdereview/phonon/gstreamer/audiooutput.h #764704:764705
@@ -18,12 +18,15 @@
 #ifndef Phonon_GSTREAMER_AUDIOOUTPUT_H
 #define Phonon_GSTREAMER_AUDIOOUTPUT_H
 
-#include <QtCore/QFile>
-#include <phonon/audiooutputinterface.h>
-#include <gst/gst.h>
 #include "common.h"
 #include "medianode.h"
 
+#include <phonon/audiooutputinterface.h>
+
+#include <QtCore/QFile>
+
+#include <gst/gst.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace Phonon
--- trunk/kdereview/phonon/gstreamer/backend.h #764704:764705
@@ -18,16 +18,18 @@
 #ifndef Phonon_GSTREAMER_BACKEND_H
 #define Phonon_GSTREAMER_BACKEND_H
 
+#include "common.h"
+#include "devicemanager.h"
+#include "medianode.h"
+
 #include <phonon/objectdescription.h>
 #include <phonon/backendinterface.h>
-#include "medianode.h"
 
-#include "devicemanager.h"
-
 #include <QtCore/QList>
 #include <QtCore/QPointer>
 #include <QtCore/QStringList>
 #include <QtCore/QTimer>
+
 #include <gst/gst.h>
 
 QT_BEGIN_NAMESPACE
--- trunk/kdereview/phonon/gstreamer/common.h #764704:764705
@@ -18,27 +18,29 @@
 #ifndef __COMMON_H__
 #define __COMMON_H__
 
-#include <QDebug>
+#include <phonon/phonon_export.h>
 
-#if  DEBUG_IMPLEMENTED
+#include <QtCore/QDebug>
+
+#ifdef DEBUG_IMPLEMENTED
 #define IMPLEMENTED qDebug() << "PGst:" << __FUNCTION__ << "(" << __FILE__ << "):"
 #else
 #define IMPLEMENTED if (1); else qDebug()
 #endif
 
-#if DEBUG_HALF_IMPLEMENTED
+#ifdef DEBUG_HALF_IMPLEMENTED
 #define HALF_IMPLEMENTED qDebug() << "PGst: --- HALF IMPLEMENTED:" << __FUNCTION__ << "(" << __FILE__ << "):"
 #else
 #define HALF_IMPLEMENTED if (1); else qDebug()
 #endif
 
-#if  DEBUG_NOT_IMPLEMENTED
+#ifdef DEBUG_NOT_IMPLEMENTED
 #define NOT_IMPLEMENTED qDebug() << "PGst: *** NOT IMPLEMENTED:" << __FUNCTION__ << "(" << __FILE__ << "):"
 #else
 #define NOT_IMPLEMENTED if (1); else qDebug()
 #endif
 
-#if DEBUG_IMPLEMENTED_SILENT
+#ifdef DEBUG_IMPLEMENTED_SILENT
 #define IMPLEMENTED_SILENT qDebug() << "PGst: (silent)" << __FUNCTION__ << "(" << __FILE__ << "):"
 #else
 #define IMPLEMENTED_SILENT if (1); else qDebug()
--- trunk/kdereview/phonon/gstreamer/devicemanager.h #764704:764705
@@ -18,9 +18,13 @@
 #ifndef DEVICEMANAGER_H
 #define DEVICEMANAGER_H
 
-#include <QObject>
-#include <QTimer>
+#include "common.h"
+
 #include <phonon/audiooutputinterface.h>
+
+#include <QtCore/QObject>
+#include <QtCore/QTimer>
+
 #include <gst/gst.h>
 
 QT_BEGIN_NAMESPACE
--- trunk/kdereview/phonon/gstreamer/effect.h #764704:764705
@@ -18,10 +18,14 @@
 #ifndef Phonon_GSTREAMER_EFFECT_H
 #define Phonon_GSTREAMER_EFFECT_H
 
-#include <QtCore/QObject>
+#include "common.h"
+#include "medianode.h"
+
 #include <phonon/effectparameter.h>
 #include <phonon/effectinterface.h>
-#include "medianode.h"
+
+#include <QtCore/QObject>
+
 #include <gst/gst.h>
 
 QT_BEGIN_NAMESPACE
--- trunk/kdereview/phonon/gstreamer/effectmanager.h #764704:764705
@@ -18,9 +18,12 @@
 #ifndef EffectManager_H
 #define EffectManager_H
 
-#include <QObject>
-#include <QTimer>
-#include <QStringList>
+#include "common.h"
+
+#include <QtCore/QObject>
+#include <QtCore/QTimer>
+#include <QtCore/QStringList>
+
 #include <gst/gst.h>
 
 QT_BEGIN_NAMESPACE
--- trunk/kdereview/phonon/gstreamer/gsthelper.h #764704:764705
@@ -18,6 +18,12 @@
 #ifndef __GSTHELPER_H__
 #define __GSTHELPER_H__
 
+#include "common.h"
+
+#include <QtCore/QStringList>
+
+#include <gst/gst.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace Phonon
--- trunk/kdereview/phonon/gstreamer/medianode.h #764704:764705
@@ -18,12 +18,14 @@
 #ifndef __MEDIANODE_H__
 #define __MEDIANODE_H__
 
+#include "common.h"
 #include "medianodeevent.h"
 
+#include <QtCore/QObject>
+#include <QtCore/QList>
+#include <QtCore/QSize>
+
 #include <gst/gst.h>
-#include <QObject>
-#include <QList>
-#include <QSize>
 
 QT_BEGIN_NAMESPACE
 
--- trunk/kdereview/phonon/gstreamer/medianodeevent.h #764704:764705
@@ -18,7 +18,8 @@
 #ifndef Phonon_Gstreamer_MEDIANODEEVENT_H
 #define Phonon_Gstreamer_MEDIANODEEVENT_H
 
-#include <phonon/phonon_export.h>
+#include "common.h"
+
 #include <QtCore>
 
 QT_BEGIN_NAMESPACE
--- trunk/kdereview/phonon/gstreamer/mediaobject.h #764704:764705
@@ -18,6 +18,10 @@
 #ifndef Phonon_Gstreamer_MEDIAOBJECT_H
 #define Phonon_Gstreamer_MEDIAOBJECT_H
 
+#include "backend.h"
+#include "common.h"
+#include "medianode.h"
+
 #include <phonon/mediaobjectinterface.h>
 #include <phonon/addoninterface.h>
 
@@ -30,8 +34,6 @@
 #include <QtCore/QUrl>
 
 #include <gst/gst.h>
-#include "backend.h"
-#include "medianode.h"
 
 QT_BEGIN_NAMESPACE
 
--- trunk/kdereview/phonon/gstreamer/message.h #764704:764705
@@ -18,7 +18,10 @@
 #ifndef __GSTREAMER_MESSAGE_H
 #define __GSTREAMER_MESSAGE_H
 
-#include <QMetaType>
+#include "common.h"
+
+#include <QtCore/QMetaType>
+
 #include <gst/gst.h>
 
 QT_BEGIN_NAMESPACE
--- trunk/kdereview/phonon/gstreamer/qwidgetvideosink.h #764704:764705
@@ -18,6 +18,12 @@
 #ifndef __GSTREAMER_VIDEOSINK_H
 #define __GSTREAMER_VIDEOSINK_H
 
+#include "common.h"
+#include "qwidgetvideosink.h"
+
+#include <QtCore/QByteArray>
+#include <QtCore/QEvent>
+
 #include <gst/video/gstvideosink.h>
 
 QT_BEGIN_NAMESPACE
--- trunk/kdereview/phonon/gstreamer/videowidget.h #764704:764705
@@ -19,10 +19,11 @@
 #define Phonon_UI_GSTREAMER_VIDEOWIDGET_H
 
 #include "abstractvideowidget.h"
+#include "common.h"
 
 #ifndef QT_NO_OPENGL
-#include <QGLFormat>
-#include <QGLWidget>
+#include <QtOpenGL/QGLFormat>
+#include <QtOpenGL/QGLWidget>
 #endif
 
 QT_BEGIN_NAMESPACE
--- trunk/kdereview/phonon/gstreamer/volumefadereffect.h #764704:764705
@@ -18,13 +18,17 @@
 #ifndef Phonon_Gstreamer_VOLUMEFADEREFFECT_H
 #define Phonon_Gstreamer_VOLUMEFADEREFFECT_H
 
-#include <QtCore>
+#include "medianode.h"
+#include "effect.h"
+
 #include <phonon/effectinterface.h>
 #include <phonon/effectparameter.h>
 #include <phonon/volumefaderinterface.h>
-#include "medianode.h"
-#include "effect.h"
 
+#include <QtCore>
+
+#include <gst/gst.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace Phonon
--- trunk/kdereview/phonon/gstreamer/xvideowidget.h #764704:764705
@@ -19,7 +19,12 @@
 #define Phonon_UI_GSTREAMER_XVIDEOWIDGET_H
 
 #include "abstractvideowidget.h"
+#include "common.h"
 
+#include <QtGui/QWidget>
+
+#include <gst/gst.h>
+
 QT_BEGIN_NAMESPACE
 
 #ifndef Q_WS_QWS