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

List:       kde-commits
Subject:    kdereview/mplayerthumbs/src
From:       Marco Gulino <marco.gulino () gmail ! com>
Date:       2009-04-20 15:02:35
Message-ID: 1240239755.976690.31051.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 956766 by gulino:

Organize directories, and configuration page.


 M  +1 -14     CMakeLists.txt  
 D             configDialog.ui  
 A             configuration (directory)  
 A             configuration/CMakeLists.txt  
 AM            configuration/configDialog.ui   configDialog.ui#956760
 AM            configuration/main.cpp   main.cpp#956760 [License: GPL (v2.1+)]
 A             configuration/mplayerConfig.ui  
 AM            configuration/mplayerthumbscfg.cpp   mplayerthumbscfg.cpp#956760 \
[License: GPL (v2.1+)]  AM            configuration/mplayerthumbscfg.h   \
mplayerthumbscfg.h#956760 [License: GPL (v2.1+)]  D             main.cpp  
 D             mplayerthumbscfg.cpp  
 D             mplayerthumbscfg.h  
 M  +2 -1      mplayervideobackend.cpp  
 M  +1 -0      phononbackend.cpp  
 M  +1 -1      servicesfactory.cpp  


--- trunk/kdereview/mplayerthumbs/src/CMakeLists.txt #956765:956766
@@ -1,8 +1,3 @@
-# add_subdirectory(mplayerthumbsconfig)
-
-
-########### next target ###############
-
 set(videopreview_PART_SRCS frameselector.cpp phononbackend.cpp videopreview.cpp  \
mplayervideobackend.cpp videobackendiface.cpp previewingfile.cpp thumbnail.cpp \
thumbnailsmap.cpp servicesfactory.cpp)  
 kde4_add_kcfg_files(videopreview_PART_SRCS mplayerthumbs.kcfgc)
@@ -20,12 +15,4 @@
 install(FILES  videopreview.desktop DESTINATION ${SERVICES_INSTALL_DIR})
 install(FILES  sprocket-small.png sprocket-medium.png sprocket-large.png DESTINATION \
${DATA_INSTALL_DIR}/videothumbnail)  
-set(mplayerthumbsconfig_SRCS main.cpp mplayerthumbscfg.cpp)
-kde4_add_kcfg_files(mplayerthumbsconfig_SRCS mplayerthumbs.kcfgc)
-kde4_add_ui_files(mplayerthumbsconfig_SRCS configDialog.ui)
-kde4_add_executable(mplayerthumbsconfig ${mplayerthumbsconfig_SRCS})
-
-target_link_libraries(mplayerthumbsconfig ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} \
                ${KDE4_KIO_LIBRARY} ${videopreview} )
-
-install(TARGETS mplayerthumbsconfig ${INSTALL_TARGETS_DEFAULT_ARGS})
-
+add_subdirectory(configuration)
** trunk/kdereview/mplayerthumbs/src/configuration/configDialog.ui #property \
svn:mergeinfo  + 
** trunk/kdereview/mplayerthumbs/src/configuration/main.cpp #property svn:mergeinfo
   + 
** trunk/kdereview/mplayerthumbs/src/configuration/mplayerthumbscfg.cpp #property \
svn:mergeinfo  + 
** trunk/kdereview/mplayerthumbs/src/configuration/mplayerthumbscfg.h #property \
svn:mergeinfo  + 
--- trunk/kdereview/mplayerthumbs/src/mplayervideobackend.cpp #956765:956766
@@ -24,10 +24,11 @@
 #include <KMD5>
 #include <ktempdir.h>
 #include <QProcess>
-#include "mplayerthumbscfg.h"
 #include <kstandarddirs.h>
 #include "previewingfile.h"
 #include "thumbnail.h"
+#include <kurl.h>
+#include "mplayerthumbs.h"
 
 ArgsCalculator::ArgsCalculator(PreviewingFile* previewingFile)
 {
--- trunk/kdereview/mplayerthumbs/src/phononbackend.cpp #956765:956766
@@ -56,6 +56,7 @@
   kDebug() << "videopreview: phonon snapshot at ms " << mediaObject->currentTime() \
<< " of " << mediaObject->totalTime() << ", snapshot valid: " << ! image->isNull() << \
endl;  return new Thumbnail(image, previewingFile);
 #else
+#warning Phonon support disabled
   return NULL;
 #endif
 }
--- trunk/kdereview/mplayerthumbs/src/servicesfactory.cpp #956765:956766
@@ -23,7 +23,7 @@
 #include "mplayervideobackend.h"
 #include "mplayerthumbs.h"
 #include "phononbackend.h"
-
+#define COMPILE_WITH_PHONON
 PreviewingFile* ServicesFactory::previewingFile(const QString& filePath, unsigned \
int scalingWidth, unsigned int scalingHeight, QObject* parent) {  return new \
PreviewingFile(filePath, scalingWidth, scalingHeight, parent);  }


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