Enable Media Library Building

diff --git a/configure.ac b/configure.ac
index e194780acd46c024a8791530fbdfbb38472ae99d..dddbf5b8b59a72126bfd13964503e81bff1d1ced 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4161,6 +4161,17 @@ else
 fi
 AM_CONDITIONAL([HAVE_SQLITE], [test "${enable_sqlite}" != "no"])
 
+dnl
+dnl media library
+dnl
+AC_ARG_ENABLE(media-library, [--enable-media-library media library (default enabled)])
+if test "${enable_media_library}" != "no"
+then
+  test "${enable_sqlite}" != "yes" && AC_MSG_ERROR([SQLite module is required for the media library])
+  AC_DEFINE([MEDIA_LIBRARY], 1, [Define if you want to use the VLC media library])
+  VLC_ADD_CPPFLAGS([qt4],"-DMEDIA_LIBRARY")
+  VLC_ADD_PLUGIN([media_library])
+fi
 
 dnl
 dnl  Endianness check
@@ -4396,6 +4407,7 @@ AC_CONFIG_FILES([
   modules/misc/osd/Makefile
   modules/misc/stats/Makefile
   modules/misc/xml/Makefile
+  modules/media_library/Makefile
   modules/mux/Makefile
   modules/mux/mpeg/Makefile
   modules/packetizer/Makefile

diff --git a/modules/LIST b/modules/LIST
index 8e2c86d8b96a3e1f7202918cd071d6794d16d14e..006ec75e7338afc961aaba7e2def575f2135f430 100644 (file)
--- a/modules/LIST
+++ b/modules/LIST
@@ -169,6 +169,7 @@ $Id$
  * magnify: zoom video filter
  * marq: Overlays a marquee on the video
  * mash: OpenMash based decoder
+ * media_library: a sql based media library
  * mediadirs: Picture/Music/Video user directories as service discoveries
  * memcpy3dn: 3D Now! accelerated version of memcpy
  * memcpyaltivec: Altivec accelerated version of memcpy

diff --git a/modules/Makefile.am b/modules/Makefile.am
index 6a1703fb0bf4e0bf170a60a2cad6918b4629cee4..ffba2ae4503bd267719d0c491fc5f456f757f265 100644 (file)
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -10,6 +10,7 @@ BASE_SUBDIRS = \
        gui \
        meta_engine \
        misc \
+       media_library \
        packetizer \
        services_discovery \
        stream_filter \

diff --git a/modules/media_library/Modules.am b/modules/media_library/Modules.am
new file mode 100644 (file)
index 0000000..417fc3c
--- /dev/null
+++ b/modules/media_library/Modules.am
@@ -0,0 +1,9 @@
+SOURCES_media_library = sql_media_library.c \
+                        sql_monitor.c \
+                        sql_search.c \
+                        sql_add.c \
+                        sql_update.c \
+                        sql_delete.c \
+                        item_list.c \
+                        ml_watch.c \
+                        media_pool.c