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

List:       kde-commits
Subject:    KDE/kdemultimedia
From:       Helio Chissini de Castro <helio () kde ! org>
Date:       2009-05-07 14:40:38
Message-ID: 1241707238.832680.7933.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 964873 by helio:

 Since phonon support in mplayerthumbs is currently broken, add it as a cmake
 declared var to be compiled. To enable it, define  ENABLE_PHONON_SUPPORT=TRUE
 during cmake process


 M  +1 -2      CMakeLists.txt  
 M  +1 -0      mplayerthumbs/CMakeLists.txt  
 M  +30 -3     mplayerthumbs/src/CMakeLists.txt  
 A             mplayerthumbs/src/mplayerthumbs-config.h.cmake  
 M  +12 -1     mplayerthumbs/src/servicesfactory.cpp  


--- trunk/KDE/kdemultimedia/CMakeLists.txt #964872:964873
@@ -39,8 +39,7 @@
 macro_optional_add_subdirectory(doc)
 add_subdirectory(libkcddb)
 add_subdirectory(libkcompactdisc)
-# Disable for now as it not compiles
-#add_subdirectory(mplayerthumbs)
+add_subdirectory(mplayerthumbs)
 
 if (TAGLIB_FOUND)
   macro_optional_add_subdirectory(juk)
--- trunk/KDE/kdemultimedia/mplayerthumbs/CMakeLists.txt #964872:964873
@@ -1,2 +1,3 @@
 project(mplayerthumbs)
+
 add_subdirectory( src )
--- trunk/KDE/kdemultimedia/mplayerthumbs/src/CMakeLists.txt #964872:964873
@@ -1,11 +1,38 @@
-set(videopreview_PART_SRCS frameselector.cpp phononbackend.cpp videopreview.cpp  \
mplayervideobackend.cpp videobackendiface.cpp previewingfile.cpp thumbnail.cpp \
thumbnailsmap.cpp servicesfactory.cpp) +include_directories( \
${CMAKE_CURRENT_BINARY_DIR} )  
+set(PHONON_API FALSE)
+
+if(ENABLE_PHONON_SUPPORT)
+	set(PHONON_API TRUE)
+endif(ENABLE_PHONON_SUPPORT)
+
+configure_file(mplayerthumbs-config.h.cmake \
${CMAKE_CURRENT_BINARY_DIR}/mplayerthumbs-config.h ) +
+set(videopreview_PART_SRCS 
+	frameselector.cpp 
+	videopreview.cpp  
+	mplayervideobackend.cpp 
+	videobackendiface.cpp 
+	previewingfile.cpp 
+	thumbnail.cpp 
+	thumbnailsmap.cpp 
+	servicesfactory.cpp)
+
+if( PHONON_API )
+	set( videopreview_PART_SRCS
+		${videopreview_PART_SRCS}
+		phononbackend.cpp )
+endif( PHONON_API )
+
 kde4_add_kcfg_files(videopreview_PART_SRCS mplayerthumbs.kcfgc)
-
 kde4_add_plugin(videopreview ${videopreview_PART_SRCS})
 
-target_link_libraries(videopreview ${KDE4_KIO_LIBS} ${PHONON_LIBRARY} )
+target_link_libraries(videopreview ${KDE4_KIO_LIBS} )
 
+if( PHONON_API )
+	target_link_libraries(videopreview ${PHONON_LIBRARY} )
+endif( PHONON_API )
+
 install(TARGETS videopreview DESTINATION ${PLUGIN_INSTALL_DIR})
 
 
--- trunk/KDE/kdemultimedia/mplayerthumbs/src/servicesfactory.cpp #964872:964873
@@ -16,13 +16,20 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
+
 #include "constants.h"
 #include "servicesfactory.h"
 #include "previewingfile.h"
 #include "videobackendiface.h"
 #include "mplayervideobackend.h"
 #include "mplayerthumbs.h"
-#include "phononbackend.h"
+#include "mplayerthumbs-config.h"
+
+
+#ifdef PHONON_API
+	#include "phononbackend.h"
+#endif
+
 PreviewingFile* ServicesFactory::previewingFile(const QString& filePath, unsigned \
int scalingWidth, unsigned int scalingHeight, QObject* parent) {  return new \
PreviewingFile(filePath, scalingWidth, scalingHeight, parent);  }
@@ -33,9 +40,13 @@
     case VideoBackendIFace::MPlayer:
       kDebug(DBG_AREA) << "videopreview: Selected mplayer backend\n";
       return new MPlayerVideoBackend(previewingFile, cfg);
+	  break;
+#ifdef PHONON_API
     case VideoBackendIFace::Phonon:
       kDebug(DBG_AREA) << "videopreview: Selected phonon backend\n";
       return new PhononBackend(previewingFile, cfg);
+	  break;
+#endif
   }
   // Well, we should never be here...
   return NULL;


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