[vlc-commits] commit: Enable Media Library Building (Srikanth Raju )

[git at videolan.org]

vlc | branch: master | Srikanth Raju <srikiraju at gmail.com> | Mon Oct 18 01:23:33 2010 +0530| [f6228be3264964d8b415c7e64d986d48a403b4b7] | committer: Srikanth Raju 

Enable Media Library Building

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f6228be3264964d8b415c7e64d986d48a403b4b7
---

 configure.ac                     |   12 ++++++++++++
 modules/LIST                     |    1 +
 modules/Makefile.am              |    1 +
 modules/media_library/Modules.am |    9 +++++++++
 4 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/configure.ac b/configure.ac
index e194780..dddbf5b 100644
--- 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 8e2c86d..006ec75 100644
--- 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 6a1703f..ffba2ae 100644
--- 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
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