[rygel] core,libserver: Move server-only stuff to library
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rygel] core,libserver: Move server-only stuff to library
- Date: Fri, 27 Jul 2012 20:34:18 +0000 (UTC)
commit 8ce29886a114b625fbb1dabc72684478e8ee7463
Author: Jens Georg <mail jensge org>
Date: Fri Jul 20 10:17:52 2012 +0200
core,libserver: Move server-only stuff to library
common.am | 24 ++
doc/reference/librygel-core/Makefile.am | 1 +
doc/reference/librygel-renderer/Makefile.am | 5 +-
po/POTFILES.in | 94 ++++----
po/POTFILES.skip | 235 ++++++--------------
src/librygel-core/filelist.am | 78 +------
src/librygel-core/rygel-description-file.vala | 6 +-
src/librygel-core/rygel-plugin.vala | 5 +
src/librygel-core/rygel-root-device-factory.vala | 21 +--
src/librygel-core/rygel-root-device.vala | 2 +-
src/librygel-core/uuid.vapi | 7 +
src/librygel-server/Makefile.am | 8 +-
src/librygel-server/filelist.am | 76 ++++++-
.../rygel-aac-transcoder.vala | 0
.../rygel-audio-item.vala | 0
.../rygel-audio-transcoder.vala | 0
.../rygel-avc-transcoder.vala | 0
.../rygel-browse.vala | 0
.../rygel-client-hacks.vala | 0
.../rygel-content-directory.vala | 0
.../rygel-dbus-thumbnailer.vala | 0
.../rygel-gst-utils.vala | 0
.../rygel-http-byte-seek.vala | 0
.../rygel-http-get-handler.vala | 0
.../rygel-http-get.vala | 0
.../rygel-http-gst-sink.vala | 0
.../rygel-http-identity-handler.vala | 0
.../rygel-http-item-uri.vala | 0
.../rygel-http-post.vala | 0
.../rygel-http-request.vala | 0
.../rygel-http-response.vala | 0
.../rygel-http-seek.vala | 0
.../rygel-http-server.vala | 0
.../rygel-http-time-seek.vala | 0
.../rygel-http-transcode-handler.vala | 0
.../rygel-image-item.vala | 0
.../rygel-import-resource.vala | 0
.../rygel-item-creator.vala | 4 +-
.../rygel-item-destroyer.vala | 0
.../rygel-item-removal-queue.vala | 0
.../rygel-l16-transcoder.vala | 0
.../rygel-logical-expression.vala | 0
.../rygel-media-art-store.vala | 0
.../rygel-media-container.vala | 0
.../rygel-media-item.vala | 0
.../rygel-media-object.vala | 0
.../rygel-media-objects.vala | 0
.../rygel-media-query-action.vala | 0
.../rygel-media-receiver-registrar.vala | 0
.../rygel-media-server-plugin.vala | 12 +
.../rygel-mp2ts-transcoder.vala | 0
.../rygel-mp3-transcoder.vala | 0
.../rygel-music-item.vala | 0
.../rygel-panasonic-hacks.vala | 0
.../rygel-photo-item.vala | 0
.../rygel-relational-expression.vala | 0
.../rygel-search-criteria-parser.vala | 0
.../rygel-search-expression.vala | 0
.../rygel-search.vala | 0
.../rygel-searchable-container.vala | 0
.../rygel-simple-container.vala | 0
.../rygel-source-connection-manager.vala | 0
.../rygel-subtitle-manager.vala | 0
.../rygel-subtitle.vala | 0
.../rygel-thumbnail.vala | 0
.../rygel-thumbnailer.vala | 0
.../rygel-transcode-manager.vala | 0
.../rygel-transcoder.vala | 0
.../rygel-v1-hacks.vala | 0
.../rygel-video-item.vala | 0
.../rygel-video-transcoder.vala | 0
.../rygel-visual-item.vala | 0
.../rygel-wmp-hacks.vala | 0
.../rygel-wmv-transcoder.vala | 0
.../rygel-writable-container.vala | 0
.../rygel-xbmc-hacks.vala | 0
.../rygel-xbox-hacks.vala | 0
src/plugins/external/Makefile.am | 4 +-
src/plugins/gst-launch/Makefile.am | 4 +-
src/plugins/media-export/Makefile.am | 4 +-
src/plugins/mediathek/Makefile.am | 4 +-
src/plugins/mpris/Makefile.am | 11 +-
src/plugins/playbin/Makefile.am | 15 +-
src/plugins/test/Makefile.am | 4 +-
src/plugins/tracker/Makefile.am | 6 +-
tests/Makefile.am | 6 +-
tests/rygel-gst-utils.vala | 2 +-
tests/rygel-http-byte-seek.vala | 2 +-
tests/rygel-http-byte-seek_http-get.vala | 2 +-
tests/rygel-http-get.vala | 2 +-
tests/rygel-http-gst-sink.vala | 2 +-
tests/rygel-http-item-uri.vala | 2 +-
tests/rygel-http-item-uri_http-get.vala | 2 +-
tests/rygel-http-item-uri_http-post.vala | 2 +-
tests/rygel-http-post.vala | 2 +-
tests/rygel-http-request_http-get.vala | 2 +-
tests/rygel-http-request_http-post.vala | 2 +-
tests/rygel-http-response.vala | 2 +-
tests/rygel-http-seek.vala | 2 +-
tests/rygel-http-seek_http-get.vala | 2 +-
tests/rygel-http-seek_time-seek.vala | 2 +-
tests/rygel-http-time-seek.vala | 2 +-
tests/rygel-http-time-seek_http-get.vala | 2 +-
tests/rygel-icon-info.vala | 1 +
tests/rygel-item-creator.vala | 2 +-
tests/rygel-media-art-store.vala | 2 +-
tests/rygel-relational-expression.vala | 2 +-
tests/rygel-search-expression.vala | 2 +-
tests/rygel-searchable-container.vala | 2 +-
tests/rygel-thumbnail.vala | 1 +
110 files changed, 315 insertions(+), 367 deletions(-)
---
diff --git a/common.am b/common.am
index d40fc33..fd1f058 100644
--- a/common.am
+++ b/common.am
@@ -19,6 +19,8 @@ bigicondir = $(shareddir)/icons/120x120
rygeldir = $(top_srcdir)/src/rygel
librygelcoredir = $(top_srcdir)/src/librygel-core
+librygelserverdir = $(top_srcdir)/src/librygel-server
+librygelrendererdir = $(top_srcdir)/src/librygel-renderer
MAINTAINERCLEANFILES = Makefile.in
@@ -32,6 +34,8 @@ AM_CFLAGS = \
$(COVERAGE_CFLAGS) \
-I$(rygeldir) \
-I$(librygelcoredir) \
+ -I$(librygelserverdir) \
+ -I$(librygelrendererdir) \
-DDATA_DIR='"$(shareddir)"' -DSYS_CONFIG_DIR='"$(sysconfigdir)"'\
-DPLUGIN_DIR='"$(plugindir)"' -DDESKTOP_DIR='"$(desktopdir)"'\
-DPRESET_DIR='"$(presetdir)"'\
@@ -50,11 +54,31 @@ RYGEL_COMMON_LIBS = \
$(RYGEL_BASE_LIBS) \
$(top_builddir)/src/librygel-core/librygel-core-1.0.la
+RYGEL_COMMON_SERVER_LIBS = \
+ $(top_builddir)/src/librygel-server/librygel-server-1.0.la \
+ $(RYGEL_COMMON_LIBS) \
+ $(GST_PBU_LIBS) \
+ $(LIBGUPNP_DLNA_LIBS)
+
+RYGEL_COMMON_RENDERER_LIBS = \
+ $(top_builddir)/src/librygel-renderer/librygel-renderer-1.0.la \
+ $(RYGEL_COMMON_LIBS)
+
# Note: the -g needs to be at the end of VALAFLAGS to not break make dist
RYGEL_COMMON_PLUGIN_VALAFLAGS = \
--pkg rygel-core-1.0 \
$(RYGEL_COMMON_VALAFLAGS)
+RYGEL_COMMON_SERVER_PLUGIN_VALAFLAGS = \
+ --pkg rygel-server-1.0 \
+ --vapidir=$(top_builddir)/src/librygel-server \
+ $(RYGEL_COMMON_PLUGIN_VALAFLAGS)
+
+RYGEL_COMMON_RENDERER_PLUGIN_VALAFLAGS = \
+ --pkg rygel-renderer-1.0 \
+ --vapidir=$(top_builddir)/src/librygel-renderer \
+ $(RYGEL_COMMON_PLUGIN_VALAFLAGS)
+
RYGEL_COMMON_VALAFLAGS_PKG = --pkg gupnp-1.0 --pkg gupnp-av-1.0 --pkg gee-1.0
RYGEL_COMMON_VALAFLAGS = \
diff --git a/doc/reference/librygel-core/Makefile.am b/doc/reference/librygel-core/Makefile.am
index 84bf831..f0656bf 100644
--- a/doc/reference/librygel-core/Makefile.am
+++ b/doc/reference/librygel-core/Makefile.am
@@ -17,6 +17,7 @@ VALADOC_FLAGS = --force \
$(RYGEL_COMMON_VALAFLAGS_PKG) \
$(LIBRYGEL_CORE_VALAFLAGS_PKG) \
--pkg gstreamer-pbutils-0.10 \
+ --pkg gio-2.0 \
--target-glib=2.32 \
--vapidir=$(rygeldir) \
--pkg rygel-build-config \
diff --git a/doc/reference/librygel-renderer/Makefile.am b/doc/reference/librygel-renderer/Makefile.am
index b496830..ce960de 100644
--- a/doc/reference/librygel-renderer/Makefile.am
+++ b/doc/reference/librygel-renderer/Makefile.am
@@ -5,8 +5,8 @@ include $(top_srcdir)/src/librygel-renderer/filelist.am
# Note that LIBRYGEL_RENDERER_NONVAPI_SOURCE_FILES all (should) use the internal keyword
# so they are not shown as part of the public API.
-VALA_SOURCE_FILES = $(LIBRYGEL_RENDERER_VAPI_SOURCE_FILES)
-# There are no LIBRYGEL_RENDERER_NONVAPI_SOURCE_FILES
+VALA_SOURCE_FILES = $(LIBRYGEL_RENDERER_VAPI_SOURCE_FILES) \
+ $(LIBRYGEL_RENDERER_NONVAPI_SOURCE_FILES)
VALA_SOURCE_FILES_WITH_PATHS = $(addprefix $(top_srcdir)/src/librygel-renderer/, $(VALA_SOURCE_FILES))
@@ -40,6 +40,7 @@ gtkdoc: $(VALA_SOURCE_FILES_WITH_PATHS)
$(AM_V_GEN)$(VALADOC) \
-X $(top_builddir)/src/librygel-renderer/rygel-renderer.h \
-X -l -X $(top_builddir)/src/librygel-renderer/.libs/librygel-renderer-1.0.so \
+ -X -l -X $(top_builddir)/src/librygel-core/.libs/librygel-core-1.0.so \
-o gtkdoc \
--doclet gtkdoc \
$(VALADOC_FLAGS) 2>/dev/null
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d69ed17..ca28c24 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -70,66 +70,19 @@ src/plugins/tracker/rygel-tracker-albums.vala
src/plugins/tracker/rygel-tracker-artists.vala
src/plugins/tracker/rygel-tracker-genre.vala
src/plugins/tracker/rygel-tracker-titles.vala
-src/librygel-core/rygel-media-query-action.vala
-src/librygel-core/rygel-browse.vala
src/librygel-core/rygel-cmdline-config.vala
src/librygel-core/rygel-configuration.vala
src/librygel-core/rygel-connection-manager.vala
-src/librygel-core/rygel-content-directory.vala
-src/librygel-core/rygel-gst-utils.vala
-src/librygel-core/rygel-http-byte-seek.vala
-src/librygel-core/rygel-http-get-handler.vala
-src/librygel-core/rygel-http-get.vala
-src/librygel-core/rygel-http-identity-handler.vala
-src/librygel-core/rygel-http-item-uri.vala
-src/librygel-core/rygel-http-post.vala
-src/librygel-core/rygel-http-request.vala
-src/librygel-core/rygel-http-response.vala
-src/librygel-core/rygel-http-seek.vala
-src/librygel-core/rygel-http-server.vala
-src/librygel-core/rygel-http-time-seek.vala
-src/librygel-core/rygel-http-transcode-handler.vala
src/librygel-core/rygel-icon-info.vala
-src/librygel-core/rygel-import-resource.vala
-src/librygel-core/rygel-item-creator.vala
-src/librygel-core/rygel-item-destroyer.vala
-src/librygel-core/rygel-l16-transcoder.vala
src/librygel-core/rygel-log-handler.vala
-src/librygel-core/rygel-logical-expression.vala
-src/librygel-core/rygel-media-container.vala
-src/librygel-core/rygel-media-item.vala
-src/librygel-core/rygel-music-item.vala
-src/librygel-core/rygel-audio-item.vala
-src/librygel-core/rygel-image-item.vala
-src/librygel-core/rygel-photo-item.vala
-src/librygel-core/rygel-video-item.vala
-src/librygel-core/rygel-visual-item.vala
-src/librygel-core/rygel-media-object.vala
-src/librygel-core/rygel-media-receiver-registrar.vala
src/librygel-core/rygel-meta-config.vala
-src/librygel-core/rygel-mp2ts-transcoder.vala
-src/librygel-core/rygel-mp3-transcoder.vala
src/librygel-core/rygel-plugin-loader.vala
src/librygel-core/rygel-plugin.vala
-src/librygel-core/rygel-relational-expression.vala
src/librygel-core/rygel-resource-info.vala
src/librygel-core/rygel-root-device-factory.vala
src/librygel-core/rygel-root-device.vala
-src/librygel-core/rygel-search-criteria-parser.vala
-src/librygel-core/rygel-search-expression.vala
-src/librygel-core/rygel-search.vala
-src/librygel-core/rygel-simple-container.vala
-src/librygel-core/rygel-source-connection-manager.vala
src/librygel-core/rygel-state-machine.vala
-src/librygel-core/rygel-subtitle-manager.vala
-src/librygel-core/rygel-subtitle.vala
-src/librygel-core/rygel-thumbnailer.vala
-src/librygel-core/rygel-thumbnail.vala
-src/librygel-core/rygel-transcode-manager.vala
-src/librygel-core/rygel-transcoder.vala
src/librygel-core/rygel-user-config.vala
-src/librygel-core/rygel-wmv-transcoder.vala
-src/librygel-core/rygel-xbox-hacks.vala
src/librygel-renderer/rygel-av-transport.vala
src/librygel-renderer/rygel-changelog.vala
src/librygel-renderer/rygel-gst-utils.vala
@@ -137,6 +90,53 @@ src/librygel-renderer/rygel-playbin-player.vala
src/librygel-renderer/rygel-playbin-plugin.vala
src/librygel-renderer/rygel-rendering-control.vala
src/librygel-renderer/rygel-sink-connection-manager.vala
+src/librygel-server/rygel-audio-item.vala
+src/librygel-server/rygel-browse.vala
+src/librygel-server/rygel-content-directory.vala
+src/librygel-server/rygel-gst-utils.vala
+src/librygel-server/rygel-http-byte-seek.vala
+src/librygel-server/rygel-http-get-handler.vala
+src/librygel-server/rygel-http-get.vala
+src/librygel-server/rygel-http-identity-handler.vala
+src/librygel-server/rygel-http-item-uri.vala
+src/librygel-server/rygel-http-post.vala
+src/librygel-server/rygel-http-request.vala
+src/librygel-server/rygel-http-response.vala
+src/librygel-server/rygel-http-seek.vala
+src/librygel-server/rygel-http-server.vala
+src/librygel-server/rygel-http-time-seek.vala
+src/librygel-server/rygel-http-transcode-handler.vala
+src/librygel-server/rygel-image-item.vala
+src/librygel-server/rygel-import-resource.vala
+src/librygel-server/rygel-item-creator.vala
+src/librygel-server/rygel-item-destroyer.vala
+src/librygel-server/rygel-l16-transcoder.vala
+src/librygel-server/rygel-logical-expression.vala
+src/librygel-server/rygel-media-container.vala
+src/librygel-server/rygel-media-item.vala
+src/librygel-server/rygel-media-object.vala
+src/librygel-server/rygel-media-query-action.vala
+src/librygel-server/rygel-media-receiver-registrar.vala
+src/librygel-server/rygel-mp2ts-transcoder.vala
+src/librygel-server/rygel-mp3-transcoder.vala
+src/librygel-server/rygel-music-item.vala
+src/librygel-server/rygel-photo-item.vala
+src/librygel-server/rygel-relational-expression.vala
+src/librygel-server/rygel-search-criteria-parser.vala
+src/librygel-server/rygel-search-expression.vala
+src/librygel-server/rygel-search.vala
+src/librygel-server/rygel-simple-container.vala
+src/librygel-server/rygel-source-connection-manager.vala
+src/librygel-server/rygel-subtitle-manager.vala
+src/librygel-server/rygel-subtitle.vala
+src/librygel-server/rygel-thumbnail.vala
+src/librygel-server/rygel-thumbnailer.vala
+src/librygel-server/rygel-transcode-manager.vala
+src/librygel-server/rygel-transcoder.vala
+src/librygel-server/rygel-video-item.vala
+src/librygel-server/rygel-visual-item.vala
+src/librygel-server/rygel-wmv-transcoder.vala
+src/librygel-server/rygel-xbox-hacks.vala
src/rygel/rygel-dbus-service.vala
src/rygel/rygel-main.vala
src/ui/rygel-media-pref-section.vala
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index be8398c..7418927 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -6,8 +6,6 @@ data/xml/ContentDirectory.xml
data/xml/MediaRenderer2.xml
data/xml/MediaServer2.xml
data/xml/RenderingControl2.xml
-src/librygel-renderer/rygel-playbin-player.c
-src/librygel-renderer/rygel-playbin-plugin.c
src/plugins/mediathek/rygel-mediathek-asx-playlist-parser.vala
src/plugins/mediathek/rygel-mediathek-mov-playlist-parser.vala
src/plugins/mediathek/rygel-mediathek-playlist-parser.vala
@@ -16,95 +14,24 @@ src/plugins/mediathek/rygel-mediathek-root-container.vala
src/plugins/mediathek/rygel-mediathek-rss-container.vala
src/plugins/mediathek/rygel-mediathek-soup-utils.vala
src/plugins/mediathek/rygel-mediathek-video-item-factory.vala
-src/librygel-core/rygel-aac-transcoder.c
-src/librygel-core/rygel-audio-item.c
-src/librygel-core/rygel-audio-transcoder.c
-src/librygel-core/rygel-avc-transcoder.c
-src/librygel-core/rygel-av-transport.c
-src/librygel-core/rygel-browse.c
-src/librygel-core/rygel-changelog.c
-src/librygel-core/rygel-client-hacks.c
src/librygel-core/rygel-cmdline-config.c
src/librygel-core/rygel-configuration.c
src/librygel-core/rygel-connection-manager.c
-src/librygel-core/rygel-content-directory.c
src/librygel-core/rygel-dbus-interface.c
-src/librygel-core/rygel-dbus-thumbnailer.c
src/librygel-core/rygel-description-file.c
src/librygel-core/rygel-environment-config.c
src/librygel-core/rygel-free-desktop-interfaces.c
-src/librygel-core/rygel-gst-utils.c
-src/librygel-core/rygel-http-byte-seek.c
-src/librygel-core/rygel-http-get.c
-src/librygel-core/rygel-http-get-handler.c
-src/librygel-core/rygel-http-gst-sink.c
-src/librygel-core/rygel-http-identity-handler.c
-src/librygel-core/rygel-http-item-uri.c
-src/librygel-core/rygel-http-post.c
-src/librygel-core/rygel-http-request.c
-src/librygel-core/rygel-http-response.c
-src/librygel-core/rygel-http-seek.c
-src/librygel-core/rygel-http-server.c
-src/librygel-core/rygel-http-time-seek.c
-src/librygel-core/rygel-http-transcode-handler.c
src/librygel-core/rygel-icon-info.c
-src/librygel-core/rygel-image-item.c
-src/librygel-core/rygel-import-resource.c
-src/librygel-core/rygel-item-creator.c
-src/librygel-core/rygel-item-destroyer.c
-src/librygel-core/rygel-item-removal-queue.c
-src/librygel-core/rygel-l16-transcoder.c
src/librygel-core/rygel-log-handler.c
-src/librygel-core/rygel-logical-expression.c
-src/librygel-core/rygel-media-art-store.c
-src/librygel-core/rygel-media-container.c
src/librygel-core/rygel-media-device.c
-src/librygel-core/rygel-media-item.c
-src/librygel-core/rygel-media-object.c
-src/librygel-core/rygel-media-objects.c
-src/librygel-core/rygel-media-player.c
-src/librygel-core/rygel-media-query-action.c
-src/librygel-core/rygel-media-receiver-registrar.c
-src/librygel-core/rygel-media-renderer-plugin.c
-src/librygel-core/rygel-media-server-plugin.c
src/librygel-core/rygel-meta-config.c
-src/librygel-core/rygel-mp2ts-transcoder.c
-src/librygel-core/rygel-mp3-transcoder.c
-src/librygel-core/rygel-music-item.c
-src/librygel-core/rygel-panasonic-hacks.c
-src/librygel-core/rygel-photo-item.c
src/librygel-core/rygel-plugin.c
src/librygel-core/rygel-plugin-loader.c
-src/librygel-core/rygel-relational-expression.c
-src/librygel-core/rygel-rendering-control.c
src/librygel-core/rygel-resource-info.c
src/librygel-core/rygel-root-device.c
src/librygel-core/rygel-root-device-factory.c
-src/librygel-core/rygel-searchable-container.c
-src/librygel-core/rygel-search.c
-src/librygel-core/rygel-search-criteria-parser.c
-src/librygel-core/rygel-search-expression.c
-src/librygel-core/rygel-simple-container.c
-src/librygel-core/rygel-sink-connection-manager.c
-src/librygel-core/rygel-source-connection-manager.c
src/librygel-core/rygel-state-machine.c
-src/librygel-core/rygel-subtitle.c
-src/librygel-core/rygel-subtitle-manager.c
-src/librygel-core/rygel-thumbnail.c
-src/librygel-core/rygel-thumbnailer.c
-src/librygel-core/rygel-transcode-manager.c
-src/librygel-core/rygel-transcoder.c
src/librygel-core/rygel-user-config.c
-src/librygel-core/rygel-v1-hacks.c
-src/librygel-core/rygel-video-item.c
-src/librygel-core/rygel-video-transcoder.c
-src/librygel-core/rygel-visual-item.c
-src/librygel-core/rygel-volume.c
-src/librygel-core/rygel-wmp-hacks.c
-src/librygel-core/rygel-wmv-transcoder.c
-src/librygel-core/rygel-writable-container.c
-src/librygel-core/rygel-xbmc-hacks.c
-src/librygel-core/rygel-xbox-hacks.c
src/librygel-core/rygel-xml-utils.c
src/librygel-renderer/rygel-av-transport.c
src/librygel-renderer/rygel-changelog.c
@@ -117,6 +44,71 @@ src/librygel-renderer/rygel-playbin-renderer.c
src/librygel-renderer/rygel-rendering-control.c
src/librygel-renderer/rygel-sink-connection-manager.c
src/librygel-renderer/rygel-volume.c
+src/librygel-server/rygel-aac-transcoder.c
+src/librygel-server/rygel-audio-item.c
+src/librygel-server/rygel-audio-transcoder.c
+src/librygel-server/rygel-avc-transcoder.c
+src/librygel-server/rygel-browse.c
+src/librygel-server/rygel-client-hacks.c
+src/librygel-server/rygel-content-directory.c
+src/librygel-server/rygel-dbus-thumbnailer.c
+src/librygel-server/rygel-gst-utils.c
+src/librygel-server/rygel-http-byte-seek.c
+src/librygel-server/rygel-http-get.c
+src/librygel-server/rygel-http-get-handler.c
+src/librygel-server/rygel-http-gst-sink.c
+src/librygel-server/rygel-http-identity-handler.c
+src/librygel-server/rygel-http-item-uri.c
+src/librygel-server/rygel-http-post.c
+src/librygel-server/rygel-http-request.c
+src/librygel-server/rygel-http-response.c
+src/librygel-server/rygel-http-seek.c
+src/librygel-server/rygel-http-server.c
+src/librygel-server/rygel-http-time-seek.c
+src/librygel-server/rygel-http-transcode-handler.c
+src/librygel-server/rygel-image-item.c
+src/librygel-server/rygel-import-resource.c
+src/librygel-server/rygel-item-creator.c
+src/librygel-server/rygel-item-destroyer.c
+src/librygel-server/rygel-item-removal-queue.c
+src/librygel-server/rygel-l16-transcoder.c
+src/librygel-server/rygel-logical-expression.c
+src/librygel-server/rygel-media-art-store.c
+src/librygel-server/rygel-media-container.c
+src/librygel-server/rygel-media-item.c
+src/librygel-server/rygel-media-object.c
+src/librygel-server/rygel-media-objects.c
+src/librygel-server/rygel-media-query-action.c
+src/librygel-server/rygel-media-receiver-registrar.c
+src/librygel-server/rygel-media-server.c
+src/librygel-server/rygel-media-server-plugin.c
+src/librygel-server/rygel-mp2ts-transcoder.c
+src/librygel-server/rygel-mp3-transcoder.c
+src/librygel-server/rygel-music-item.c
+src/librygel-server/rygel-panasonic-hacks.c
+src/librygel-server/rygel-photo-item.c
+src/librygel-server/rygel-relational-expression.c
+src/librygel-server/rygel-searchable-container.c
+src/librygel-server/rygel-search.c
+src/librygel-server/rygel-search-criteria-parser.c
+src/librygel-server/rygel-search-expression.c
+src/librygel-server/rygel-simple-container.c
+src/librygel-server/rygel-source-connection-manager.c
+src/librygel-server/rygel-subtitle.c
+src/librygel-server/rygel-subtitle-manager.c
+src/librygel-server/rygel-thumbnail.c
+src/librygel-server/rygel-thumbnailer.c
+src/librygel-server/rygel-transcode-manager.c
+src/librygel-server/rygel-transcoder.c
+src/librygel-server/rygel-v1-hacks.c
+src/librygel-server/rygel-video-item.c
+src/librygel-server/rygel-video-transcoder.c
+src/librygel-server/rygel-visual-item.c
+src/librygel-server/rygel-wmp-hacks.c
+src/librygel-server/rygel-wmv-transcoder.c
+src/librygel-server/rygel-writable-container.c
+src/librygel-server/rygel-xbmc-hacks.c
+src/librygel-server/rygel-xbox-hacks.c
src/plugins/external/rygel-external-album-art-factory.c
src/plugins/external/rygel-external-container.c
src/plugins/external/rygel-external-dummy-container.c
@@ -126,11 +118,13 @@ src/plugins/external/rygel-external-item-factory.c
src/plugins/external/rygel-external-plugin.c
src/plugins/external/rygel-external-plugin-factory.c
src/plugins/external/rygel-external-thumbnail-factory.c
+src/plugins/external/rygel-external-variant-util.c
src/plugins/gst-launch/rygel-gst-launch-audio-item.c
src/plugins/gst-launch/rygel-gst-launch-item.c
src/plugins/gst-launch/rygel-gst-launch-plugin.c
src/plugins/gst-launch/rygel-gst-launch-root-container.c
src/plugins/gst-launch/rygel-gst-launch-video-item.c
+src/plugins/media-export/rygel-media-export-collate.c
src/plugins/media-export/rygel-media-export-database.c
src/plugins/media-export/rygel-media-export-database-cursor.c
src/plugins/media-export/rygel-media-export-db-container.c
@@ -169,6 +163,7 @@ src/plugins/mpris/rygel-mpris-interfaces.c
src/plugins/mpris/rygel-mpris-player.c
src/plugins/mpris/rygel-mpris-plugin.c
src/plugins/mpris/rygel-mpris-plugin-factory.c
+src/plugins/playbin/rygel-module.c
src/plugins/test/rygel-test-audio-item.c
src/plugins/test/rygel-test-plugin.c
src/plugins/test/rygel-test-root-container.c
@@ -208,103 +203,13 @@ src/plugins/tracker/rygel-tracker-titles.c
src/plugins/tracker/rygel-tracker-video-item-factory.c
src/plugins/tracker/rygel-tracker-videos.c
src/plugins/tracker/rygel-tracker-years.c
-src/librygel-core/rygel-aac-transcoder.c
-src/librygel-core/rygel-audio-item.c
-src/librygel-core/rygel-audio-transcoder.c
-src/librygel-core/rygel-avc-transcoder.c
-src/librygel-core/rygel-av-transport.c
-src/librygel-core/rygel-browse.c
-src/librygel-core/rygel-changelog.c
-src/librygel-core/rygel-client-hacks.c
-src/librygel-core/rygel-cmdline-config.c
-src/librygel-core/rygel-configuration.c
-src/librygel-core/rygel-connection-manager.c
-src/librygel-core/rygel-content-directory.c
-src/librygel-core/rygel-dbus-interface.c
-src/librygel-core/rygel-dbus-thumbnailer.c
-src/librygel-core/rygel-description-file.c
-src/librygel-core/rygel-environment-config.c
-src/librygel-core/rygel-free-desktop-interfaces.c
-src/librygel-core/rygel-gst-utils.c
-src/librygel-core/rygel-http-byte-seek.c
-src/librygel-core/rygel-http-get.c
-src/librygel-core/rygel-http-get-handler.c
-src/librygel-core/rygel-http-gst-sink.c
-src/librygel-core/rygel-http-identity-handler.c
-src/librygel-core/rygel-http-item-uri.c
-src/librygel-core/rygel-http-post.c
-src/librygel-core/rygel-http-request.c
-src/librygel-core/rygel-http-response.c
-src/librygel-core/rygel-http-seek.c
-src/librygel-core/rygel-http-server.c
-src/librygel-core/rygel-http-time-seek.c
-src/librygel-core/rygel-http-transcode-handler.c
-src/librygel-core/rygel-icon-info.c
-src/librygel-core/rygel-image-item.c
-src/librygel-core/rygel-import-resource.c
-src/librygel-core/rygel-item-creator.c
-src/librygel-core/rygel-item-destroyer.c
-src/librygel-core/rygel-item-removal-queue.c
-src/librygel-core/rygel-l16-transcoder.c
-src/librygel-core/rygel-log-handler.c
-src/librygel-core/rygel-logical-expression.c
-src/librygel-core/rygel-media-art-store.c
-src/librygel-core/rygel-media-container.c
-src/librygel-core/rygel-media-item.c
-src/librygel-core/rygel-media-object.c
-src/librygel-core/rygel-media-objects.c
-src/librygel-core/rygel-media-player.c
-src/librygel-core/rygel-media-query-action.c
-src/librygel-core/rygel-media-receiver-registrar.c
-src/librygel-core/rygel-media-renderer-plugin.c
-src/librygel-core/rygel-media-server-plugin.c
-src/librygel-core/rygel-meta-config.c
-src/librygel-core/rygel-mp2ts-transcoder.c
-src/librygel-core/rygel-mp3-transcoder.c
-src/librygel-core/rygel-music-item.c
-src/librygel-core/rygel-panasonic-hacks.c
-src/librygel-core/rygel-photo-item.c
-src/librygel-core/rygel-plugin.c
-src/librygel-core/rygel-plugin-loader.c
-src/librygel-core/rygel-relational-expression.c
-src/librygel-core/rygel-rendering-control.c
-src/librygel-core/rygel-resource-info.c
-src/librygel-core/rygel-root-device.c
-src/librygel-core/rygel-root-device-factory.c
-src/librygel-core/rygel-searchable-container.c
-src/librygel-core/rygel-search.c
-src/librygel-core/rygel-search-criteria-parser.c
-src/librygel-core/rygel-search-expression.c
-src/librygel-core/rygel-signal-handler.c
-src/librygel-core/rygel-simple-container.c
-src/librygel-core/rygel-sink-connection-manager.c
-src/librygel-core/rygel-source-connection-manager.c
-src/librygel-core/rygel-state-machine.c
-src/librygel-core/rygel-subtitle.c
-src/librygel-core/rygel-subtitle-manager.c
-src/librygel-core/rygel-thumbnail.c
-src/librygel-core/rygel-thumbnailer.c
-src/librygel-core/rygel-transcode-manager.c
-src/librygel-core/rygel-transcoder.c
-src/librygel-core/rygel-user-config.c
-src/librygel-core/rygel-v1-hacks.c
-src/librygel-core/rygel-video-item.c
-src/librygel-core/rygel-video-transcoder.c
-src/librygel-core/rygel-visual-item.c
-src/librygel-core/rygel-volume.c
-src/librygel-core/rygel-wmp-hacks.c
-src/librygel-core/rygel-wmv-transcoder.c
-src/librygel-core/rygel-writable-container.c
-src/librygel-core/rygel-xbmc-hacks.c
-src/librygel-core/rygel-xbox-hacks.c
-src/librygel-core/rygel-xml-utils.c
+src/rygel/rygel-dbus-service.c
+src/rygel/rygel-main.c
src/ui/rygel-media-pref-section.c
src/ui/rygel-network-pref-section.c
src/ui/rygel-preferences-dialog.c
src/ui/rygel-preferences-section.c
src/ui/rygel-writable-user-config.c
-src/rygel/rygel-dbus-service.c
-src/rygel/rygel-main.c
tests/rygel-album-art-spec-test.c
tests/rygel-gst-utils.c
tests/rygel-http-byte-seek.c
diff --git a/src/librygel-core/filelist.am b/src/librygel-core/filelist.am
index 9506a05..d98cb74 100644
--- a/src/librygel-core/filelist.am
+++ b/src/librygel-core/filelist.am
@@ -1,91 +1,29 @@
LIBRYGEL_CORE_VAPI_SOURCE_FILES = \
rygel-cmdline-config.vala \
rygel-connection-manager.vala \
+ rygel-description-file.vala \
rygel-root-device.vala \
rygel-root-device-factory.vala \
- rygel-audio-item.vala \
rygel-dbus-interface.vala \
- rygel-icon-info.vala \
- rygel-image-item.vala \
rygel-log-handler.vala \
- rygel-logical-expression.vala \
- rygel-media-art-store.vala \
- rygel-media-objects.vala \
rygel-meta-config.vala \
- rygel-music-item.vala \
- rygel-photo-item.vala \
rygel-plugin-loader.vala \
rygel-plugin.vala \
- rygel-relational-expression.vala \
rygel-resource-info.vala \
- rygel-simple-container.vala \
- rygel-subtitle.vala \
- rygel-thumbnail.vala \
rygel-user-config.vala \
- rygel-video-item.vala \
- rygel-media-container.vala \
rygel-media-device.vala \
- rygel-media-item.vala \
- rygel-media-object.vala \
- rygel-media-server-plugin.vala \
- rygel-search-expression.vala \
rygel-configuration.vala \
rygel-free-desktop-interfaces.vala \
- rygel-searchable-container.vala \
- rygel-state-machine.vala \
- rygel-visual-item.vala \
- rygel-writable-container.vala \
- rygel-xml-utils.vala
+ rygel-state-machine.vala
LIBRYGEL_CORE_NONVAPI_SOURCE_FILES = \
- rygel-http-item-uri.vala \
- rygel-environment-config.vala \
- rygel-content-directory.vala \
- rygel-source-connection-manager.vala \
- rygel-transcode-manager.vala \
- rygel-http-server.vala \
- rygel-http-request.vala \
- rygel-http-get-handler.vala \
- rygel-http-get.vala \
- rygel-http-post.vala \
- rygel-http-identity-handler.vala \
- rygel-http-transcode-handler.vala \
- rygel-http-seek.vala \
- rygel-http-byte-seek.vala \
- rygel-http-time-seek.vala \
- rygel-http-response.vala \
- rygel-http-gst-sink.vala \
- rygel-thumbnailer.vala \
- rygel-dbus-thumbnailer.vala \
- rygel-subtitle-manager.vala \
- rygel-media-query-action.vala \
- rygel-browse.vala \
- rygel-search.vala \
- rygel-client-hacks.vala \
- rygel-xbox-hacks.vala \
- rygel-panasonic-hacks.vala \
- rygel-xbmc-hacks.vala \
- rygel-wmp-hacks.vala \
- rygel-v1-hacks.vala \
- rygel-import-resource.vala \
- rygel-item-creator.vala \
- rygel-item-destroyer.vala \
- rygel-item-removal-queue.vala \
- rygel-search-criteria-parser.vala \
- rygel-transcoder.vala \
- rygel-audio-transcoder.vala \
- rygel-video-transcoder.vala \
- rygel-mp2ts-transcoder.vala \
- rygel-mp3-transcoder.vala \
- rygel-l16-transcoder.vala \
- rygel-wmv-transcoder.vala \
- rygel-aac-transcoder.vala \
- rygel-avc-transcoder.vala \
- rygel-gst-utils.vala \
- rygel-media-receiver-registrar.vala \
- rygel-description-file.vala
+ rygel-icon-info.vala \
+ rygel-xml-utils.vala \
+ rygel-environment-config.vala
LIBRYGEL_CORE_VALAFLAGS_PKG = \
+ --pkg gio-2.0 \
--pkg gstreamer-0.10 \
--pkg gstreamer-base-0.10 \
- --pkg gupnp-dlna-1.0
+ --pkg gupnp-dlna-1.0 \
+ --pkg uuid
diff --git a/src/librygel-core/rygel-description-file.vala b/src/librygel-core/rygel-description-file.vala
index ee3e330..27b0fd0 100644
--- a/src/librygel-core/rygel-description-file.vala
+++ b/src/librygel-core/rygel-description-file.vala
@@ -27,7 +27,7 @@ using Xml;
* Represents a device description document and offers methods for easy
* manipulation of those.
*/
-internal class DescriptionFile : Object {
+public class DescriptionFile : Object {
/// XML doc wrapper representing the description document
private XMLDoc doc;
@@ -75,7 +75,7 @@ internal class DescriptionFile : Object {
*
* Usually the name of the software implementing this device.
*
- * @param device_type is the new model name.
+ * @param model_name is the new model name.
*/
public void set_model_name (string model_name) {
this.set_device_element ("modelName", model_name);
@@ -150,7 +150,7 @@ internal class DescriptionFile : Object {
* If a file with the same name exists it will be overwritten.
*
* @param path is a path to a file.
- * @throws IOError.FAILED if anything fails while creating the XML dump.
+ * @throws GLib.Error if anything fails while creating the XML dump.
*/
public void save (string path) throws GLib.Error {
var file = FileStream.open (path, "w+");
diff --git a/src/librygel-core/rygel-plugin.vala b/src/librygel-core/rygel-plugin.vala
index 3d0b6e1..f170a79 100644
--- a/src/librygel-core/rygel-plugin.vala
+++ b/src/librygel-core/rygel-plugin.vala
@@ -127,6 +127,11 @@ public class Rygel.Plugin : GUPnP.ResourceFactory {
this.icon_infos.add (icon_info);
}
+ public virtual void apply_hacks (RootDevice device,
+ string description_path)
+ throws Error {
+ }
+
private void add_default_icon (string mime_type,
string file_extension,
string uri,
diff --git a/src/librygel-core/rygel-root-device-factory.vala b/src/librygel-core/rygel-root-device-factory.vala
index 73633ed..a9a304f 100644
--- a/src/librygel-core/rygel-root-device-factory.vala
+++ b/src/librygel-core/rygel-root-device-factory.vala
@@ -28,15 +28,6 @@
using GUPnP;
-[CCode (cname = "uuid_generate", cheader_filename = "uuid/uuid.h")]
-internal extern static void uuid_generate ([CCode (array_length = false)]
- uchar[] uuid);
-[CCode (cname = "uuid_unparse", cheader_filename = "uuid/uuid.h")]
-internal extern static void uuid_unparse ([CCode (array_length = false)]
- uchar[] uuid,
- [CCode (array_length = false)]
- uchar[] output);
-
public errordomain RootDeviceFactoryError {
XML_PARSE,
}
@@ -77,13 +68,7 @@ public class Rygel.RootDeviceFactory {
doc,
desc_path,
BuildConfig.DATA_DIR);
- // Apply V1 downgrades
- var v1_hacks = new V1Hacks ();
- v1_hacks.apply_on_device (device, desc_path);
-
- // Apply XBox hacks on top of that
- var xbox_hacks = new XBoxHacks ();
- xbox_hacks.apply_on_device (device, v1_hacks.description_path);
+ plugin.apply_hacks (device, desc_path);
return device;
}
@@ -359,8 +344,8 @@ public class Rygel.RootDeviceFactory {
var id = new uchar[16];
/* Generate new UUID */
- uuid_generate (id);
- uuid_unparse (id, udn);
+ UUID.generate (id);
+ UUID.unparse (id, udn);
return "uuid:" + (string) udn;
}
diff --git a/src/librygel-core/rygel-root-device.vala b/src/librygel-core/rygel-root-device.vala
index 4adf28d..d07b8ce 100644
--- a/src/librygel-core/rygel-root-device.vala
+++ b/src/librygel-core/rygel-root-device.vala
@@ -30,7 +30,7 @@ using Gee;
* Represents a Root device.
*/
public class Rygel.RootDevice: GUPnP.RootDevice {
- internal ArrayList<ServiceInfo> services; /* Services we implement */
+ public ArrayList<ServiceInfo> services { get; internal set; } /* Services we implement */
public RootDevice (GUPnP.Context context,
Plugin plugin,
diff --git a/src/librygel-core/uuid.vapi b/src/librygel-core/uuid.vapi
new file mode 100644
index 0000000..1279ccc
--- /dev/null
+++ b/src/librygel-core/uuid.vapi
@@ -0,0 +1,7 @@
+[CCode (cheader_filename = "uuid/uuid.h")]
+namespace UUID {
+ public static void generate ([CCode (array_length = false)] uchar[] uuid);
+ public static void unparse ([CCode (array_length = false)] uchar[] uuid,
+ [CCode (array_length = false)] uchar[] output);
+
+}
diff --git a/src/librygel-server/Makefile.am b/src/librygel-server/Makefile.am
index a35ce56..70ce573 100644
--- a/src/librygel-server/Makefile.am
+++ b/src/librygel-server/Makefile.am
@@ -5,14 +5,20 @@ lib_LTLIBRARIES = librygel-server-1.0.la
LIBRYGEL_SERVER_VERSION=0:0:0
+AM_CFLAGS += -DG_LOG_DOMAIN=\"Rygel\" \
+ $(LIBGUPNP_DLNA_CFLAGS)
+
librygel_server_1_0_la_SOURCES = \
$(LIBRYGEL_SERVER_VAPI_SOURCE_FILES) \
$(LIBRYGEL_SERVER_NONVAPI_SOURCE_FILES)
librygel_server_1_0_la_VALAFLAGS = \
-H rygel-server.h --library=rygel-server-1.0 \
+ $(LIBRYGEL_SERVER_VALAFLAGS_PKG) \
$(RYGEL_COMMON_PLUGIN_VALAFLAGS)
-librygel_server_1_0_la_LIBADD = $(RYGEL_COMMON_LIBS)
+librygel_server_1_0_la_LIBADD = $(RYGEL_COMMON_LIBS) \
+ $(LIBGUPNP_DLNA_LIBS) \
+ $(GST_PBU_LIBS)
librygel_server_1_0_la_LDFLAGS = -version-info $(LIBRYGEL_SERVER_VERSION)
rygel-server.h rygel-server-1.0.vapi: librygel_server_1_0_la_vala.stamp
diff --git a/src/librygel-server/filelist.am b/src/librygel-server/filelist.am
index 16ead91..7e01d85 100644
--- a/src/librygel-server/filelist.am
+++ b/src/librygel-server/filelist.am
@@ -1,6 +1,76 @@
+
LIBRYGEL_SERVER_VAPI_SOURCE_FILES = \
- rygel-media-server.vala
+ rygel-audio-item.vala \
+ rygel-image-item.vala \
+ rygel-logical-expression.vala \
+ rygel-media-art-store.vala \
+ rygel-media-objects.vala \
+ rygel-music-item.vala \
+ rygel-photo-item.vala \
+ rygel-relational-expression.vala \
+ rygel-simple-container.vala \
+ rygel-subtitle.vala \
+ rygel-thumbnail.vala \
+ rygel-video-item.vala \
+ rygel-media-container.vala \
+ rygel-media-item.vala \
+ rygel-media-object.vala \
+ rygel-media-server-plugin.vala \
+ rygel-search-expression.vala \
+ rygel-searchable-container.vala \
+ rygel-visual-item.vala \
+ rygel-writable-container.vala \
+ rygel-media-server.vala
-LIBRYGEL_SERVER_NONVAPI_SOURCE_FILES =
+LIBRYGEL_SERVER_NONVAPI_SOURCE_FILES = \
+ rygel-aac-transcoder.vala \
+ rygel-audio-transcoder.vala \
+ rygel-avc-transcoder.vala \
+ rygel-browse.vala \
+ rygel-client-hacks.vala \
+ rygel-content-directory.vala \
+ rygel-dbus-thumbnailer.vala \
+ rygel-gst-utils.vala \
+ rygel-http-byte-seek.vala \
+ rygel-http-get-handler.vala \
+ rygel-http-get.vala \
+ rygel-http-gst-sink.vala \
+ rygel-http-identity-handler.vala \
+ rygel-http-item-uri.vala \
+ rygel-http-post.vala \
+ rygel-http-request.vala \
+ rygel-http-response.vala \
+ rygel-http-seek.vala \
+ rygel-http-server.vala \
+ rygel-http-time-seek.vala \
+ rygel-http-transcode-handler.vala \
+ rygel-import-resource.vala \
+ rygel-item-creator.vala \
+ rygel-item-destroyer.vala \
+ rygel-item-removal-queue.vala \
+ rygel-l16-transcoder.vala \
+ rygel-media-query-action.vala \
+ rygel-media-receiver-registrar.vala \
+ rygel-mp2ts-transcoder.vala \
+ rygel-mp3-transcoder.vala \
+ rygel-panasonic-hacks.vala \
+ rygel-search-criteria-parser.vala \
+ rygel-search.vala \
+ rygel-source-connection-manager.vala \
+ rygel-subtitle-manager.vala \
+ rygel-thumbnailer.vala \
+ rygel-transcode-manager.vala \
+ rygel-transcoder.vala \
+ rygel-v1-hacks.vala \
+ rygel-video-transcoder.vala \
+ rygel-wmp-hacks.vala \
+ rygel-wmv-transcoder.vala \
+ rygel-xbmc-hacks.vala \
+ rygel-xbox-hacks.vala
-LIBRYGEL_SERVER_VALAFLAGS_PKG =
+LIBRYGEL_SERVER_VALAFLAGS_PKG = \
+ --pkg gstreamer-0.10 \
+ --pkg gstreamer-base-0.10 \
+ --pkg gstreamer-pbutils-0.10 \
+ --pkg gupnp-dlna-1.0 \
+ --pkg uuid
diff --git a/src/librygel-core/rygel-aac-transcoder.vala b/src/librygel-server/rygel-aac-transcoder.vala
similarity index 100%
rename from src/librygel-core/rygel-aac-transcoder.vala
rename to src/librygel-server/rygel-aac-transcoder.vala
diff --git a/src/librygel-core/rygel-audio-item.vala b/src/librygel-server/rygel-audio-item.vala
similarity index 100%
rename from src/librygel-core/rygel-audio-item.vala
rename to src/librygel-server/rygel-audio-item.vala
diff --git a/src/librygel-core/rygel-audio-transcoder.vala b/src/librygel-server/rygel-audio-transcoder.vala
similarity index 100%
rename from src/librygel-core/rygel-audio-transcoder.vala
rename to src/librygel-server/rygel-audio-transcoder.vala
diff --git a/src/librygel-core/rygel-avc-transcoder.vala b/src/librygel-server/rygel-avc-transcoder.vala
similarity index 100%
rename from src/librygel-core/rygel-avc-transcoder.vala
rename to src/librygel-server/rygel-avc-transcoder.vala
diff --git a/src/librygel-core/rygel-browse.vala b/src/librygel-server/rygel-browse.vala
similarity index 100%
rename from src/librygel-core/rygel-browse.vala
rename to src/librygel-server/rygel-browse.vala
diff --git a/src/librygel-core/rygel-client-hacks.vala b/src/librygel-server/rygel-client-hacks.vala
similarity index 100%
rename from src/librygel-core/rygel-client-hacks.vala
rename to src/librygel-server/rygel-client-hacks.vala
diff --git a/src/librygel-core/rygel-content-directory.vala b/src/librygel-server/rygel-content-directory.vala
similarity index 100%
rename from src/librygel-core/rygel-content-directory.vala
rename to src/librygel-server/rygel-content-directory.vala
diff --git a/src/librygel-core/rygel-dbus-thumbnailer.vala b/src/librygel-server/rygel-dbus-thumbnailer.vala
similarity index 100%
rename from src/librygel-core/rygel-dbus-thumbnailer.vala
rename to src/librygel-server/rygel-dbus-thumbnailer.vala
diff --git a/src/librygel-core/rygel-gst-utils.vala b/src/librygel-server/rygel-gst-utils.vala
similarity index 100%
rename from src/librygel-core/rygel-gst-utils.vala
rename to src/librygel-server/rygel-gst-utils.vala
diff --git a/src/librygel-core/rygel-http-byte-seek.vala b/src/librygel-server/rygel-http-byte-seek.vala
similarity index 100%
rename from src/librygel-core/rygel-http-byte-seek.vala
rename to src/librygel-server/rygel-http-byte-seek.vala
diff --git a/src/librygel-core/rygel-http-get-handler.vala b/src/librygel-server/rygel-http-get-handler.vala
similarity index 100%
rename from src/librygel-core/rygel-http-get-handler.vala
rename to src/librygel-server/rygel-http-get-handler.vala
diff --git a/src/librygel-core/rygel-http-get.vala b/src/librygel-server/rygel-http-get.vala
similarity index 100%
rename from src/librygel-core/rygel-http-get.vala
rename to src/librygel-server/rygel-http-get.vala
diff --git a/src/librygel-core/rygel-http-gst-sink.vala b/src/librygel-server/rygel-http-gst-sink.vala
similarity index 100%
rename from src/librygel-core/rygel-http-gst-sink.vala
rename to src/librygel-server/rygel-http-gst-sink.vala
diff --git a/src/librygel-core/rygel-http-identity-handler.vala b/src/librygel-server/rygel-http-identity-handler.vala
similarity index 100%
rename from src/librygel-core/rygel-http-identity-handler.vala
rename to src/librygel-server/rygel-http-identity-handler.vala
diff --git a/src/librygel-core/rygel-http-item-uri.vala b/src/librygel-server/rygel-http-item-uri.vala
similarity index 100%
rename from src/librygel-core/rygel-http-item-uri.vala
rename to src/librygel-server/rygel-http-item-uri.vala
diff --git a/src/librygel-core/rygel-http-post.vala b/src/librygel-server/rygel-http-post.vala
similarity index 100%
rename from src/librygel-core/rygel-http-post.vala
rename to src/librygel-server/rygel-http-post.vala
diff --git a/src/librygel-core/rygel-http-request.vala b/src/librygel-server/rygel-http-request.vala
similarity index 100%
rename from src/librygel-core/rygel-http-request.vala
rename to src/librygel-server/rygel-http-request.vala
diff --git a/src/librygel-core/rygel-http-response.vala b/src/librygel-server/rygel-http-response.vala
similarity index 100%
rename from src/librygel-core/rygel-http-response.vala
rename to src/librygel-server/rygel-http-response.vala
diff --git a/src/librygel-core/rygel-http-seek.vala b/src/librygel-server/rygel-http-seek.vala
similarity index 100%
rename from src/librygel-core/rygel-http-seek.vala
rename to src/librygel-server/rygel-http-seek.vala
diff --git a/src/librygel-core/rygel-http-server.vala b/src/librygel-server/rygel-http-server.vala
similarity index 100%
rename from src/librygel-core/rygel-http-server.vala
rename to src/librygel-server/rygel-http-server.vala
diff --git a/src/librygel-core/rygel-http-time-seek.vala b/src/librygel-server/rygel-http-time-seek.vala
similarity index 100%
rename from src/librygel-core/rygel-http-time-seek.vala
rename to src/librygel-server/rygel-http-time-seek.vala
diff --git a/src/librygel-core/rygel-http-transcode-handler.vala b/src/librygel-server/rygel-http-transcode-handler.vala
similarity index 100%
rename from src/librygel-core/rygel-http-transcode-handler.vala
rename to src/librygel-server/rygel-http-transcode-handler.vala
diff --git a/src/librygel-core/rygel-image-item.vala b/src/librygel-server/rygel-image-item.vala
similarity index 100%
rename from src/librygel-core/rygel-image-item.vala
rename to src/librygel-server/rygel-image-item.vala
diff --git a/src/librygel-core/rygel-import-resource.vala b/src/librygel-server/rygel-import-resource.vala
similarity index 100%
rename from src/librygel-core/rygel-import-resource.vala
rename to src/librygel-server/rygel-import-resource.vala
diff --git a/src/librygel-core/rygel-item-creator.vala b/src/librygel-server/rygel-item-creator.vala
similarity index 99%
rename from src/librygel-core/rygel-item-creator.vala
rename to src/librygel-server/rygel-item-creator.vala
index 836a976..ad29cc1 100644
--- a/src/librygel-core/rygel-item-creator.vala
+++ b/src/librygel-server/rygel-item-creator.vala
@@ -524,8 +524,8 @@ internal class Rygel.ItemCreator: GLib.Object, Rygel.StateMachine {
var udn = new uchar[50];
var id = new uchar[16];
- uuid_generate (id);
- uuid_unparse (id, udn);
+ UUID.generate (id);
+ UUID.unparse (id, udn);
return file.get_uri () + (string) udn;
}
diff --git a/src/librygel-core/rygel-item-destroyer.vala b/src/librygel-server/rygel-item-destroyer.vala
similarity index 100%
rename from src/librygel-core/rygel-item-destroyer.vala
rename to src/librygel-server/rygel-item-destroyer.vala
diff --git a/src/librygel-core/rygel-item-removal-queue.vala b/src/librygel-server/rygel-item-removal-queue.vala
similarity index 100%
rename from src/librygel-core/rygel-item-removal-queue.vala
rename to src/librygel-server/rygel-item-removal-queue.vala
diff --git a/src/librygel-core/rygel-l16-transcoder.vala b/src/librygel-server/rygel-l16-transcoder.vala
similarity index 100%
rename from src/librygel-core/rygel-l16-transcoder.vala
rename to src/librygel-server/rygel-l16-transcoder.vala
diff --git a/src/librygel-core/rygel-logical-expression.vala b/src/librygel-server/rygel-logical-expression.vala
similarity index 100%
rename from src/librygel-core/rygel-logical-expression.vala
rename to src/librygel-server/rygel-logical-expression.vala
diff --git a/src/librygel-core/rygel-media-art-store.vala b/src/librygel-server/rygel-media-art-store.vala
similarity index 100%
rename from src/librygel-core/rygel-media-art-store.vala
rename to src/librygel-server/rygel-media-art-store.vala
diff --git a/src/librygel-core/rygel-media-container.vala b/src/librygel-server/rygel-media-container.vala
similarity index 100%
rename from src/librygel-core/rygel-media-container.vala
rename to src/librygel-server/rygel-media-container.vala
diff --git a/src/librygel-core/rygel-media-item.vala b/src/librygel-server/rygel-media-item.vala
similarity index 100%
rename from src/librygel-core/rygel-media-item.vala
rename to src/librygel-server/rygel-media-item.vala
diff --git a/src/librygel-core/rygel-media-object.vala b/src/librygel-server/rygel-media-object.vala
similarity index 100%
rename from src/librygel-core/rygel-media-object.vala
rename to src/librygel-server/rygel-media-object.vala
diff --git a/src/librygel-core/rygel-media-objects.vala b/src/librygel-server/rygel-media-objects.vala
similarity index 100%
rename from src/librygel-core/rygel-media-objects.vala
rename to src/librygel-server/rygel-media-objects.vala
diff --git a/src/librygel-core/rygel-media-query-action.vala b/src/librygel-server/rygel-media-query-action.vala
similarity index 100%
rename from src/librygel-core/rygel-media-query-action.vala
rename to src/librygel-server/rygel-media-query-action.vala
diff --git a/src/librygel-core/rygel-media-receiver-registrar.vala b/src/librygel-server/rygel-media-receiver-registrar.vala
similarity index 100%
rename from src/librygel-core/rygel-media-receiver-registrar.vala
rename to src/librygel-server/rygel-media-receiver-registrar.vala
diff --git a/src/librygel-core/rygel-media-server-plugin.vala b/src/librygel-server/rygel-media-server-plugin.vala
similarity index 87%
rename from src/librygel-core/rygel-media-server-plugin.vala
rename to src/librygel-server/rygel-media-server-plugin.vala
index 13293ae..28a4e84 100644
--- a/src/librygel-core/rygel-media-server-plugin.vala
+++ b/src/librygel-server/rygel-media-server-plugin.vala
@@ -68,6 +68,18 @@ public abstract class Rygel.MediaServerPlugin : Rygel.Plugin {
}
}
+ public override void apply_hacks (RootDevice device,
+ string description_path)
+ throws Error {
+ // Apply V1 downgrades
+ var v1_hacks = new V1Hacks ();
+ v1_hacks.apply_on_device (device, description_path);
+
+ // Apply XBox hacks on top of that
+ var xbox_hacks = new XBoxHacks ();
+ xbox_hacks.apply_on_device (device, v1_hacks.description_path);
+ }
+
private void on_container_updated (MediaContainer root_container,
MediaContainer updated) {
if (updated != root_container || updated.child_count == 0) {
diff --git a/src/librygel-core/rygel-mp2ts-transcoder.vala b/src/librygel-server/rygel-mp2ts-transcoder.vala
similarity index 100%
rename from src/librygel-core/rygel-mp2ts-transcoder.vala
rename to src/librygel-server/rygel-mp2ts-transcoder.vala
diff --git a/src/librygel-core/rygel-mp3-transcoder.vala b/src/librygel-server/rygel-mp3-transcoder.vala
similarity index 100%
rename from src/librygel-core/rygel-mp3-transcoder.vala
rename to src/librygel-server/rygel-mp3-transcoder.vala
diff --git a/src/librygel-core/rygel-music-item.vala b/src/librygel-server/rygel-music-item.vala
similarity index 100%
rename from src/librygel-core/rygel-music-item.vala
rename to src/librygel-server/rygel-music-item.vala
diff --git a/src/librygel-core/rygel-panasonic-hacks.vala b/src/librygel-server/rygel-panasonic-hacks.vala
similarity index 100%
rename from src/librygel-core/rygel-panasonic-hacks.vala
rename to src/librygel-server/rygel-panasonic-hacks.vala
diff --git a/src/librygel-core/rygel-photo-item.vala b/src/librygel-server/rygel-photo-item.vala
similarity index 100%
rename from src/librygel-core/rygel-photo-item.vala
rename to src/librygel-server/rygel-photo-item.vala
diff --git a/src/librygel-core/rygel-relational-expression.vala b/src/librygel-server/rygel-relational-expression.vala
similarity index 100%
rename from src/librygel-core/rygel-relational-expression.vala
rename to src/librygel-server/rygel-relational-expression.vala
diff --git a/src/librygel-core/rygel-search-criteria-parser.vala b/src/librygel-server/rygel-search-criteria-parser.vala
similarity index 100%
rename from src/librygel-core/rygel-search-criteria-parser.vala
rename to src/librygel-server/rygel-search-criteria-parser.vala
diff --git a/src/librygel-core/rygel-search-expression.vala b/src/librygel-server/rygel-search-expression.vala
similarity index 100%
rename from src/librygel-core/rygel-search-expression.vala
rename to src/librygel-server/rygel-search-expression.vala
diff --git a/src/librygel-core/rygel-search.vala b/src/librygel-server/rygel-search.vala
similarity index 100%
rename from src/librygel-core/rygel-search.vala
rename to src/librygel-server/rygel-search.vala
diff --git a/src/librygel-core/rygel-searchable-container.vala b/src/librygel-server/rygel-searchable-container.vala
similarity index 100%
rename from src/librygel-core/rygel-searchable-container.vala
rename to src/librygel-server/rygel-searchable-container.vala
diff --git a/src/librygel-core/rygel-simple-container.vala b/src/librygel-server/rygel-simple-container.vala
similarity index 100%
rename from src/librygel-core/rygel-simple-container.vala
rename to src/librygel-server/rygel-simple-container.vala
diff --git a/src/librygel-core/rygel-source-connection-manager.vala b/src/librygel-server/rygel-source-connection-manager.vala
similarity index 100%
rename from src/librygel-core/rygel-source-connection-manager.vala
rename to src/librygel-server/rygel-source-connection-manager.vala
diff --git a/src/librygel-core/rygel-subtitle-manager.vala b/src/librygel-server/rygel-subtitle-manager.vala
similarity index 100%
rename from src/librygel-core/rygel-subtitle-manager.vala
rename to src/librygel-server/rygel-subtitle-manager.vala
diff --git a/src/librygel-core/rygel-subtitle.vala b/src/librygel-server/rygel-subtitle.vala
similarity index 100%
rename from src/librygel-core/rygel-subtitle.vala
rename to src/librygel-server/rygel-subtitle.vala
diff --git a/src/librygel-core/rygel-thumbnail.vala b/src/librygel-server/rygel-thumbnail.vala
similarity index 100%
rename from src/librygel-core/rygel-thumbnail.vala
rename to src/librygel-server/rygel-thumbnail.vala
diff --git a/src/librygel-core/rygel-thumbnailer.vala b/src/librygel-server/rygel-thumbnailer.vala
similarity index 100%
rename from src/librygel-core/rygel-thumbnailer.vala
rename to src/librygel-server/rygel-thumbnailer.vala
diff --git a/src/librygel-core/rygel-transcode-manager.vala b/src/librygel-server/rygel-transcode-manager.vala
similarity index 100%
rename from src/librygel-core/rygel-transcode-manager.vala
rename to src/librygel-server/rygel-transcode-manager.vala
diff --git a/src/librygel-core/rygel-transcoder.vala b/src/librygel-server/rygel-transcoder.vala
similarity index 100%
rename from src/librygel-core/rygel-transcoder.vala
rename to src/librygel-server/rygel-transcoder.vala
diff --git a/src/librygel-core/rygel-v1-hacks.vala b/src/librygel-server/rygel-v1-hacks.vala
similarity index 100%
rename from src/librygel-core/rygel-v1-hacks.vala
rename to src/librygel-server/rygel-v1-hacks.vala
diff --git a/src/librygel-core/rygel-video-item.vala b/src/librygel-server/rygel-video-item.vala
similarity index 100%
rename from src/librygel-core/rygel-video-item.vala
rename to src/librygel-server/rygel-video-item.vala
diff --git a/src/librygel-core/rygel-video-transcoder.vala b/src/librygel-server/rygel-video-transcoder.vala
similarity index 100%
rename from src/librygel-core/rygel-video-transcoder.vala
rename to src/librygel-server/rygel-video-transcoder.vala
diff --git a/src/librygel-core/rygel-visual-item.vala b/src/librygel-server/rygel-visual-item.vala
similarity index 100%
rename from src/librygel-core/rygel-visual-item.vala
rename to src/librygel-server/rygel-visual-item.vala
diff --git a/src/librygel-core/rygel-wmp-hacks.vala b/src/librygel-server/rygel-wmp-hacks.vala
similarity index 100%
rename from src/librygel-core/rygel-wmp-hacks.vala
rename to src/librygel-server/rygel-wmp-hacks.vala
diff --git a/src/librygel-core/rygel-wmv-transcoder.vala b/src/librygel-server/rygel-wmv-transcoder.vala
similarity index 100%
rename from src/librygel-core/rygel-wmv-transcoder.vala
rename to src/librygel-server/rygel-wmv-transcoder.vala
diff --git a/src/librygel-core/rygel-writable-container.vala b/src/librygel-server/rygel-writable-container.vala
similarity index 100%
rename from src/librygel-core/rygel-writable-container.vala
rename to src/librygel-server/rygel-writable-container.vala
diff --git a/src/librygel-core/rygel-xbmc-hacks.vala b/src/librygel-server/rygel-xbmc-hacks.vala
similarity index 100%
rename from src/librygel-core/rygel-xbmc-hacks.vala
rename to src/librygel-server/rygel-xbmc-hacks.vala
diff --git a/src/librygel-core/rygel-xbox-hacks.vala b/src/librygel-server/rygel-xbox-hacks.vala
similarity index 100%
rename from src/librygel-core/rygel-xbox-hacks.vala
rename to src/librygel-server/rygel-xbox-hacks.vala
diff --git a/src/plugins/external/Makefile.am b/src/plugins/external/Makefile.am
index 0cc7dc1..644e722 100644
--- a/src/plugins/external/Makefile.am
+++ b/src/plugins/external/Makefile.am
@@ -16,6 +16,6 @@ librygel_external_la_SOURCES = \
rygel-external-icon-factory.vala \
rygel-external-variant-util.vala
-librygel_external_la_VALAFLAGS = $(RYGEL_COMMON_PLUGIN_VALAFLAGS)
-librygel_external_la_LIBADD = $(RYGEL_COMMON_LIBS)
+librygel_external_la_VALAFLAGS = $(RYGEL_COMMON_SERVER_PLUGIN_VALAFLAGS)
+librygel_external_la_LIBADD = $(RYGEL_COMMON_SERVER_LIBS)
librygel_external_la_LDFLAGS = $(RYGEL_PLUGIN_LINKER_FLAGS)
diff --git a/src/plugins/gst-launch/Makefile.am b/src/plugins/gst-launch/Makefile.am
index 39922cf..e5fc0cf 100644
--- a/src/plugins/gst-launch/Makefile.am
+++ b/src/plugins/gst-launch/Makefile.am
@@ -11,6 +11,6 @@ librygel_gst_launch_la_SOURCES = \
rygel-gst-launch-audio-item.vala \
rygel-gst-launch-video-item.vala
-librygel_gst_launch_la_VALAFLAGS = $(RYGEL_COMMON_PLUGIN_VALAFLAGS)
-librygel_gst_launch_la_LIBADD = $(RYGEL_COMMON_LIBS)
+librygel_gst_launch_la_VALAFLAGS = $(RYGEL_COMMON_SERVER_PLUGIN_VALAFLAGS)
+librygel_gst_launch_la_LIBADD = $(RYGEL_COMMON_SERVER_LIBS)
librygel_gst_launch_la_LDFLAGS = $(RYGEL_PLUGIN_LINKER_FLAGS)
diff --git a/src/plugins/media-export/Makefile.am b/src/plugins/media-export/Makefile.am
index 75c9561..e4f8f4d 100644
--- a/src/plugins/media-export/Makefile.am
+++ b/src/plugins/media-export/Makefile.am
@@ -43,10 +43,10 @@ librygel_media_export_la_VALAFLAGS = \
--pkg gstreamer-tag-0.10 \
--pkg gstreamer-app-0.10 \
--pkg sqlite3 \
- $(RYGEL_COMMON_PLUGIN_VALAFLAGS)
+ $(RYGEL_COMMON_SERVER_PLUGIN_VALAFLAGS)
librygel_media_export_la_LIBADD = \
- $(RYGEL_COMMON_LIBS) \
+ $(RYGEL_COMMON_SERVER_LIBS) \
$(LIBGUPNP_DLNA_LIBS) \
$(GSTREAMER_TAG_LIBS) \
$(GSTREAMER_APP_LIBS) \
diff --git a/src/plugins/mediathek/Makefile.am b/src/plugins/mediathek/Makefile.am
index 4dcb6f6..50ee615 100644
--- a/src/plugins/mediathek/Makefile.am
+++ b/src/plugins/mediathek/Makefile.am
@@ -14,6 +14,6 @@ librygel_mediathek_la_SOURCES = \
rygel-mediathek-rss-container.vala \
rygel-mediathek-soup-utils.vala
-librygel_mediathek_la_VALAFLAGS = $(RYGEL_COMMON_PLUGIN_VALAFLAGS)
-librygel_mediathek_la_LIBADD = $(RYGEL_COMMON_LIBS)
+librygel_mediathek_la_VALAFLAGS = $(RYGEL_COMMON_SERVER_PLUGIN_VALAFLAGS)
+librygel_mediathek_la_LIBADD = $(RYGEL_COMMON_SERVER_LIBS)
librygel_mediathek_la_LDFLAGS = $(RYGEL_PLUGIN_LINKER_FLAGS)
diff --git a/src/plugins/mpris/Makefile.am b/src/plugins/mpris/Makefile.am
index 4912094..4b609de 100644
--- a/src/plugins/mpris/Makefile.am
+++ b/src/plugins/mpris/Makefile.am
@@ -2,17 +2,14 @@ include ../../../common.am
plugin_LTLIBRARIES = librygel-mpris.la
-AM_CFLAGS += -DG_LOG_DOMAIN='"MPRIS"' \
- -I$(top_builddir)/src/librygel-renderer
+AM_CFLAGS += -DG_LOG_DOMAIN='"MPRIS"'
librygel_mpris_la_SOURCES = \
rygel-mpris-player.vala \
rygel-mpris-plugin.vala \
rygel-mpris-plugin-factory.vala \
- rygel-mpris-interfaces.vala \
- $(top_builddir)/src/librygel-renderer/rygel-renderer-1.0.vapi
+ rygel-mpris-interfaces.vala
-librygel_mpris_la_VALAFLAGS = $(RYGEL_COMMON_PLUGIN_VALAFLAGS)
-librygel_mpris_la_LIBADD = $(RYGEL_COMMON_LIBS) \
- $(top_builddir)/src/librygel-renderer/librygel-renderer-1.0.la
+librygel_mpris_la_VALAFLAGS = $(RYGEL_COMMON_RENDERER_PLUGIN_VALAFLAGS)
+librygel_mpris_la_LIBADD = $(RYGEL_COMMON_RENDERER_LIBS)
librygel_mpris_la_LDFLAGS = $(RYGEL_PLUGIN_LINKER_FLAGS)
diff --git a/src/plugins/playbin/Makefile.am b/src/plugins/playbin/Makefile.am
index 91cf9b8..734056c 100644
--- a/src/plugins/playbin/Makefile.am
+++ b/src/plugins/playbin/Makefile.am
@@ -2,15 +2,10 @@ include ../../../common.am
plugin_LTLIBRARIES = librygel-playbin.la
-librygel_playbin_la_SOURCES = rygel-module.vala \
- $(top_builddir)/src/librygel-renderer/rygel-renderer-1.0.vapi
-
-librygel_playbin_la_CFLAGS = $(AM_CFLAGS) \
- -I$(top_srcdir)/src/librygel-renderer \
- -DG_LOG_DOMAIN='"Playbin"'
-
-librygel_playbin_la_VALAFLAGS = $(RYGEL_COMMON_PLUGIN_VALAFLAGS)
-librygel_playbin_la_LIBADD = $(RYGEL_COMMON_LIBS) \
- $(top_builddir)/src/librygel-renderer/librygel-renderer-1.0.la
+AM_CFLAGS += -DG_LOG_DOMAIN='"Playbin"'
+librygel_playbin_la_SOURCES = rygel-module.vala
+librygel_playbin_la_CFLAGS = $(AM_CFLAGS)
+librygel_playbin_la_VALAFLAGS = $(RYGEL_COMMON_RENDERER_PLUGIN_VALAFLAGS)
+librygel_playbin_la_LIBADD = $(RYGEL_COMMON_RENDERER_LIBS)
librygel_playbin_la_LDFLAGS = $(RYGEL_PLUGIN_LINKER_FLAGS)
diff --git a/src/plugins/test/Makefile.am b/src/plugins/test/Makefile.am
index e482b66..628b3cb 100644
--- a/src/plugins/test/Makefile.am
+++ b/src/plugins/test/Makefile.am
@@ -10,6 +10,6 @@ librygel_test_la_SOURCES = \
rygel-test-video-item.vala \
rygel-test-plugin.vala
-librygel_test_la_VALAFLAGS = $(RYGEL_COMMON_PLUGIN_VALAFLAGS)
-librygel_test_la_LIBADD = $(RYGEL_COMMON_LIBS)
+librygel_test_la_VALAFLAGS = $(RYGEL_COMMON_SERVER_PLUGIN_VALAFLAGS)
+librygel_test_la_LIBADD = $(RYGEL_COMMON_SERVER_LIBS)
librygel_test_la_LDFLAGS = $(RYGEL_PLUGIN_LINKER_FLAGS)
diff --git a/src/plugins/tracker/Makefile.am b/src/plugins/tracker/Makefile.am
index 21c34a2..889d15a 100644
--- a/src/plugins/tracker/Makefile.am
+++ b/src/plugins/tracker/Makefile.am
@@ -42,7 +42,7 @@ librygel_tracker_la_SOURCES = \
rygel-tracker-interfaces.vala
librygel_tracker_la_VALAFLAGS = --pkg posix \
- --pkg gupnp-dlna-1.0 \
- $(RYGEL_COMMON_PLUGIN_VALAFLAGS)
-librygel_tracker_la_LIBADD = $(RYGEL_COMMON_LIBS) $(LIBGUPNP_DLNA_LIBS)
+ --pkg gupnp-dlna-1.0 \
+ $(RYGEL_COMMON_SERVER_PLUGIN_VALAFLAGS)
+librygel_tracker_la_LIBADD = $(RYGEL_COMMON_SERVER_LIBS) $(LIBGUPNP_DLNA_LIBS)
librygel_tracker_la_LDFLAGS = $(RYGEL_PLUGIN_LINKER_FLAGS)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 90acdde..338ce57 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -30,7 +30,7 @@ AM_VALAFLAGS = --disable-warnings --thread \
--pkg gupnp-1.0 --pkg gupnp-av-1.0 --pkg dbus-glib-1 \
--pkg gconf-2.0 --pkg gstreamer-0.10 --pkg gstreamer-base-0.10 \
--pkg gio-2.0 --pkg gee-1.0 --pkg gstreamer-pbutils-0.10 \
- --pkg gupnp-dlna-1.0 -g
+ --pkg gupnp-dlna-1.0 --pkg uuid --vapidir=$(top_srcdir)/src/librygel-core -g
$(COVERAGE_VALAFLAGS)
check_PROGRAMS = rygel-http-item-uri-test \
@@ -79,8 +79,8 @@ rygel_http_post_test_SOURCES = rygel-http-post-test.vala \
rygel_album_art_spec_test_SOURCES = rygel-album-art-spec-test.vala \
rygel-media-art-store.vala \
- $(top_srcdir)/src/librygel-core/rygel-thumbnail.vala \
- $(top_srcdir)/src/librygel-core/rygel-icon-info.vala
+ rygel-thumbnail.vala \
+ rygel-icon-info.vala
rygel_searchable_container_test_SOURCES = \
rygel-searchable-container.vala \
diff --git a/tests/rygel-gst-utils.vala b/tests/rygel-gst-utils.vala
index 6b60984..b3ca447 120000
--- a/tests/rygel-gst-utils.vala
+++ b/tests/rygel-gst-utils.vala
@@ -1 +1 @@
-../src/librygel-core/rygel-gst-utils.vala
\ No newline at end of file
+../src/librygel-server/rygel-gst-utils.vala
\ No newline at end of file
diff --git a/tests/rygel-http-byte-seek.vala b/tests/rygel-http-byte-seek.vala
index 74119d5..84e6fe9 120000
--- a/tests/rygel-http-byte-seek.vala
+++ b/tests/rygel-http-byte-seek.vala
@@ -1 +1 @@
-../src/librygel-core/rygel-http-byte-seek.vala
\ No newline at end of file
+../src/librygel-server/rygel-http-byte-seek.vala
\ No newline at end of file
diff --git a/tests/rygel-http-byte-seek_http-get.vala b/tests/rygel-http-byte-seek_http-get.vala
index 74119d5..84e6fe9 120000
--- a/tests/rygel-http-byte-seek_http-get.vala
+++ b/tests/rygel-http-byte-seek_http-get.vala
@@ -1 +1 @@
-../src/librygel-core/rygel-http-byte-seek.vala
\ No newline at end of file
+../src/librygel-server/rygel-http-byte-seek.vala
\ No newline at end of file
diff --git a/tests/rygel-http-get.vala b/tests/rygel-http-get.vala
index 4e52f8e..e4bac4e 120000
--- a/tests/rygel-http-get.vala
+++ b/tests/rygel-http-get.vala
@@ -1 +1 @@
-../src/librygel-core/rygel-http-get.vala
\ No newline at end of file
+../src/librygel-server/rygel-http-get.vala
\ No newline at end of file
diff --git a/tests/rygel-http-gst-sink.vala b/tests/rygel-http-gst-sink.vala
index 23b7d24..85c3c76 120000
--- a/tests/rygel-http-gst-sink.vala
+++ b/tests/rygel-http-gst-sink.vala
@@ -1 +1 @@
-../src/librygel-core/rygel-http-gst-sink.vala
\ No newline at end of file
+../src/librygel-server/rygel-http-gst-sink.vala
\ No newline at end of file
diff --git a/tests/rygel-http-item-uri.vala b/tests/rygel-http-item-uri.vala
index 88bc91b..b82155c 120000
--- a/tests/rygel-http-item-uri.vala
+++ b/tests/rygel-http-item-uri.vala
@@ -1 +1 @@
-../src/librygel-core/rygel-http-item-uri.vala
\ No newline at end of file
+../src/librygel-server/rygel-http-item-uri.vala
\ No newline at end of file
diff --git a/tests/rygel-http-item-uri_http-get.vala b/tests/rygel-http-item-uri_http-get.vala
index 88bc91b..b82155c 120000
--- a/tests/rygel-http-item-uri_http-get.vala
+++ b/tests/rygel-http-item-uri_http-get.vala
@@ -1 +1 @@
-../src/librygel-core/rygel-http-item-uri.vala
\ No newline at end of file
+../src/librygel-server/rygel-http-item-uri.vala
\ No newline at end of file
diff --git a/tests/rygel-http-item-uri_http-post.vala b/tests/rygel-http-item-uri_http-post.vala
index 88bc91b..b82155c 120000
--- a/tests/rygel-http-item-uri_http-post.vala
+++ b/tests/rygel-http-item-uri_http-post.vala
@@ -1 +1 @@
-../src/librygel-core/rygel-http-item-uri.vala
\ No newline at end of file
+../src/librygel-server/rygel-http-item-uri.vala
\ No newline at end of file
diff --git a/tests/rygel-http-post.vala b/tests/rygel-http-post.vala
index 2f1ca70..80bea5f 120000
--- a/tests/rygel-http-post.vala
+++ b/tests/rygel-http-post.vala
@@ -1 +1 @@
-../src/librygel-core/rygel-http-post.vala
\ No newline at end of file
+../src/librygel-server/rygel-http-post.vala
\ No newline at end of file
diff --git a/tests/rygel-http-request_http-get.vala b/tests/rygel-http-request_http-get.vala
index 38f0509..60d2e75 120000
--- a/tests/rygel-http-request_http-get.vala
+++ b/tests/rygel-http-request_http-get.vala
@@ -1 +1 @@
-../src/librygel-core/rygel-http-request.vala
\ No newline at end of file
+../src/librygel-server/rygel-http-request.vala
\ No newline at end of file
diff --git a/tests/rygel-http-request_http-post.vala b/tests/rygel-http-request_http-post.vala
index 38f0509..60d2e75 120000
--- a/tests/rygel-http-request_http-post.vala
+++ b/tests/rygel-http-request_http-post.vala
@@ -1 +1 @@
-../src/librygel-core/rygel-http-request.vala
\ No newline at end of file
+../src/librygel-server/rygel-http-request.vala
\ No newline at end of file
diff --git a/tests/rygel-http-response.vala b/tests/rygel-http-response.vala
index fc06488..7e6c2d5 120000
--- a/tests/rygel-http-response.vala
+++ b/tests/rygel-http-response.vala
@@ -1 +1 @@
-../src/librygel-core/rygel-http-response.vala
\ No newline at end of file
+../src/librygel-server/rygel-http-response.vala
\ No newline at end of file
diff --git a/tests/rygel-http-seek.vala b/tests/rygel-http-seek.vala
index 681442a..3396600 120000
--- a/tests/rygel-http-seek.vala
+++ b/tests/rygel-http-seek.vala
@@ -1 +1 @@
-../src/librygel-core/rygel-http-seek.vala
\ No newline at end of file
+../src/librygel-server/rygel-http-seek.vala
\ No newline at end of file
diff --git a/tests/rygel-http-seek_http-get.vala b/tests/rygel-http-seek_http-get.vala
index 681442a..3396600 120000
--- a/tests/rygel-http-seek_http-get.vala
+++ b/tests/rygel-http-seek_http-get.vala
@@ -1 +1 @@
-../src/librygel-core/rygel-http-seek.vala
\ No newline at end of file
+../src/librygel-server/rygel-http-seek.vala
\ No newline at end of file
diff --git a/tests/rygel-http-seek_time-seek.vala b/tests/rygel-http-seek_time-seek.vala
index 681442a..3396600 120000
--- a/tests/rygel-http-seek_time-seek.vala
+++ b/tests/rygel-http-seek_time-seek.vala
@@ -1 +1 @@
-../src/librygel-core/rygel-http-seek.vala
\ No newline at end of file
+../src/librygel-server/rygel-http-seek.vala
\ No newline at end of file
diff --git a/tests/rygel-http-time-seek.vala b/tests/rygel-http-time-seek.vala
index e5ea561..7ea8eb4 120000
--- a/tests/rygel-http-time-seek.vala
+++ b/tests/rygel-http-time-seek.vala
@@ -1 +1 @@
-../src/librygel-core/rygel-http-time-seek.vala
\ No newline at end of file
+../src/librygel-server/rygel-http-time-seek.vala
\ No newline at end of file
diff --git a/tests/rygel-http-time-seek_http-get.vala b/tests/rygel-http-time-seek_http-get.vala
index e5ea561..7ea8eb4 120000
--- a/tests/rygel-http-time-seek_http-get.vala
+++ b/tests/rygel-http-time-seek_http-get.vala
@@ -1 +1 @@
-../src/librygel-core/rygel-http-time-seek.vala
\ No newline at end of file
+../src/librygel-server/rygel-http-time-seek.vala
\ No newline at end of file
diff --git a/tests/rygel-icon-info.vala b/tests/rygel-icon-info.vala
new file mode 120000
index 0000000..84f4417
--- /dev/null
+++ b/tests/rygel-icon-info.vala
@@ -0,0 +1 @@
+../src/librygel-core/rygel-icon-info.vala
\ No newline at end of file
diff --git a/tests/rygel-item-creator.vala b/tests/rygel-item-creator.vala
index 39e7ca3..9e11abe 120000
--- a/tests/rygel-item-creator.vala
+++ b/tests/rygel-item-creator.vala
@@ -1 +1 @@
-../src/librygel-core/rygel-item-creator.vala
\ No newline at end of file
+../src/librygel-server/rygel-item-creator.vala
\ No newline at end of file
diff --git a/tests/rygel-media-art-store.vala b/tests/rygel-media-art-store.vala
index 107e3f0..fe11e0f 120000
--- a/tests/rygel-media-art-store.vala
+++ b/tests/rygel-media-art-store.vala
@@ -1 +1 @@
-../src/librygel-core/rygel-media-art-store.vala
\ No newline at end of file
+../src/librygel-server/rygel-media-art-store.vala
\ No newline at end of file
diff --git a/tests/rygel-relational-expression.vala b/tests/rygel-relational-expression.vala
index 9b8040a..40edca9 120000
--- a/tests/rygel-relational-expression.vala
+++ b/tests/rygel-relational-expression.vala
@@ -1 +1 @@
-../src/librygel-core/rygel-relational-expression.vala
\ No newline at end of file
+../src/librygel-server/rygel-relational-expression.vala
\ No newline at end of file
diff --git a/tests/rygel-search-expression.vala b/tests/rygel-search-expression.vala
index 237ceaa..a0fd6b5 120000
--- a/tests/rygel-search-expression.vala
+++ b/tests/rygel-search-expression.vala
@@ -1 +1 @@
-../src/librygel-core/rygel-search-expression.vala
\ No newline at end of file
+../src/librygel-server/rygel-search-expression.vala
\ No newline at end of file
diff --git a/tests/rygel-searchable-container.vala b/tests/rygel-searchable-container.vala
index aa5485e..034cdfa 120000
--- a/tests/rygel-searchable-container.vala
+++ b/tests/rygel-searchable-container.vala
@@ -1 +1 @@
-../src/librygel-core/rygel-searchable-container.vala
\ No newline at end of file
+../src/librygel-server/rygel-searchable-container.vala
\ No newline at end of file
diff --git a/tests/rygel-thumbnail.vala b/tests/rygel-thumbnail.vala
new file mode 120000
index 0000000..0b0ee8d
--- /dev/null
+++ b/tests/rygel-thumbnail.vala
@@ -0,0 +1 @@
+../src/librygel-server/rygel-thumbnail.vala
\ No newline at end of file
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
