Attachment #203201 for bug #273347

View | Details | Raw Unified | Return to bug 273347
Collapse All | Expand All




#include <QPixmap>
#include <xine.h>

#ifndef PHONON_XINE_NO_VIDEOWIDGET
#include <xcb/xcb.h>
#endif // PHONON_XINE_NO_VIDEOWIDGET

#include <Phonon/VideoWidget>
#include <Phonon/VideoWidgetInterface>

    public:
        static QExplicitlySharedDataPointer<XcbConnection> instance();
        ~XcbConnection();
#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
        //operator bool() const { return false; }
#endif // PHONON_XINE_NO_VIDEOWIDGET

    private:
        XcbConnection();

    private:
#ifndef PHONON_XINE_NO_VIDEOWIDGET
        xcb_connection_t *m_xcbConnection;
        xcb_screen_t *m_screen;
#endif // PHONON_XINE_NO_VIDEOWIDGET
};

class VideoWidgetXT : public SinkNodeXT

        void createVideoPort();

    private:
#ifndef PHONON_XINE_NO_VIDEOWIDGET
        xcb_visual_t m_visual;
        xcb_connection_t *m_xcbConnection;
#endif // PHONON_XINE_NO_VIDEOWIDGET
        //QExplicitlySharedDataPointer<XcbConnection> m_xcbConnection;
        xine_video_port_t *m_videoPort;
        VideoWidget *m_videoWidget;

Return to bug 273347

Lines 28-36 Link Here

(-)xine/videowidget.h.orig (-8 / +8 lines)
28	#include <QPixmap>	28	#include <QPixmap>
29	#include <xine.h>	29	#include <xine.h>
30		30
31	//#ifndef PHONON_XINE_NO_VIDEOWIDGET	31	#ifndef PHONON_XINE_NO_VIDEOWIDGET
32	#include <xcb/xcb.h>	32	#include <xcb/xcb.h>
33	//#endif // PHONON_XINE_NO_VIDEOWIDGET	33	#endif // PHONON_XINE_NO_VIDEOWIDGET
34		34
35	#include <Phonon/VideoWidget>	35	#include <Phonon/VideoWidget>
36	#include <Phonon/VideoWidgetInterface>	36	#include <Phonon/VideoWidgetInterface>
Lines 51-72 Link Here
51	public:	51	public:
52	static QExplicitlySharedDataPointer<XcbConnection> instance();	52	static QExplicitlySharedDataPointer<XcbConnection> instance();
53	~XcbConnection();	53	~XcbConnection();
54	//#ifndef PHONON_XINE_NO_VIDEOWIDGET	54	#ifndef PHONON_XINE_NO_VIDEOWIDGET
55	operator xcb_connection_t *() const { return m_xcbConnection; }	55	operator xcb_connection_t *() const { return m_xcbConnection; }
56	xcb_screen_t *screen() const { return m_screen; }	56	xcb_screen_t *screen() const { return m_screen; }
57	operator bool() const { return m_xcbConnection; }	57	operator bool() const { return m_xcbConnection; }
58	//#else // PHONON_XINE_NO_VIDEOWIDGET	58	//#else // PHONON_XINE_NO_VIDEOWIDGET
59	//operator bool() const { return false; }	59	//operator bool() const { return false; }
60	//#endif // PHONON_XINE_NO_VIDEOWIDGET	60	#endif // PHONON_XINE_NO_VIDEOWIDGET
61		61
62	private:	62	private:
63	XcbConnection();	63	XcbConnection();
64		64
65	private:	65	private:
66	//#ifndef PHONON_XINE_NO_VIDEOWIDGET	66	#ifndef PHONON_XINE_NO_VIDEOWIDGET
67	xcb_connection_t *m_xcbConnection;	67	xcb_connection_t *m_xcbConnection;
68	xcb_screen_t *m_screen;	68	xcb_screen_t *m_screen;
69	//#endif // PHONON_XINE_NO_VIDEOWIDGET	69	#endif // PHONON_XINE_NO_VIDEOWIDGET
70	};	70	};
71		71
72	class VideoWidgetXT : public SinkNodeXT	72	class VideoWidgetXT : public SinkNodeXT
Lines 82-91 Link Here
82	void createVideoPort();	82	void createVideoPort();
83		83
84	private:	84	private:
85	//#ifndef PHONON_XINE_NO_VIDEOWIDGET	85	#ifndef PHONON_XINE_NO_VIDEOWIDGET
86	xcb_visual_t m_visual;	86	xcb_visual_t m_visual;
87	xcb_connection_t *m_xcbConnection;	87	xcb_connection_t *m_xcbConnection;
88	//#endif // PHONON_XINE_NO_VIDEOWIDGET	88	#endif // PHONON_XINE_NO_VIDEOWIDGET
89	//QExplicitlySharedDataPointer<XcbConnection> m_xcbConnection;	89	//QExplicitlySharedDataPointer<XcbConnection> m_xcbConnection;
90	xine_video_port_t *m_videoPort;	90	xine_video_port_t *m_videoPort;
91	VideoWidget *m_videoWidget;	91	VideoWidget *m_videoWidget;