[rygel] example renderer plugin: Rename this with a -vala prefix.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rygel] example renderer plugin: Rename this with a -vala prefix.
- Date: Mon, 19 Nov 2012 12:57:45 +0000 (UTC)
commit f0c5513c706fd2c535070de45f44f383f1911e44
Author: Murray Cumming <murrayc murrayc com>
Date: Mon Nov 19 13:57:22 2012 +0100
example renderer plugin: Rename this with a -vala prefix.
So that things are clearer when I add the C version,
and so that there is no conflict caused by two plugins
containing the same symbols.
data/rygel.conf | 3 +++
examples/renderer-plugins/vala/Makefile.am | 16 ++++++++--------
...xample-player.vala => example-player-vala.vala} | 10 +++++-----
...ugin.vala => example-renderer-plugin-vala.vala} | 12 ++++++------
4 files changed, 22 insertions(+), 19 deletions(-)
---
diff --git a/data/rygel.conf b/data/rygel.conf
index 3bf84c1..848b25c 100644
--- a/data/rygel.conf
+++ b/data/rygel.conf
@@ -137,6 +137,9 @@ enabled=false
[ExampleServerPluginVala]
enabled=false
+[ExampleServerPluginC]
+enabled=false
+
[ExampleRendererPluginVala]
enabled=false
diff --git a/examples/renderer-plugins/vala/Makefile.am b/examples/renderer-plugins/vala/Makefile.am
index 27dcc10..33e829c 100644
--- a/examples/renderer-plugins/vala/Makefile.am
+++ b/examples/renderer-plugins/vala/Makefile.am
@@ -1,20 +1,20 @@
include $(top_srcdir)/common.am
-plugin_LTLIBRARIES = librygel-example-renderer-plugin.la
+plugin_LTLIBRARIES = librygel-example-renderer-plugin-vala.la
-AM_CFLAGS += -DG_LOG_DOMAIN='"Example"'
+AM_CFLAGS += -DG_LOG_DOMAIN='"ExampleRendererPluginVala"'
-librygel_example_renderer_plugin_la_SOURCES = \
- example-renderer-plugin.vala \
- example-player.vala
+librygel_example_renderer_plugin_vala_la_SOURCES = \
+ example-renderer-plugin-vala.vala \
+ example-player-vala.vala
-librygel_example_renderer_plugin_la_VALAFLAGS = \
+librygel_example_renderer_plugin_vala_la_VALAFLAGS = \
--pkg gstreamer-0.10 \
$(RYGEL_COMMON_RENDERER_PLUGIN_VALAFLAGS)
-librygel_example_renderer_plugin_la_LIBADD = \
+librygel_example_renderer_plugin_vala_la_LIBADD = \
$(LIBGSTREAMER_LIBS) \
$(RYGEL_COMMON_RENDERER_LIBS)
-librygel_example_renderer_plugin_la_LDFLAGS = \
+librygel_example_renderer_plugin_vala_la_LDFLAGS = \
$(RYGEL_PLUGIN_LINKER_FLAGS)
diff --git a/examples/renderer-plugins/vala/example-player.vala b/examples/renderer-plugins/vala/example-player-vala.vala
similarity index 93%
rename from examples/renderer-plugins/vala/example-player.vala
rename to examples/renderer-plugins/vala/example-player-vala.vala
index 32c708e..04a5a04 100644
--- a/examples/renderer-plugins/vala/example-player.vala
+++ b/examples/renderer-plugins/vala/example-player-vala.vala
@@ -29,18 +29,18 @@ using GUPnP;
*
* RygelPlaybinPlayer, from librygel-renderer-gst, is a more complete example.
*/
-public class Rygel.Example.Player : GLib.Object, Rygel.MediaPlayer {
+public class Rygel.Example.PlayerVala : GLib.Object, Rygel.MediaPlayer {
private const string[] PROTOCOLS = { "http-get" };
private const string[] MIME_TYPES = {"image/jpeg",
"image/png" };
- private static Player player;
+ private static PlayerVala player;
- private Player () {
+ private PlayerVala () {
}
- public static Player get_default () {
+ public static PlayerVala get_default () {
if (player == null) {
- player = new Player ();
+ player = new PlayerVala ();
}
return player;
diff --git a/examples/renderer-plugins/vala/example-renderer-plugin.vala b/examples/renderer-plugins/vala/example-renderer-plugin-vala.vala
similarity index 83%
rename from examples/renderer-plugins/vala/example-renderer-plugin.vala
rename to examples/renderer-plugins/vala/example-renderer-plugin-vala.vala
index ca99f56..26b029e 100644
--- a/examples/renderer-plugins/vala/example-renderer-plugin.vala
+++ b/examples/renderer-plugins/vala/example-renderer-plugin-vala.vala
@@ -22,14 +22,14 @@ using Rygel;
using GUPnP;
public void module_init (PluginLoader loader) {
- if (loader.plugin_disabled (Rygel.Example.RendererPlugin.NAME)) {
+ if (loader.plugin_disabled (Rygel.Example.RendererPluginVala.NAME)) {
message ("Plugin '%s' disabled by user, ignoring..",
- Rygel.Example.RendererPlugin.NAME);
+ Rygel.Example.RendererPluginVala.NAME);
return;
}
- var plugin = new Rygel.Example.RendererPlugin ();
+ var plugin = new Rygel.Example.RendererPluginVala ();
loader.add_plugin (plugin);
}
@@ -41,7 +41,7 @@ public void module_init (PluginLoader loader) {
* [ExampleRendererPluginVala]
* enabled=false
*/
-public class Rygel.Example.RendererPlugin : Rygel.MediaRendererPlugin {
+public class Rygel.Example.RendererPluginVala : Rygel.MediaRendererPlugin {
/*
* The non-human-readable name for the service:
* Note that this should currently not contain spaces.
@@ -55,11 +55,11 @@ public class Rygel.Example.RendererPlugin : Rygel.MediaRendererPlugin {
/* Optional human-readable description for the service: */
public const string DESCRIPTION = "An example Rygel renderer plugin implemented in vala.";
- public RendererPlugin () {
+ public RendererPluginVala () {
base (NAME, TITLE, DESCRIPTION);
}
public override MediaPlayer? get_player () {
- return Example.Player.get_default ();
+ return Example.PlayerVala.get_default ();
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]