--- xine/videowidget.h.orig 2009-09-05 17:27:59.641775780 +0200 +++ xine/videowidget.h 2009-09-05 17:30:43.351918566 +0200 @@ -28,9 +28,9 @@ #include #include -//#ifndef PHONON_XINE_NO_VIDEOWIDGET +#ifndef PHONON_XINE_NO_VIDEOWIDGET #include -//#endif // PHONON_XINE_NO_VIDEOWIDGET +#endif // PHONON_XINE_NO_VIDEOWIDGET #include #include @@ -51,22 +51,22 @@ public: static QExplicitlySharedDataPointer 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 //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 @@ 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 m_xcbConnection; xine_video_port_t *m_videoPort; VideoWidget *m_videoWidget;