57 lines
1.9 KiB
Plaintext
57 lines
1.9 KiB
Plaintext
$OpenBSD: patch-xine_videowidget_h,v 1.1.1.1 2010/06/18 12:53:38 espie Exp $
|
|
--- xine/videowidget.h.orig Fri Jun 18 14:20:12 2010
|
|
+++ xine/videowidget.h Fri Jun 18 14:21:31 2010
|
|
@@ -28,9 +28,9 @@
|
|
#include <QPixmap>
|
|
#include <xine.h>
|
|
|
|
-//#ifndef PHONON_XINE_NO_VIDEOWIDGET
|
|
+#ifndef PHONON_XINE_NO_VIDEOWIDGET
|
|
#include <xcb/xcb.h>
|
|
-//#endif // PHONON_XINE_NO_VIDEOWIDGET
|
|
+#endif // PHONON_XINE_NO_VIDEOWIDGET
|
|
|
|
#include <phonon/VideoWidget>
|
|
#include <phonon/VideoWidgetInterface>
|
|
@@ -51,22 +51,22 @@ class XcbConnection : public QSharedData
|
|
public:
|
|
static QExplicitlySharedDataPointer<XcbConnection> instance();
|
|
~XcbConnection();
|
|
-//#ifndef PHONON_XINE_NO_VIDEOWIDGET
|
|
+#ifndef PHONON_XINE_NO_VIDEOWIDGET
|
|
operator xcb_connection_t *() const { return m_xcbConnection; }
|
|
xcb_screen_t *screen() const { return m_screen; }
|
|
operator bool() const { return m_xcbConnection; }
|
|
-//#else // PHONON_XINE_NO_VIDEOWIDGET
|
|
+#else // PHONON_XINE_NO_VIDEOWIDGET
|
|
//operator bool() const { return false; }
|
|
-//#endif // PHONON_XINE_NO_VIDEOWIDGET
|
|
+#endif // PHONON_XINE_NO_VIDEOWIDGET
|
|
|
|
private:
|
|
XcbConnection();
|
|
|
|
private:
|
|
-//#ifndef PHONON_XINE_NO_VIDEOWIDGET
|
|
+#ifndef PHONON_XINE_NO_VIDEOWIDGET
|
|
xcb_connection_t *m_xcbConnection;
|
|
xcb_screen_t *m_screen;
|
|
-//#endif // PHONON_XINE_NO_VIDEOWIDGET
|
|
+#endif // PHONON_XINE_NO_VIDEOWIDGET
|
|
};
|
|
|
|
class VideoWidgetXT : public SinkNodeXT
|
|
@@ -82,10 +82,10 @@ class VideoWidgetXT : public SinkNodeXT
|
|
void createVideoPort();
|
|
|
|
private:
|
|
-//#ifndef PHONON_XINE_NO_VIDEOWIDGET
|
|
+#ifndef PHONON_XINE_NO_VIDEOWIDGET
|
|
xcb_visual_t m_visual;
|
|
xcb_connection_t *m_xcbConnection;
|
|
-//#endif // PHONON_XINE_NO_VIDEOWIDGET
|
|
+#endif // PHONON_XINE_NO_VIDEOWIDGET
|
|
//QExplicitlySharedDataPointer<XcbConnection> m_xcbConnection;
|
|
xine_video_port_t *m_videoPort;
|
|
VideoWidget *m_videoWidget;
|