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

List:       kde-commits
Subject:    kdebase/kioslave/media
From:       Jérôme Lodewyck <jerome.lodewyck () normalesup ! org>
Date:       2004-11-07 21:24:59
Message-ID: 20041107212459.91BAC16C40 () office ! kde ! org
[Download RAW message or body]

CVS commit by lodewyck: 

Enable HAL backend compilation if the following ressources are found :

- HAL >= 0.4
- DBus-Qt bindings from CVS

At load time, the media kded module will fall back on the FStab backend
if HAL is unreachable. 


  M +7 -4      configure.in.in   1.2
  M +16 -3     kdedmodule/Makefile.am   1.4
  M +18 -0     kdedmodule/mediamanager.cpp   1.5


--- kdebase/kioslave/media/configure.in.in  #1.1:1.2
@@ -113,12 +113,15 @@
 ########### Check if media HAL backend sould be compiled
 
-AC_MSG_CHECKING(if the media HAL backend sould be compiled)
+AC_MSG_CHECKING(if the HAL backend for media:/ sould be compiled)
 
+HALBACKEND=no
 if [test $hal = FOUND] && [test $dbus = FOUND] && [test $dbusqt = FOUND] ; then
+  AC_DEFINE(COMPILE_HALBACKEND, , [media HAL backend compilation])
+  HALBACKEND=yes
+  AC_SUBST(HALBACKEND)
   AC_MSG_RESULT(yes)
-  AC_DEFINE_UNQUOTED(HAL_BACKEND, , [media HAL backend compilation])
-  HAL_BACKEND=yes
-  AC_SUBST(HAL_BACKEND)
 else
   AC_MSG_RESULT(no)
 fi
+
+AM_CONDITIONAL(include_media_halbackend, test "$HALBACKEND" = yes)
\ No newline at end of file

--- kdebase/kioslave/media/kdedmodule/Makefile.am  #1.3:1.4
@@ -1,10 +1,23 @@
 kde_module_LTLIBRARIES = kded_mediamanager.la
 
-INCLUDES = $(all_includes) -I$(srcdir)/../libmediacommon
+if include_media_halbackend
+HALBACKEND_INCS = $(HAL_INCS) $(DBUS_INCS) $(DBUSQT_INCS)
+endif
+
+METASOURCES = AUTO
+INCLUDES = $(all_includes) -I$(srcdir)/../libmediacommon $(HALBACKEND_INCS)
+
+if include_media_halbackend
+HALBACKEND_LIB = halbackend.la
+noinst_LTLIBRARIES = halbackend.la
+halbackend_la_SOURCES = halbackend.cpp
+halbackend_la_LIBADD = $(LIB_KDEUI) $(HAL_LIBS) $(DBUS_LIBS) $(DBUSQT_LIBS)
+halbackend_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
+endif
+
 kded_mediamanager_la_SOURCES = mediamanager.cpp mediamanager.skel medialist.cpp \
backendbase.cpp fstabbackend.cpp mediadirnotify.cpp mediadirnotify.skel  \
                kded_mediamanager_la_LDFLAGS = $(all_libraries) -module \
                -avoid-version
-kded_mediamanager_la_LIBADD = $(LIB_KSYCOCA) ../libmediacommon/libmediacommon.la
+kded_mediamanager_la_LIBADD = $(LIB_KSYCOCA) ../libmediacommon/libmediacommon.la \
$(HALBACKEND_LIB)  
-METASOURCES = AUTO
 
 servicesdir = $(kde_servicesdir)/kded

--- kdebase/kioslave/media/kdedmodule/mediamanager.cpp  #1.4:1.5
@@ -19,4 +19,6 @@
 #include "mediamanager.h"
 
+#include <config.h>
+
 #include <kdebug.h>
 #include <kglobal.h>
@@ -27,4 +29,9 @@
 #include "fstabbackend.h"
 
+#ifdef COMPILE_HALBACKEND
+#include "halbackend.h"
+#endif //COMPILE_HALBACKEND
+
+
 MediaManager::MediaManager(const QCString &obj)
     : KDEDModule(obj), m_dirNotify(m_mediaList)
@@ -40,5 +47,16 @@ MediaManager::MediaManager(const QCStrin
         m_backends.setAutoDelete(true);
 
+#ifdef COMPILE_HALBACKEND
+        HALBackend* halBackend = new HALBackend(m_mediaList, this);
+        if (halBackend->InitHal())
+                m_backends.append( halBackend );
+        else
+        {
+                delete halBackend;
         m_backends.append( new FstabBackend(m_mediaList) );
+        }
+#else //COMPILE_HALBACKEND
+        m_backends.append( new FstabBackend(m_mediaList) );
+#endif //COMPILE_HALBACKEND
 }
 


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