[rygel] core: Move library code into its own directory
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rygel] core: Move library code into its own directory
- Date: Tue, 3 Jul 2012 07:57:06 +0000 (UTC)
commit 8d31261930239bef18919228436a4bdd3a6e3c0f
Author: Murray Cumming <murrayc openismus com>
Date: Tue Jun 26 10:56:14 2012 +0200
core: Move library code into its own directory
autogen.sh | 4 +-
common.am | 5 +-
configure.ac | 3 +-
src/Makefile.am | 4 +-
src/librygel-core/Makefile.am | 147 ++++++++++++++++++++
.../rygel-aac-transcoder.vala | 0
src/{rygel => librygel-core}/rygel-audio-item.vala | 0
.../rygel-audio-transcoder.vala | 0
.../rygel-av-transport.vala | 0
.../rygel-avc-transcoder.vala | 0
src/{rygel => librygel-core}/rygel-browse.vala | 1 -
src/{rygel => librygel-core}/rygel-changelog.vala | 0
.../rygel-client-hacks.vala | 0
.../rygel-cmdline-config.vala | 1 -
.../rygel-configuration.vala | 1 -
.../rygel-connection-manager.vala | 0
.../rygel-content-directory.vala | 1 -
src/{rygel => librygel-core}/rygel-core-1.0.deps | 0
.../rygel-dbus-interface.vala | 1 -
.../rygel-dbus-thumbnailer.vala | 0
.../rygel-description-file.vala | 0
.../rygel-environment-config.vala | 1 -
.../rygel-free-desktop-interfaces.vala | 1 -
src/{rygel => librygel-core}/rygel-gst-utils.vala | 0
.../rygel-http-byte-seek.vala | 0
.../rygel-http-get-handler.vala | 0
src/{rygel => librygel-core}/rygel-http-get.vala | 1 -
.../rygel-http-gst-sink.vala | 1 -
.../rygel-http-identity-handler.vala | 0
.../rygel-http-item-uri.vala | 0
src/{rygel => librygel-core}/rygel-http-post.vala | 1 -
.../rygel-http-request.vala | 1 -
.../rygel-http-response.vala | 0
src/{rygel => librygel-core}/rygel-http-seek.vala | 0
.../rygel-http-server.vala | 1 -
.../rygel-http-time-seek.vala | 0
.../rygel-http-transcode-handler.vala | 1 -
src/{rygel => librygel-core}/rygel-icon-info.vala | 1 -
src/{rygel => librygel-core}/rygel-image-item.vala | 0
.../rygel-import-resource.vala | 1 -
.../rygel-item-creator.vala | 1 -
.../rygel-item-destroyer.vala | 1 -
.../rygel-item-removal-queue.vala | 1 -
.../rygel-l16-transcoder.vala | 0
.../rygel-log-handler.vala | 0
.../rygel-logical-expression.vala | 0
.../rygel-media-art-store.vala | 0
.../rygel-media-container.vala | 1 -
src/{rygel => librygel-core}/rygel-media-item.vala | 0
.../rygel-media-object.vala | 0
.../rygel-media-objects.vala | 0
.../rygel-media-player.vala | 0
.../rygel-media-query-action.vala | 0
.../rygel-media-receiver-registrar.vala | 0
.../rygel-media-renderer-plugin.vala | 1 -
.../rygel-media-server-plugin.vala | 1 -
.../rygel-meta-config.vala | 1 -
.../rygel-mp2ts-transcoder.vala | 0
.../rygel-mp3-transcoder.vala | 0
src/{rygel => librygel-core}/rygel-music-item.vala | 0
.../rygel-panasonic-hacks.vala | 0
src/{rygel => librygel-core}/rygel-photo-item.vala | 0
.../rygel-plugin-loader.vala | 1 -
src/{rygel => librygel-core}/rygel-plugin.vala | 1 -
.../rygel-relational-expression.vala | 0
.../rygel-rendering-control.vala | 0
.../rygel-resource-info.vala | 1 -
.../rygel-root-device-factory.vala | 1 -
.../rygel-root-device.vala | 1 -
.../rygel-search-criteria-parser.vala | 1 -
.../rygel-search-expression.vala | 0
src/{rygel => librygel-core}/rygel-search.vala | 1 -
.../rygel-searchable-container.vala | 0
.../rygel-simple-container.vala | 0
.../rygel-sink-connection-manager.vala | 0
.../rygel-source-connection-manager.vala | 0
.../rygel-state-machine.vala | 1 -
.../rygel-subtitle-manager.vala | 0
src/{rygel => librygel-core}/rygel-subtitle.vala | 0
src/{rygel => librygel-core}/rygel-thumbnail.vala | 0
.../rygel-thumbnailer.vala | 0
.../rygel-transcode-manager.vala | 1 -
src/{rygel => librygel-core}/rygel-transcoder.vala | 0
.../rygel-user-config.vala | 1 -
src/{rygel => librygel-core}/rygel-v1-hacks.vala | 0
src/{rygel => librygel-core}/rygel-video-item.vala | 0
.../rygel-video-transcoder.vala | 0
.../rygel-visual-item.vala | 0
src/{rygel => librygel-core}/rygel-volume.vala | 0
src/{rygel => librygel-core}/rygel-wmp-hacks.vala | 0
.../rygel-wmv-transcoder.vala | 0
.../rygel-writable-container.vala | 0
src/{rygel => librygel-core}/rygel-xbmc-hacks.vala | 0
src/{rygel => librygel-core}/rygel-xbox-hacks.vala | 0
src/{rygel => librygel-core}/rygel-xml-utils.vala | 1 -
src/rygel/Makefile.am | 129 +-----------------
tests/Makefile.am | 4 +-
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-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-state-machine_http-get.vala | 2 +-
tests/rygel-state-machine_http-post.vala | 2 +-
tests/rygel-state-machine_http-response.vala | 2 +-
tests/rygel-state-machine_item-creator.vala | 2 +-
123 files changed, 187 insertions(+), 194 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index c44511e..8d46a7f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/bash
which gnome-autogen.sh || {
echo "You need to install gnome-common from the GNOME git"
@@ -12,7 +12,7 @@ REQUIRED_AUTOMAKE_VERSION=1.11 \
REQUIRED_AUTOCONF_VERSION=2.64 \
REQUIRED_LIBTOOL_VERSION=2.2.6 \
REQUIRED_INTLTOOL_VERSION=0.40.0 \
-gnome-autogen.sh --enable-vala --enable-maintainer-mode --enable-debug \
+bash gnome-autogen.sh --enable-vala --enable-maintainer-mode --enable-debug \
--enable-tests --enable-test-plugin \
--enable-mediathek-plugin --enable-gst-launch-plugin \
--enable-strict-valac "$@"
diff --git a/common.am b/common.am
index a3667b8..dbaf065 100644
--- a/common.am
+++ b/common.am
@@ -18,6 +18,7 @@ smallicondir = $(shareddir)/icons/48x48
bigicondir = $(shareddir)/icons/120x120
rygeldir = $(top_srcdir)/src/rygel
+librygelcoredir = $(top_srcdir)/src/librygel-core
MAINTAINERCLEANFILES = Makefile.in
@@ -30,6 +31,7 @@ AM_CFLAGS = \
$(UUID_CFLAGS) \
$(COVERAGE_CFLAGS) \
-I$(rygeldir) \
+ -I$(librygelcoredir) \
-DDATA_DIR='"$(shareddir)"' -DSYS_CONFIG_DIR='"$(sysconfigdir)"'\
-DPLUGIN_DIR='"$(plugindir)"' -DDESKTOP_DIR='"$(desktopdir)"'\
-DPRESET_DIR='"$(presetdir)"'\
@@ -46,7 +48,7 @@ RYGEL_BASE_LIBS = \
RYGEL_COMMON_LIBS = \
$(RYGEL_BASE_LIBS) \
- $(top_builddir)/src/rygel/librygel-core-1.0.la
+ $(top_builddir)/src/librygel-core/librygel-core-1.0.la
# Note: the -g needs to be at the end of VALAFLAGS to not break make dist
RYGEL_COMMON_PLUGIN_VALAFLAGS = \
@@ -56,6 +58,7 @@ RYGEL_COMMON_PLUGIN_VALAFLAGS = \
RYGEL_COMMON_VALAFLAGS = \
--pkg rygel-build-config --pkg gupnp-1.0 \
--vapidir=$(rygeldir) \
+ --vapidir=$(librygelcoredir) \
--pkg gupnp-av-1.0 --pkg gee-1.0 \
$(RYGEL_DEBUG_VALAFLAGS) \
$(COVERAGE_VALAFLAGS)
diff --git a/configure.ac b/configure.ac
index 702f6a2..4f1f510 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ AC_INIT([Rygel],
[http://live.gnome.org/Rygel])
AC_CONFIG_AUX_DIR([build-aux])
-AC_CONFIG_SRCDIR([src/rygel/rygel-root-device.vala])
+AC_CONFIG_SRCDIR([src/librygel-core/rygel-root-device.vala])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4])
@@ -206,6 +206,7 @@ AM_CONDITIONAL([HAVE_XSLTPROC], [test x"$XSLTPROC" != x])
AC_CONFIG_FILES([
Makefile
src/Makefile
+src/librygel-core/Makefile
src/rygel/Makefile
src/ui/Makefile
src/plugins/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 6e6533a..a92a6d3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
if BUILD_UI
-SUBDIRS = rygel ui plugins
+SUBDIRS = librygel-core rygel ui plugins
else
-SUBDIRS = rygel plugins
+SUBDIRS = librygel-core rygel plugins
endif
MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/librygel-core/Makefile.am b/src/librygel-core/Makefile.am
new file mode 100644
index 0000000..8060e7c
--- /dev/null
+++ b/src/librygel-core/Makefile.am
@@ -0,0 +1,147 @@
+include ../../common.am
+
+AM_CFLAGS += \
+ $(LIBGUPNP_DLNA_CFLAGS) \
+ $(LIBSOUP_CFLAGS) \
+ $(LIBGSTREAMER_CFLAGS) \
+ $(GST_PBU_CFLAGS) \
+ -DSMALL_ICON_DIR='"$(smallicondir)"' \
+ -DBIG_ICON_DIR='"$(bigicondir)"' -include config.h \
+ -DLOCALEDIR=\""$(datadir)/locale"\" -DG_LOG_DOMAIN='"Rygel"'
+
+librygelincdir = $(includedir)/rygel-1.0
+
+librygelinc_HEADERS = rygel-core.h
+
+lib_LTLIBRARIES = librygel-core-1.0.la
+
+VAPI_SOURCE_FILES = \
+ rygel-cmdline-config.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-media-renderer-plugin.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-item.vala \
+ rygel-media-object.vala \
+ rygel-media-server-plugin.vala \
+ rygel-search-expression.vala \
+ rygel-configuration.vala \
+ rygel-free-desktop-interfaces.vala \
+ rygel-media-player.vala \
+ rygel-searchable-container.vala \
+ rygel-state-machine.vala \
+ rygel-visual-item.vala \
+ rygel-writable-container.vala \
+ rygel-xml-utils.vala
+
+librygel_core_1_0_la_SOURCES = \
+ $(VAPI_SOURCE_FILES) \
+ rygel-http-item-uri.vala \
+ rygel-environment-config.vala \
+ rygel-content-directory.vala \
+ rygel-connection-manager.vala \
+ rygel-source-connection-manager.vala \
+ rygel-sink-connection-manager.vala \
+ rygel-av-transport.vala \
+ rygel-rendering-control.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-changelog.vala \
+ rygel-volume.vala \
+ rygel-description-file.vala
+
+librygel_core_1_0_la_VALAFLAGS = \
+ -H rygel-core.h -C --library=rygel-core-1.0 \
+ --pkg gstreamer-0.10 \
+ --pkg gstreamer-base-0.10 \
+ --pkg gupnp-dlna-1.0 \
+ $(RYGEL_COMMON_VALAFLAGS)
+
+librygel_core_1_0_la_LIBADD = \
+ $(GST_PBU_LIBS) \
+ $(RYGEL_BASE_LIBS) \
+ $(LIBGUPNP_DLNA_LIBS) \
+ $(GIO_LIBS) \
+ $(LIBSOUP_LIBS)
+
+RYGEL_CORE_VERSION=0:0:0
+librygel_core_1_0_la_LDFLAGS = -version-info $(RYGEL_CORE_VERSION)
+
+BUILT_SOURCES = \
+ rygel-core-1.0.vapi \
+ rygel-core.h
+
+VAPI_FILES = rygel-core-1.0.vapi
+DEPS_FILES = rygel-core-1.0.deps
+
+vapidir = $(VAPIDIR)
+vapi_DATA = $(VAPI_FILES) $(DEPS_FILES)
+rygel-core-1.0.vapi rygel-core.h: librygel_core_1_0_la_vala.stamp
+
+MAINTAINERCLEANFILES += $(BUILT_SOURCES)
+
+EXTRA_DIST = \
+ rygel-build-config.vapi \
+ rygel-misc.vapi \
+ $(VAPI_FILES) \
+ $(DEPS_FILES) \
+ $(BUILT_SOURCES)
diff --git a/src/rygel/rygel-aac-transcoder.vala b/src/librygel-core/rygel-aac-transcoder.vala
similarity index 100%
rename from src/rygel/rygel-aac-transcoder.vala
rename to src/librygel-core/rygel-aac-transcoder.vala
diff --git a/src/rygel/rygel-audio-item.vala b/src/librygel-core/rygel-audio-item.vala
similarity index 100%
rename from src/rygel/rygel-audio-item.vala
rename to src/librygel-core/rygel-audio-item.vala
diff --git a/src/rygel/rygel-audio-transcoder.vala b/src/librygel-core/rygel-audio-transcoder.vala
similarity index 100%
rename from src/rygel/rygel-audio-transcoder.vala
rename to src/librygel-core/rygel-audio-transcoder.vala
diff --git a/src/rygel/rygel-av-transport.vala b/src/librygel-core/rygel-av-transport.vala
similarity index 100%
rename from src/rygel/rygel-av-transport.vala
rename to src/librygel-core/rygel-av-transport.vala
diff --git a/src/rygel/rygel-avc-transcoder.vala b/src/librygel-core/rygel-avc-transcoder.vala
similarity index 100%
rename from src/rygel/rygel-avc-transcoder.vala
rename to src/librygel-core/rygel-avc-transcoder.vala
diff --git a/src/rygel/rygel-browse.vala b/src/librygel-core/rygel-browse.vala
similarity index 99%
rename from src/rygel/rygel-browse.vala
rename to src/librygel-core/rygel-browse.vala
index 1e23eeb..b7c8af6 100644
--- a/src/rygel/rygel-browse.vala
+++ b/src/librygel-core/rygel-browse.vala
@@ -125,4 +125,3 @@ internal class Rygel.Browse: Rygel.MediaQueryAction {
base.handle_error (error);
}
}
-
diff --git a/src/rygel/rygel-changelog.vala b/src/librygel-core/rygel-changelog.vala
similarity index 100%
rename from src/rygel/rygel-changelog.vala
rename to src/librygel-core/rygel-changelog.vala
diff --git a/src/rygel/rygel-client-hacks.vala b/src/librygel-core/rygel-client-hacks.vala
similarity index 100%
rename from src/rygel/rygel-client-hacks.vala
rename to src/librygel-core/rygel-client-hacks.vala
diff --git a/src/rygel/rygel-cmdline-config.vala b/src/librygel-core/rygel-cmdline-config.vala
similarity index 99%
rename from src/rygel/rygel-cmdline-config.vala
rename to src/librygel-core/rygel-cmdline-config.vala
index 7cd9f88..e71a47c 100644
--- a/src/rygel/rygel-cmdline-config.vala
+++ b/src/librygel-core/rygel-cmdline-config.vala
@@ -450,4 +450,3 @@ public class Rygel.CmdlineConfig : GLib.Object, Configuration {
}
}
}
-
diff --git a/src/rygel/rygel-configuration.vala b/src/librygel-core/rygel-configuration.vala
similarity index 99%
rename from src/rygel/rygel-configuration.vala
rename to src/librygel-core/rygel-configuration.vala
index ca11265..f37638d 100644
--- a/src/rygel/rygel-configuration.vala
+++ b/src/librygel-core/rygel-configuration.vala
@@ -90,4 +90,3 @@ public interface Rygel.Configuration : GLib.Object {
string key)
throws GLib.Error;
}
-
diff --git a/src/rygel/rygel-connection-manager.vala b/src/librygel-core/rygel-connection-manager.vala
similarity index 100%
rename from src/rygel/rygel-connection-manager.vala
rename to src/librygel-core/rygel-connection-manager.vala
diff --git a/src/rygel/rygel-content-directory.vala b/src/librygel-core/rygel-content-directory.vala
similarity index 99%
rename from src/rygel/rygel-content-directory.vala
rename to src/librygel-core/rygel-content-directory.vala
index 80da87d..dea1b87 100644
--- a/src/rygel/rygel-content-directory.vala
+++ b/src/librygel-core/rygel-content-directory.vala
@@ -462,4 +462,3 @@ internal class Rygel.ContentDirectory: Service {
return ret;
}
}
-
diff --git a/src/rygel/rygel-core-1.0.deps b/src/librygel-core/rygel-core-1.0.deps
similarity index 100%
rename from src/rygel/rygel-core-1.0.deps
rename to src/librygel-core/rygel-core-1.0.deps
diff --git a/src/rygel/rygel-dbus-interface.vala b/src/librygel-core/rygel-dbus-interface.vala
similarity index 99%
rename from src/rygel/rygel-dbus-interface.vala
rename to src/librygel-core/rygel-dbus-interface.vala
index 1cbed1e..1fb9d7c 100644
--- a/src/rygel/rygel-dbus-interface.vala
+++ b/src/librygel-core/rygel-dbus-interface.vala
@@ -28,4 +28,3 @@ public interface Rygel.DBusInterface : Object {
public abstract void shutdown () throws IOError;
}
-
diff --git a/src/rygel/rygel-dbus-thumbnailer.vala b/src/librygel-core/rygel-dbus-thumbnailer.vala
similarity index 100%
rename from src/rygel/rygel-dbus-thumbnailer.vala
rename to src/librygel-core/rygel-dbus-thumbnailer.vala
diff --git a/src/rygel/rygel-description-file.vala b/src/librygel-core/rygel-description-file.vala
similarity index 100%
rename from src/rygel/rygel-description-file.vala
rename to src/librygel-core/rygel-description-file.vala
diff --git a/src/rygel/rygel-environment-config.vala b/src/librygel-core/rygel-environment-config.vala
similarity index 99%
rename from src/rygel/rygel-environment-config.vala
rename to src/librygel-core/rygel-environment-config.vala
index c2c8bff..35d991b 100644
--- a/src/rygel/rygel-environment-config.vala
+++ b/src/librygel-core/rygel-environment-config.vala
@@ -214,4 +214,3 @@ internal class Rygel.EnvironmentConfig : GLib.Object, Configuration {
return true;
}
}
-
diff --git a/src/rygel/rygel-free-desktop-interfaces.vala b/src/librygel-core/rygel-free-desktop-interfaces.vala
similarity index 99%
rename from src/rygel/rygel-free-desktop-interfaces.vala
rename to src/librygel-core/rygel-free-desktop-interfaces.vala
index 6c2e843..e6100f2 100644
--- a/src/rygel/rygel-free-desktop-interfaces.vala
+++ b/src/librygel-core/rygel-free-desktop-interfaces.vala
@@ -53,4 +53,3 @@ public interface FreeDesktop.Properties: Object {
public abstract async HashTable<string,Variant> get_all (string iface)
throws DBusError;
}
-
diff --git a/src/rygel/rygel-gst-utils.vala b/src/librygel-core/rygel-gst-utils.vala
similarity index 100%
rename from src/rygel/rygel-gst-utils.vala
rename to src/librygel-core/rygel-gst-utils.vala
diff --git a/src/rygel/rygel-http-byte-seek.vala b/src/librygel-core/rygel-http-byte-seek.vala
similarity index 100%
rename from src/rygel/rygel-http-byte-seek.vala
rename to src/librygel-core/rygel-http-byte-seek.vala
diff --git a/src/rygel/rygel-http-get-handler.vala b/src/librygel-core/rygel-http-get-handler.vala
similarity index 100%
rename from src/rygel/rygel-http-get-handler.vala
rename to src/librygel-core/rygel-http-get-handler.vala
diff --git a/src/rygel/rygel-http-get.vala b/src/librygel-core/rygel-http-get.vala
similarity index 99%
rename from src/rygel/rygel-http-get.vala
rename to src/librygel-core/rygel-http-get.vala
index c98d56c..8d464c6 100644
--- a/src/rygel/rygel-http-get.vala
+++ b/src/librygel-core/rygel-http-get.vala
@@ -217,4 +217,3 @@ internal class Rygel.HTTPGet : HTTPRequest {
}
}
}
-
diff --git a/src/rygel/rygel-http-gst-sink.vala b/src/librygel-core/rygel-http-gst-sink.vala
similarity index 99%
rename from src/rygel/rygel-http-gst-sink.vala
rename to src/librygel-core/rygel-http-gst-sink.vala
index 17cebce..67a3271 100644
--- a/src/rygel/rygel-http-gst-sink.vala
+++ b/src/librygel-core/rygel-http-gst-sink.vala
@@ -128,4 +128,3 @@ internal class Rygel.HTTPGstSink : BaseSink {
this.response.msg.wrote_chunk.disconnect (this.on_wrote_chunk);
}
}
-
diff --git a/src/rygel/rygel-http-identity-handler.vala b/src/librygel-core/rygel-http-identity-handler.vala
similarity index 100%
rename from src/rygel/rygel-http-identity-handler.vala
rename to src/librygel-core/rygel-http-identity-handler.vala
diff --git a/src/rygel/rygel-http-item-uri.vala b/src/librygel-core/rygel-http-item-uri.vala
similarity index 100%
rename from src/rygel/rygel-http-item-uri.vala
rename to src/librygel-core/rygel-http-item-uri.vala
diff --git a/src/rygel/rygel-http-post.vala b/src/librygel-core/rygel-http-post.vala
similarity index 99%
rename from src/rygel/rygel-http-post.vala
rename to src/librygel-core/rygel-http-post.vala
index d47b5dd..54756ee 100644
--- a/src/rygel/rygel-http-post.vala
+++ b/src/librygel-core/rygel-http-post.vala
@@ -226,4 +226,3 @@ internal class Rygel.HTTPPost : HTTPRequest {
}
}
-
diff --git a/src/rygel/rygel-http-request.vala b/src/librygel-core/rygel-http-request.vala
similarity index 99%
rename from src/rygel/rygel-http-request.vala
rename to src/librygel-core/rygel-http-request.vala
index 348bc29..92d3c10 100644
--- a/src/rygel/rygel-http-request.vala
+++ b/src/librygel-core/rygel-http-request.vala
@@ -115,4 +115,3 @@ internal abstract class Rygel.HTTPRequest : GLib.Object, Rygel.StateMachine {
this.completed ();
}
}
-
diff --git a/src/rygel/rygel-http-response.vala b/src/librygel-core/rygel-http-response.vala
similarity index 100%
rename from src/rygel/rygel-http-response.vala
rename to src/librygel-core/rygel-http-response.vala
diff --git a/src/rygel/rygel-http-seek.vala b/src/librygel-core/rygel-http-seek.vala
similarity index 100%
rename from src/rygel/rygel-http-seek.vala
rename to src/librygel-core/rygel-http-seek.vala
diff --git a/src/rygel/rygel-http-server.vala b/src/librygel-core/rygel-http-server.vala
similarity index 99%
rename from src/rygel/rygel-http-server.vala
rename to src/librygel-core/rygel-http-server.vala
index bbfa083..c4c67ff 100644
--- a/src/rygel/rygel-http-server.vala
+++ b/src/librygel-core/rygel-http-server.vala
@@ -192,4 +192,3 @@ internal class Rygel.HTTPServer : Rygel.TranscodeManager, Rygel.StateMachine {
request.run.begin ();
}
}
-
diff --git a/src/rygel/rygel-http-time-seek.vala b/src/librygel-core/rygel-http-time-seek.vala
similarity index 100%
rename from src/rygel/rygel-http-time-seek.vala
rename to src/librygel-core/rygel-http-time-seek.vala
diff --git a/src/rygel/rygel-http-transcode-handler.vala b/src/librygel-core/rygel-http-transcode-handler.vala
similarity index 99%
rename from src/rygel/rygel-http-transcode-handler.vala
rename to src/librygel-core/rygel-http-transcode-handler.vala
index 18ab87a..b4746e7 100644
--- a/src/rygel/rygel-http-transcode-handler.vala
+++ b/src/librygel-core/rygel-http-transcode-handler.vala
@@ -74,4 +74,3 @@ internal class Rygel.HTTPTranscodeHandler : HTTPGetHandler {
request.http_server);
}
}
-
diff --git a/src/rygel/rygel-icon-info.vala b/src/librygel-core/rygel-icon-info.vala
similarity index 99%
rename from src/rygel/rygel-icon-info.vala
rename to src/librygel-core/rygel-icon-info.vala
index f76aef1..1823185 100644
--- a/src/rygel/rygel-icon-info.vala
+++ b/src/librygel-core/rygel-icon-info.vala
@@ -39,4 +39,3 @@ public class Rygel.IconInfo {
this.file_extension = file_extension;
}
}
-
diff --git a/src/rygel/rygel-image-item.vala b/src/librygel-core/rygel-image-item.vala
similarity index 100%
rename from src/rygel/rygel-image-item.vala
rename to src/librygel-core/rygel-image-item.vala
diff --git a/src/rygel/rygel-import-resource.vala b/src/librygel-core/rygel-import-resource.vala
similarity index 99%
rename from src/rygel/rygel-import-resource.vala
rename to src/librygel-core/rygel-import-resource.vala
index dd28a70..1653fdb 100644
--- a/src/rygel/rygel-import-resource.vala
+++ b/src/librygel-core/rygel-import-resource.vala
@@ -276,4 +276,3 @@ internal class Rygel.ImportResource : GLib.Object, Rygel.StateMachine {
this.run_callback ();
}
}
-
diff --git a/src/rygel/rygel-item-creator.vala b/src/librygel-core/rygel-item-creator.vala
similarity index 99%
rename from src/rygel/rygel-item-creator.vala
rename to src/librygel-core/rygel-item-creator.vala
index 4caec90..836a976 100644
--- a/src/rygel/rygel-item-creator.vala
+++ b/src/librygel-core/rygel-item-creator.vala
@@ -615,4 +615,3 @@ internal class Rygel.ItemCreator: GLib.Object, Rygel.StateMachine {
return valid;
}
}
-
diff --git a/src/rygel/rygel-item-destroyer.vala b/src/librygel-core/rygel-item-destroyer.vala
similarity index 99%
rename from src/rygel/rygel-item-destroyer.vala
rename to src/librygel-core/rygel-item-destroyer.vala
index e6dc6c4..90203cb 100644
--- a/src/rygel/rygel-item-destroyer.vala
+++ b/src/librygel-core/rygel-item-destroyer.vala
@@ -112,4 +112,3 @@ internal class Rygel.ItemDestroyer: GLib.Object, Rygel.StateMachine {
return media_object;
}
}
-
diff --git a/src/rygel/rygel-item-removal-queue.vala b/src/librygel-core/rygel-item-removal-queue.vala
similarity index 99%
rename from src/rygel/rygel-item-removal-queue.vala
rename to src/librygel-core/rygel-item-removal-queue.vala
index a2a6331..540fa00 100644
--- a/src/rygel/rygel-item-removal-queue.vala
+++ b/src/librygel-core/rygel-item-removal-queue.vala
@@ -83,4 +83,3 @@ internal class Rygel.ItemRemovalQueue: GLib.Object {
item_timeouts = new HashMap<string,uint> ();
}
}
-
diff --git a/src/rygel/rygel-l16-transcoder.vala b/src/librygel-core/rygel-l16-transcoder.vala
similarity index 100%
rename from src/rygel/rygel-l16-transcoder.vala
rename to src/librygel-core/rygel-l16-transcoder.vala
diff --git a/src/rygel/rygel-log-handler.vala b/src/librygel-core/rygel-log-handler.vala
similarity index 100%
rename from src/rygel/rygel-log-handler.vala
rename to src/librygel-core/rygel-log-handler.vala
diff --git a/src/rygel/rygel-logical-expression.vala b/src/librygel-core/rygel-logical-expression.vala
similarity index 100%
rename from src/rygel/rygel-logical-expression.vala
rename to src/librygel-core/rygel-logical-expression.vala
diff --git a/src/rygel/rygel-media-art-store.vala b/src/librygel-core/rygel-media-art-store.vala
similarity index 100%
rename from src/rygel/rygel-media-art-store.vala
rename to src/librygel-core/rygel-media-art-store.vala
diff --git a/src/rygel/rygel-media-container.vala b/src/librygel-core/rygel-media-container.vala
similarity index 99%
rename from src/rygel/rygel-media-container.vala
rename to src/librygel-core/rygel-media-container.vala
index 0cc5c44..a361abe 100644
--- a/src/rygel/rygel-media-container.vala
+++ b/src/librygel-core/rygel-media-container.vala
@@ -195,4 +195,3 @@ public abstract class Rygel.MediaContainer : MediaObject {
}
}
}
-
diff --git a/src/rygel/rygel-media-item.vala b/src/librygel-core/rygel-media-item.vala
similarity index 100%
rename from src/rygel/rygel-media-item.vala
rename to src/librygel-core/rygel-media-item.vala
diff --git a/src/rygel/rygel-media-object.vala b/src/librygel-core/rygel-media-object.vala
similarity index 100%
rename from src/rygel/rygel-media-object.vala
rename to src/librygel-core/rygel-media-object.vala
diff --git a/src/rygel/rygel-media-objects.vala b/src/librygel-core/rygel-media-objects.vala
similarity index 100%
rename from src/rygel/rygel-media-objects.vala
rename to src/librygel-core/rygel-media-objects.vala
diff --git a/src/rygel/rygel-media-player.vala b/src/librygel-core/rygel-media-player.vala
similarity index 100%
rename from src/rygel/rygel-media-player.vala
rename to src/librygel-core/rygel-media-player.vala
diff --git a/src/rygel/rygel-media-query-action.vala b/src/librygel-core/rygel-media-query-action.vala
similarity index 100%
rename from src/rygel/rygel-media-query-action.vala
rename to src/librygel-core/rygel-media-query-action.vala
diff --git a/src/rygel/rygel-media-receiver-registrar.vala b/src/librygel-core/rygel-media-receiver-registrar.vala
similarity index 100%
rename from src/rygel/rygel-media-receiver-registrar.vala
rename to src/librygel-core/rygel-media-receiver-registrar.vala
diff --git a/src/rygel/rygel-media-renderer-plugin.vala b/src/librygel-core/rygel-media-renderer-plugin.vala
similarity index 99%
rename from src/rygel/rygel-media-renderer-plugin.vala
rename to src/librygel-core/rygel-media-renderer-plugin.vala
index 0918000..549d95b 100644
--- a/src/rygel/rygel-media-renderer-plugin.vala
+++ b/src/librygel-core/rygel-media-renderer-plugin.vala
@@ -54,4 +54,3 @@ public class Rygel.MediaRendererPlugin : Rygel.Plugin {
return null;
}
}
-
diff --git a/src/rygel/rygel-media-server-plugin.vala b/src/librygel-core/rygel-media-server-plugin.vala
similarity index 99%
rename from src/rygel/rygel-media-server-plugin.vala
rename to src/librygel-core/rygel-media-server-plugin.vala
index 0961eb5..13293ae 100644
--- a/src/rygel/rygel-media-server-plugin.vala
+++ b/src/librygel-core/rygel-media-server-plugin.vala
@@ -83,4 +83,3 @@ public abstract class Rygel.MediaServerPlugin : Rygel.Plugin {
this.active = true;
}
}
-
diff --git a/src/rygel/rygel-meta-config.vala b/src/librygel-core/rygel-meta-config.vala
similarity index 99%
rename from src/rygel/rygel-meta-config.vala
rename to src/librygel-core/rygel-meta-config.vala
index 869755a..5a75538 100644
--- a/src/rygel/rygel-meta-config.vala
+++ b/src/librygel-core/rygel-meta-config.vala
@@ -544,4 +544,3 @@ public class Rygel.MetaConfig : GLib.Object, Configuration {
return val;
}
}
-
diff --git a/src/rygel/rygel-mp2ts-transcoder.vala b/src/librygel-core/rygel-mp2ts-transcoder.vala
similarity index 100%
rename from src/rygel/rygel-mp2ts-transcoder.vala
rename to src/librygel-core/rygel-mp2ts-transcoder.vala
diff --git a/src/rygel/rygel-mp3-transcoder.vala b/src/librygel-core/rygel-mp3-transcoder.vala
similarity index 100%
rename from src/rygel/rygel-mp3-transcoder.vala
rename to src/librygel-core/rygel-mp3-transcoder.vala
diff --git a/src/rygel/rygel-music-item.vala b/src/librygel-core/rygel-music-item.vala
similarity index 100%
rename from src/rygel/rygel-music-item.vala
rename to src/librygel-core/rygel-music-item.vala
diff --git a/src/rygel/rygel-panasonic-hacks.vala b/src/librygel-core/rygel-panasonic-hacks.vala
similarity index 100%
rename from src/rygel/rygel-panasonic-hacks.vala
rename to src/librygel-core/rygel-panasonic-hacks.vala
diff --git a/src/rygel/rygel-photo-item.vala b/src/librygel-core/rygel-photo-item.vala
similarity index 100%
rename from src/rygel/rygel-photo-item.vala
rename to src/librygel-core/rygel-photo-item.vala
diff --git a/src/rygel/rygel-plugin-loader.vala b/src/librygel-core/rygel-plugin-loader.vala
similarity index 99%
rename from src/rygel/rygel-plugin-loader.vala
rename to src/librygel-core/rygel-plugin-loader.vala
index 528cfd0..6e79d23 100644
--- a/src/rygel/rygel-plugin-loader.vala
+++ b/src/librygel-core/rygel-plugin-loader.vala
@@ -200,4 +200,3 @@ public class Rygel.PluginLoader : Object {
return file_info.get_file_type () == FileType.DIRECTORY;
}
}
-
diff --git a/src/rygel/rygel-plugin.vala b/src/librygel-core/rygel-plugin.vala
similarity index 99%
rename from src/rygel/rygel-plugin.vala
rename to src/librygel-core/rygel-plugin.vala
index 261cb83..3d0b6e1 100644
--- a/src/rygel/rygel-plugin.vala
+++ b/src/librygel-core/rygel-plugin.vala
@@ -142,4 +142,3 @@ public class Rygel.Plugin : GUPnP.ResourceFactory {
this.default_icons.add (icon);
}
}
-
diff --git a/src/rygel/rygel-relational-expression.vala b/src/librygel-core/rygel-relational-expression.vala
similarity index 100%
rename from src/rygel/rygel-relational-expression.vala
rename to src/librygel-core/rygel-relational-expression.vala
diff --git a/src/rygel/rygel-rendering-control.vala b/src/librygel-core/rygel-rendering-control.vala
similarity index 100%
rename from src/rygel/rygel-rendering-control.vala
rename to src/librygel-core/rygel-rendering-control.vala
diff --git a/src/rygel/rygel-resource-info.vala b/src/librygel-core/rygel-resource-info.vala
similarity index 99%
rename from src/rygel/rygel-resource-info.vala
rename to src/librygel-core/rygel-resource-info.vala
index 1341316..0dc2805 100644
--- a/src/rygel/rygel-resource-info.vala
+++ b/src/librygel-core/rygel-resource-info.vala
@@ -46,4 +46,3 @@ public class Rygel.ResourceInfo {
this.type = type;
}
}
-
diff --git a/src/rygel/rygel-root-device-factory.vala b/src/librygel-core/rygel-root-device-factory.vala
similarity index 99%
rename from src/rygel/rygel-root-device-factory.vala
rename to src/librygel-core/rygel-root-device-factory.vala
index 190da17..73633ed 100644
--- a/src/rygel/rygel-root-device-factory.vala
+++ b/src/librygel-core/rygel-root-device-factory.vala
@@ -365,4 +365,3 @@ public class Rygel.RootDeviceFactory {
return "uuid:" + (string) udn;
}
}
-
diff --git a/src/rygel/rygel-root-device.vala b/src/librygel-core/rygel-root-device.vala
similarity index 99%
rename from src/rygel/rygel-root-device.vala
rename to src/librygel-core/rygel-root-device.vala
index f8ed9ce..4adf28d 100644
--- a/src/rygel/rygel-root-device.vala
+++ b/src/librygel-core/rygel-root-device.vala
@@ -59,4 +59,3 @@ public class Rygel.RootDevice: GUPnP.RootDevice {
}
}
}
-
diff --git a/src/rygel/rygel-search-criteria-parser.vala b/src/librygel-core/rygel-search-criteria-parser.vala
similarity index 99%
rename from src/rygel/rygel-search-criteria-parser.vala
rename to src/librygel-core/rygel-search-criteria-parser.vala
index 99f5988..99d1f8f 100644
--- a/src/rygel/rygel-search-criteria-parser.vala
+++ b/src/librygel-core/rygel-search-criteria-parser.vala
@@ -236,4 +236,3 @@ internal class Rygel.SearchCriteriaParser : Object, StateMachine {
}
}
-
diff --git a/src/rygel/rygel-search-expression.vala b/src/librygel-core/rygel-search-expression.vala
similarity index 100%
rename from src/rygel/rygel-search-expression.vala
rename to src/librygel-core/rygel-search-expression.vala
diff --git a/src/rygel/rygel-search.vala b/src/librygel-core/rygel-search.vala
similarity index 99%
rename from src/rygel/rygel-search.vala
rename to src/librygel-core/rygel-search.vala
index 1d5e66a..b050eff 100644
--- a/src/rygel/rygel-search.vala
+++ b/src/librygel-core/rygel-search.vala
@@ -93,4 +93,3 @@ internal class Rygel.Search: Rygel.MediaQueryAction {
base.handle_error (error);
}
}
-
diff --git a/src/rygel/rygel-searchable-container.vala b/src/librygel-core/rygel-searchable-container.vala
similarity index 100%
rename from src/rygel/rygel-searchable-container.vala
rename to src/librygel-core/rygel-searchable-container.vala
diff --git a/src/rygel/rygel-simple-container.vala b/src/librygel-core/rygel-simple-container.vala
similarity index 100%
rename from src/rygel/rygel-simple-container.vala
rename to src/librygel-core/rygel-simple-container.vala
diff --git a/src/rygel/rygel-sink-connection-manager.vala b/src/librygel-core/rygel-sink-connection-manager.vala
similarity index 100%
rename from src/rygel/rygel-sink-connection-manager.vala
rename to src/librygel-core/rygel-sink-connection-manager.vala
diff --git a/src/rygel/rygel-source-connection-manager.vala b/src/librygel-core/rygel-source-connection-manager.vala
similarity index 100%
rename from src/rygel/rygel-source-connection-manager.vala
rename to src/librygel-core/rygel-source-connection-manager.vala
diff --git a/src/rygel/rygel-state-machine.vala b/src/librygel-core/rygel-state-machine.vala
similarity index 99%
rename from src/rygel/rygel-state-machine.vala
rename to src/librygel-core/rygel-state-machine.vala
index f3ef622..e4625fb 100644
--- a/src/rygel/rygel-state-machine.vala
+++ b/src/librygel-core/rygel-state-machine.vala
@@ -33,4 +33,3 @@ public interface Rygel.StateMachine: GLib.Object {
public async abstract void run ();
}
-
diff --git a/src/rygel/rygel-subtitle-manager.vala b/src/librygel-core/rygel-subtitle-manager.vala
similarity index 100%
rename from src/rygel/rygel-subtitle-manager.vala
rename to src/librygel-core/rygel-subtitle-manager.vala
diff --git a/src/rygel/rygel-subtitle.vala b/src/librygel-core/rygel-subtitle.vala
similarity index 100%
rename from src/rygel/rygel-subtitle.vala
rename to src/librygel-core/rygel-subtitle.vala
diff --git a/src/rygel/rygel-thumbnail.vala b/src/librygel-core/rygel-thumbnail.vala
similarity index 100%
rename from src/rygel/rygel-thumbnail.vala
rename to src/librygel-core/rygel-thumbnail.vala
diff --git a/src/rygel/rygel-thumbnailer.vala b/src/librygel-core/rygel-thumbnailer.vala
similarity index 100%
rename from src/rygel/rygel-thumbnailer.vala
rename to src/librygel-core/rygel-thumbnailer.vala
diff --git a/src/rygel/rygel-transcode-manager.vala b/src/librygel-core/rygel-transcode-manager.vala
similarity index 99%
rename from src/rygel/rygel-transcode-manager.vala
rename to src/librygel-core/rygel-transcode-manager.vala
index 47ac9e6..69e1f48 100644
--- a/src/rygel/rygel-transcode-manager.vala
+++ b/src/librygel-core/rygel-transcode-manager.vala
@@ -152,4 +152,3 @@ internal abstract class Rygel.TranscodeManager : GLib.Object {
return protocol_infos;
}
}
-
diff --git a/src/rygel/rygel-transcoder.vala b/src/librygel-core/rygel-transcoder.vala
similarity index 100%
rename from src/rygel/rygel-transcoder.vala
rename to src/librygel-core/rygel-transcoder.vala
diff --git a/src/rygel/rygel-user-config.vala b/src/librygel-core/rygel-user-config.vala
similarity index 99%
rename from src/rygel/rygel-user-config.vala
rename to src/librygel-core/rygel-user-config.vala
index e7e867c..06efffd 100644
--- a/src/rygel/rygel-user-config.vala
+++ b/src/librygel-core/rygel-user-config.vala
@@ -294,4 +294,3 @@ public class Rygel.UserConfig : GLib.Object, Configuration {
return val;
}
}
-
diff --git a/src/rygel/rygel-v1-hacks.vala b/src/librygel-core/rygel-v1-hacks.vala
similarity index 100%
rename from src/rygel/rygel-v1-hacks.vala
rename to src/librygel-core/rygel-v1-hacks.vala
diff --git a/src/rygel/rygel-video-item.vala b/src/librygel-core/rygel-video-item.vala
similarity index 100%
rename from src/rygel/rygel-video-item.vala
rename to src/librygel-core/rygel-video-item.vala
diff --git a/src/rygel/rygel-video-transcoder.vala b/src/librygel-core/rygel-video-transcoder.vala
similarity index 100%
rename from src/rygel/rygel-video-transcoder.vala
rename to src/librygel-core/rygel-video-transcoder.vala
diff --git a/src/rygel/rygel-visual-item.vala b/src/librygel-core/rygel-visual-item.vala
similarity index 100%
rename from src/rygel/rygel-visual-item.vala
rename to src/librygel-core/rygel-visual-item.vala
diff --git a/src/rygel/rygel-volume.vala b/src/librygel-core/rygel-volume.vala
similarity index 100%
rename from src/rygel/rygel-volume.vala
rename to src/librygel-core/rygel-volume.vala
diff --git a/src/rygel/rygel-wmp-hacks.vala b/src/librygel-core/rygel-wmp-hacks.vala
similarity index 100%
rename from src/rygel/rygel-wmp-hacks.vala
rename to src/librygel-core/rygel-wmp-hacks.vala
diff --git a/src/rygel/rygel-wmv-transcoder.vala b/src/librygel-core/rygel-wmv-transcoder.vala
similarity index 100%
rename from src/rygel/rygel-wmv-transcoder.vala
rename to src/librygel-core/rygel-wmv-transcoder.vala
diff --git a/src/rygel/rygel-writable-container.vala b/src/librygel-core/rygel-writable-container.vala
similarity index 100%
rename from src/rygel/rygel-writable-container.vala
rename to src/librygel-core/rygel-writable-container.vala
diff --git a/src/rygel/rygel-xbmc-hacks.vala b/src/librygel-core/rygel-xbmc-hacks.vala
similarity index 100%
rename from src/rygel/rygel-xbmc-hacks.vala
rename to src/librygel-core/rygel-xbmc-hacks.vala
diff --git a/src/rygel/rygel-xbox-hacks.vala b/src/librygel-core/rygel-xbox-hacks.vala
similarity index 100%
rename from src/rygel/rygel-xbox-hacks.vala
rename to src/librygel-core/rygel-xbox-hacks.vala
diff --git a/src/rygel/rygel-xml-utils.vala b/src/librygel-core/rygel-xml-utils.vala
similarity index 99%
rename from src/rygel/rygel-xml-utils.vala
rename to src/librygel-core/rygel-xml-utils.vala
index da44b3f..5c33057 100644
--- a/src/rygel/rygel-xml-utils.vala
+++ b/src/librygel-core/rygel-xml-utils.vala
@@ -49,4 +49,3 @@ public class Rygel.XMLUtils {
return ret;
}
}
-
diff --git a/src/rygel/Makefile.am b/src/rygel/Makefile.am
index 86eadae..438a388 100644
--- a/src/rygel/Makefile.am
+++ b/src/rygel/Makefile.am
@@ -9,133 +9,12 @@ AM_CFLAGS += \
-DBIG_ICON_DIR='"$(bigicondir)"' -include config.h \
-DLOCALEDIR=\""$(datadir)/locale"\" -DG_LOG_DOMAIN='"Rygel"'
-librygelincdir = $(includedir)/rygel-1.0
-
-librygelinc_HEADERS = rygel-core.h
-
-lib_LTLIBRARIES = librygel-core-1.0.la
-
-VAPI_SOURCE_FILES = \
- rygel-cmdline-config.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-media-renderer-plugin.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-item.vala \
- rygel-media-object.vala \
- rygel-media-server-plugin.vala \
- rygel-search-expression.vala \
- rygel-configuration.vala \
- rygel-free-desktop-interfaces.vala \
- rygel-media-player.vala \
- rygel-searchable-container.vala \
- rygel-state-machine.vala \
- rygel-visual-item.vala \
- rygel-writable-container.vala \
- rygel-xml-utils.vala
-
-librygel_core_1_0_la_SOURCES = \
- $(VAPI_SOURCE_FILES) \
- rygel-http-item-uri.vala \
- rygel-environment-config.vala \
- rygel-content-directory.vala \
- rygel-connection-manager.vala \
- rygel-source-connection-manager.vala \
- rygel-sink-connection-manager.vala \
- rygel-av-transport.vala \
- rygel-rendering-control.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-changelog.vala \
- rygel-volume.vala \
- rygel-description-file.vala
-
-librygel_core_1_0_la_VALAFLAGS = \
- -H rygel-core.h -C --library=rygel-core-1.0 \
- --pkg gstreamer-0.10 \
- --pkg gstreamer-base-0.10 \
- --pkg gupnp-dlna-1.0 \
- $(RYGEL_COMMON_VALAFLAGS)
-
-librygel_core_1_0_la_LIBADD = \
- $(GST_PBU_LIBS) \
- $(RYGEL_BASE_LIBS) \
- $(LIBGUPNP_DLNA_LIBS) \
- $(GIO_LIBS) \
- $(LIBSOUP_LIBS)
-
-RYGEL_CORE_VERSION=0:0:0
-librygel_core_1_0_la_LDFLAGS = -version-info $(RYGEL_CORE_VERSION)
-
bin_PROGRAMS = rygel
-BUILT_SOURCES = \
- rygel-core-1.0.vapi \
- rygel-core.h
-
rygel_SOURCES = \
rygel-dbus-service.vala \
rygel-main.vala \
- rygel-core-1.0.vapi
+ $(top_builddir)/src/librygel-core/rygel-core-1.0.vapi
rygel_VALAFLAGS = \
--pkg posix \
@@ -144,17 +23,13 @@ rygel_VALAFLAGS = \
$(RYGEL_COMMON_VALAFLAGS)
rygel_LDADD = \
- librygel-core-1.0.la \
+ $(top_builddir)/src/librygel-core/librygel-core-1.0.la \
$(RYGEL_BASE_LIBS)
rygel_LDFLAGS = -export-dynamic
-VAPI_FILES = rygel-core-1.0.vapi
-DEPS_FILES = rygel-core-1.0.deps
-
vapidir = $(VAPIDIR)
vapi_DATA = $(VAPI_FILES) $(DEPS_FILES)
-rygel-core-1.0.vapi rygel-core.h: librygel_core_1_0_la_vala.stamp
MAINTAINERCLEANFILES += $(BUILT_SOURCES)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5739c99..90acdde 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -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 \
- ../src/rygel/rygel-thumbnail.vala \
- ../src/rygel/rygel-icon-info.vala
+ $(top_srcdir)/src/librygel-core/rygel-thumbnail.vala \
+ $(top_srcdir)/src/librygel-core/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 0cf84c7..6b60984 120000
--- a/tests/rygel-gst-utils.vala
+++ b/tests/rygel-gst-utils.vala
@@ -1 +1 @@
-../src/rygel/rygel-gst-utils.vala
\ No newline at end of file
+../src/librygel-core/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 c394bbd..74119d5 120000
--- a/tests/rygel-http-byte-seek.vala
+++ b/tests/rygel-http-byte-seek.vala
@@ -1 +1 @@
-../src/rygel/rygel-http-byte-seek.vala
\ No newline at end of file
+../src/librygel-core/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 c394bbd..74119d5 120000
--- a/tests/rygel-http-byte-seek_http-get.vala
+++ b/tests/rygel-http-byte-seek_http-get.vala
@@ -1 +1 @@
-../src/rygel/rygel-http-byte-seek.vala
\ No newline at end of file
+../src/librygel-core/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 1bcf54b..4e52f8e 120000
--- a/tests/rygel-http-get.vala
+++ b/tests/rygel-http-get.vala
@@ -1 +1 @@
-../src/rygel/rygel-http-get.vala
\ No newline at end of file
+../src/librygel-core/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 b3ec9d8..23b7d24 120000
--- a/tests/rygel-http-gst-sink.vala
+++ b/tests/rygel-http-gst-sink.vala
@@ -1 +1 @@
-../src/rygel/rygel-http-gst-sink.vala
\ No newline at end of file
+../src/librygel-core/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 b6cf2d8..88bc91b 120000
--- a/tests/rygel-http-item-uri.vala
+++ b/tests/rygel-http-item-uri.vala
@@ -1 +1 @@
-../src/rygel/rygel-http-item-uri.vala
\ No newline at end of file
+../src/librygel-core/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 b6cf2d8..88bc91b 120000
--- a/tests/rygel-http-item-uri_http-get.vala
+++ b/tests/rygel-http-item-uri_http-get.vala
@@ -1 +1 @@
-../src/rygel/rygel-http-item-uri.vala
\ No newline at end of file
+../src/librygel-core/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 b6cf2d8..88bc91b 120000
--- a/tests/rygel-http-item-uri_http-post.vala
+++ b/tests/rygel-http-item-uri_http-post.vala
@@ -1 +1 @@
-../src/rygel/rygel-http-item-uri.vala
\ No newline at end of file
+../src/librygel-core/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 69cab6a..2f1ca70 120000
--- a/tests/rygel-http-post.vala
+++ b/tests/rygel-http-post.vala
@@ -1 +1 @@
-../src/rygel/rygel-http-post.vala
\ No newline at end of file
+../src/librygel-core/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 611f7e5..38f0509 120000
--- a/tests/rygel-http-request_http-get.vala
+++ b/tests/rygel-http-request_http-get.vala
@@ -1 +1 @@
-../src/rygel/rygel-http-request.vala
\ No newline at end of file
+../src/librygel-core/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 611f7e5..38f0509 120000
--- a/tests/rygel-http-request_http-post.vala
+++ b/tests/rygel-http-request_http-post.vala
@@ -1 +1 @@
-../src/rygel/rygel-http-request.vala
\ No newline at end of file
+../src/librygel-core/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 e23cfdf..fc06488 120000
--- a/tests/rygel-http-response.vala
+++ b/tests/rygel-http-response.vala
@@ -1 +1 @@
-../src/rygel/rygel-http-response.vala
\ No newline at end of file
+../src/librygel-core/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 343aaf6..681442a 120000
--- a/tests/rygel-http-seek.vala
+++ b/tests/rygel-http-seek.vala
@@ -1 +1 @@
-../src/rygel/rygel-http-seek.vala
\ No newline at end of file
+../src/librygel-core/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 343aaf6..681442a 120000
--- a/tests/rygel-http-seek_http-get.vala
+++ b/tests/rygel-http-seek_http-get.vala
@@ -1 +1 @@
-../src/rygel/rygel-http-seek.vala
\ No newline at end of file
+../src/librygel-core/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 343aaf6..681442a 120000
--- a/tests/rygel-http-seek_time-seek.vala
+++ b/tests/rygel-http-seek_time-seek.vala
@@ -1 +1 @@
-../src/rygel/rygel-http-seek.vala
\ No newline at end of file
+../src/librygel-core/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 48b688b..e5ea561 120000
--- a/tests/rygel-http-time-seek.vala
+++ b/tests/rygel-http-time-seek.vala
@@ -1 +1 @@
-../src/rygel/rygel-http-time-seek.vala
\ No newline at end of file
+../src/librygel-core/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 48b688b..e5ea561 120000
--- a/tests/rygel-http-time-seek_http-get.vala
+++ b/tests/rygel-http-time-seek_http-get.vala
@@ -1 +1 @@
-../src/rygel/rygel-http-time-seek.vala
\ No newline at end of file
+../src/librygel-core/rygel-http-time-seek.vala
\ No newline at end of file
diff --git a/tests/rygel-item-creator.vala b/tests/rygel-item-creator.vala
index 4d22d87..39e7ca3 120000
--- a/tests/rygel-item-creator.vala
+++ b/tests/rygel-item-creator.vala
@@ -1 +1 @@
-../src/rygel/rygel-item-creator.vala
\ No newline at end of file
+../src/librygel-core/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 ce7e89c..107e3f0 120000
--- a/tests/rygel-media-art-store.vala
+++ b/tests/rygel-media-art-store.vala
@@ -1 +1 @@
-../src/rygel/rygel-media-art-store.vala
\ No newline at end of file
+../src/librygel-core/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 d0490ad..9b8040a 120000
--- a/tests/rygel-relational-expression.vala
+++ b/tests/rygel-relational-expression.vala
@@ -1 +1 @@
-../src/rygel/rygel-relational-expression.vala
\ No newline at end of file
+../src/librygel-core/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 5892005..237ceaa 120000
--- a/tests/rygel-search-expression.vala
+++ b/tests/rygel-search-expression.vala
@@ -1 +1 @@
-../src/rygel/rygel-search-expression.vala
\ No newline at end of file
+../src/librygel-core/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 d9e0660..aa5485e 120000
--- a/tests/rygel-searchable-container.vala
+++ b/tests/rygel-searchable-container.vala
@@ -1 +1 @@
-../src/rygel/rygel-searchable-container.vala
\ No newline at end of file
+../src/librygel-core/rygel-searchable-container.vala
\ No newline at end of file
diff --git a/tests/rygel-state-machine_http-get.vala b/tests/rygel-state-machine_http-get.vala
index 5063d68..2b3a7af 120000
--- a/tests/rygel-state-machine_http-get.vala
+++ b/tests/rygel-state-machine_http-get.vala
@@ -1 +1 @@
-../src/rygel/rygel-state-machine.vala
\ No newline at end of file
+../src/librygel-core/rygel-state-machine.vala
\ No newline at end of file
diff --git a/tests/rygel-state-machine_http-post.vala b/tests/rygel-state-machine_http-post.vala
index 5063d68..2b3a7af 120000
--- a/tests/rygel-state-machine_http-post.vala
+++ b/tests/rygel-state-machine_http-post.vala
@@ -1 +1 @@
-../src/rygel/rygel-state-machine.vala
\ No newline at end of file
+../src/librygel-core/rygel-state-machine.vala
\ No newline at end of file
diff --git a/tests/rygel-state-machine_http-response.vala b/tests/rygel-state-machine_http-response.vala
index 5063d68..2b3a7af 120000
--- a/tests/rygel-state-machine_http-response.vala
+++ b/tests/rygel-state-machine_http-response.vala
@@ -1 +1 @@
-../src/rygel/rygel-state-machine.vala
\ No newline at end of file
+../src/librygel-core/rygel-state-machine.vala
\ No newline at end of file
diff --git a/tests/rygel-state-machine_item-creator.vala b/tests/rygel-state-machine_item-creator.vala
index 5063d68..2b3a7af 120000
--- a/tests/rygel-state-machine_item-creator.vala
+++ b/tests/rygel-state-machine_item-creator.vala
@@ -1 +1 @@
-../src/rygel/rygel-state-machine.vala
\ No newline at end of file
+../src/librygel-core/rygel-state-machine.vala
\ No newline at end of file
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
