Commit dfce8cc2 authored by Romain Perier's avatar Romain Perier
Browse files

Remove videoGraphicsObject/setVideoGraphicsObject according to the recent...

Remove videoGraphicsObject/setVideoGraphicsObject according to the recent changes made in phonon.git/qml
parent 45acf910
......@@ -100,7 +100,7 @@ void VideoGraphicsObject::renderCallback(GstBuffer *buffer, void *userData)
return;
VideoGraphicsObject *that = reinterpret_cast<VideoGraphicsObject *>(userData);
if (!that || !that->videoGraphicsObject())
if (!that)
return;
// Frontend could hold lock on data
......
......@@ -26,7 +26,6 @@
#include <QtCore/QObject>
#include <phonon/videoframe.h>
#include <phonon/videographicsobject.h>
#include <phonon/videographicsobjectinterface.h>
#include "medianode.h"
......@@ -45,9 +44,6 @@ public:
explicit VideoGraphicsObject(Backend *backend, QObject *parent = 0);
~VideoGraphicsObject();
virtual Phonon::VideoGraphicsObject *videoGraphicsObject() { return m_frontendObject; }
virtual void setVideoGraphicsObject(Phonon::VideoGraphicsObject *object) { m_frontendObject = object; }
static void renderCallback(GstBuffer *buffer, void *userData);
static void stop(void *userData);
......@@ -65,7 +61,6 @@ signals:
private:
Phonon::VideoFrame m_frame;
Phonon::VideoGraphicsObject *m_frontendObject;
PGstVideoSink *m_sink;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment