[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/runtime/phonon/xine
From:       Laurent Montel <montel () kde ! org>
Date:       2008-08-17 10:25:19
Message-ID: 1218968719.161517.26205.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 848199 by mlaurent:

Allow to link when we don't have XCB_VIDEO


 M  +4 -1      CMakeLists.txt  
 M  +3 -0      backend.cpp  
 A             config-xine-widget.h.cmake  


--- trunk/KDE/kdebase/runtime/phonon/xine/CMakeLists.txt #848198:848199
@@ -23,12 +23,12 @@
     net_buf_ctrl.c
     volumefader_plugin.cpp
     plugins.c
-    videowidget.cpp
    )
 
 macro_optional_find_package(XCB)
 SET(XCB_VIDEO TRUE)
 if(XCB_FOUND AND XINE_XCB_FOUND)
+  set(phonon_xine_PART_SRCS ${phonon_xine_PART_SRCS} videowidget.cpp)
   include_directories(${LIBXCB_INCLUDE_DIR})
   add_definitions(${LIBXCB_DEFINITIONS})
 else(XCB_FOUND AND XINE_XCB_FOUND)
@@ -38,6 +38,9 @@
 endif(XCB_FOUND AND XINE_XCB_FOUND)
 macro_log_feature(XCB_VIDEO "XCB" "XCB is needed for the video widget, libxine needs \
to be compiled with XCB" "http://xcb.freedesktop.org/" REQUIRED)  
+macro_bool_to_01(XINEWIDGET_FOUND XCB_VIDEO)
+configure_file(config-xine-widget.h.cmake \
${CMAKE_CURRENT_BINARY_DIR}/config-xine-widget.h ) +
 add_definitions(-DPHONON_BACKEND_VERSION_4_2)
 kde4_add_plugin(phonon_xine ${phonon_xine_PART_SRCS})
 target_link_libraries(phonon_xine ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS} \
                ${KDE4_KDEUI_LIBS} ${KDE4_PHONON_LIBS} ${XINE_LIBRARY})
--- trunk/KDE/kdebase/runtime/phonon/xine/backend.cpp #848198:848199
@@ -36,6 +36,7 @@
 #include "keepreference.h"
 #include "sinknode.h"
 #include "sourcenode.h"
+#include "config-xine-widget.h"
 
 #include <kconfiggroup.h>
 #include <kicon.h>
@@ -174,11 +175,13 @@
         }
     case VideoWidgetClass:
         {
+#ifdef XINEWIDGET_FOUND 
             VideoWidget *vw = new VideoWidget(qobject_cast<QWidget *>(parent));
             if (vw->isValid()) {
                 return vw;
             }
             delete vw;
+#endif
             return 0;
         }
     }


[prev in list] [next in list] [prev in thread] [next in thread]