diff options
-rw-r--r-- | src/librygel-renderer-gst/rygel-playbin-player.vala | 16 | ||||
-rw-r--r-- | src/librygel-renderer-gst/rygel-playbin-renderer.vala | 8 | ||||
-rw-r--r-- | src/plugins/playbin/rygel-playbin-module.vala | 2 | ||||
-rw-r--r-- | src/plugins/playbin/rygel-playbin-plugin.vala | 10 | ||||
-rw-r--r-- | tests/rygel-playbin-renderer-test.vala | 4 |
5 files changed, 20 insertions, 20 deletions
diff --git a/src/librygel-renderer-gst/rygel-playbin-player.vala b/src/librygel-renderer-gst/rygel-playbin-player.vala index 5007dd46..a65bd605 100644 --- a/src/librygel-renderer-gst/rygel-playbin-player.vala +++ b/src/librygel-renderer-gst/rygel-playbin-player.vala @@ -39,7 +39,7 @@ public errordomain Rygel.PlaybinPlayerError { * * This class is useful only when implementing Rygel plugins. */ -public class Rygel.Playbin.Player : GLib.Object, Rygel.MediaPlayer { +public class Rygel.PlaybinPlayer : GLib.Object, Rygel.MediaPlayer { private const string TRANSFER_MODE_STREAMING = "Streaming"; private const string TRANSFER_MODE_INTERACTIVE = "Interactive"; private const string PROTOCOL_INFO_TEMPLATE = "http-get:%s:*:%s"; @@ -91,12 +91,12 @@ public class Rygel.Playbin.Player : GLib.Object, Rygel.MediaPlayer { "video/x-ms-asf", "video/x-xvid", "video/x-ms-wmv" }; - private static Player player; + private static PlaybinPlayer player; private static bool has_dlna_src; static construct { - Player.has_dlna_src = Gst.URI.protocol_is_supported (URIType.SRC, - "dlna+http"); + PlaybinPlayer.has_dlna_src = Gst.URI.protocol_is_supported (URIType.SRC, + "dlna+http"); } public dynamic Element playbin { get; private set; } @@ -198,7 +198,7 @@ public class Rygel.Playbin.Player : GLib.Object, Rygel.MediaPlayer { set { this._uri = value; this.playbin.set_state (State.READY); - if (Player.has_dlna_src && value.has_prefix ("http")) { + if (PlaybinPlayer.has_dlna_src && value.has_prefix ("http")) { debug ("Trying to use DLNA src element"); this.playbin.uri = "dlna+" + value; } else { @@ -363,7 +363,7 @@ public class Rygel.Playbin.Player : GLib.Object, Rygel.MediaPlayer { } } - private Player () throws Error { + private PlaybinPlayer () throws Error { this.playbin = ElementFactory.make ("playbin3", null); if (this.playbin == null) { throw new PlaybinPlayerError.NO_ELEMENT ( @@ -372,9 +372,9 @@ public class Rygel.Playbin.Player : GLib.Object, Rygel.MediaPlayer { this.setup_playbin (); } - public static Player instance () throws Error { + public static PlaybinPlayer instance () throws Error { if (player == null) { - player = new Player (); + player = new PlaybinPlayer (); } return player; diff --git a/src/librygel-renderer-gst/rygel-playbin-renderer.vala b/src/librygel-renderer-gst/rygel-playbin-renderer.vala index 45096bef..0173d247 100644 --- a/src/librygel-renderer-gst/rygel-playbin-renderer.vala +++ b/src/librygel-renderer-gst/rygel-playbin-renderer.vala @@ -40,7 +40,7 @@ using GUPnP; * * See the <link linkend="implementing-renderers-gst">Implementing GStreamer-based Renderers</link> section. */ -public class Rygel.Playbin.Renderer : Rygel.MediaRenderer { +public class Rygel.PlaybinRenderer : Rygel.MediaRenderer { /** * Create a new instance of Renderer. * @@ -49,10 +49,10 @@ public class Rygel.Playbin.Renderer : Rygel.MediaRenderer { * * @param title Friendly name of the new UPnP renderer on the network. */ - public Renderer (string title) { + public PlaybinRenderer (string title) { try { Object (title: title, - player: Player.instance ()); + player: PlaybinPlayer.instance ()); } catch (Error error) { warning (error.message); @@ -65,7 +65,7 @@ public class Rygel.Playbin.Renderer : Rygel.MediaRenderer { */ public Gst.Element? get_playbin () { try { - var player = Rygel.Playbin.Player.instance (); + var player = Rygel.PlaybinPlayer.instance (); return player.playbin; } catch (Error error) { diff --git a/src/plugins/playbin/rygel-playbin-module.vala b/src/plugins/playbin/rygel-playbin-module.vala index 69e7c17b..f45d4f6a 100644 --- a/src/plugins/playbin/rygel-playbin-module.vala +++ b/src/plugins/playbin/rygel-playbin-module.vala @@ -28,7 +28,7 @@ public void module_init (PluginLoader loader) { Gst.init (ref args); try { - var plugin = new Playbin.Plugin (); + var plugin = new PlaybinPlugin (); loader.add_plugin (plugin); } catch (Error error) { diff --git a/src/plugins/playbin/rygel-playbin-plugin.vala b/src/plugins/playbin/rygel-playbin-plugin.vala index 7e45d448..abdf0f20 100644 --- a/src/plugins/playbin/rygel-playbin-plugin.vala +++ b/src/plugins/playbin/rygel-playbin-plugin.vala @@ -28,17 +28,17 @@ using Rygel; using Gee; -internal class Rygel.Playbin.Plugin : Rygel.MediaRendererPlugin { +internal class Rygel.PlaybinPlugin : Rygel.MediaRendererPlugin { public const string NAME = "Playbin"; - public Plugin () throws Error { - base (Plugin.NAME, _("GStreamer Player")); - this.supported_profiles = Player.instance ().supported_profiles; + public PlaybinPlugin () throws Error { + base (PlaybinPlugin.NAME, _("GStreamer Player")); + this.supported_profiles = PlaybinPlayer.instance ().supported_profiles; } public override MediaPlayer? get_player () { try { - return Playbin.Player.instance (); + return PlaybinPlayer.instance (); } catch (Error error) { warning (_("Could not create GStreamer player")); diff --git a/tests/rygel-playbin-renderer-test.vala b/tests/rygel-playbin-renderer-test.vala index ade4fc8b..95f960e6 100644 --- a/tests/rygel-playbin-renderer-test.vala +++ b/tests/rygel-playbin-renderer-test.vala @@ -35,10 +35,10 @@ private class Rygel.PlaybinRendererTest : GLib.Object { } public void test_with_default_gstplaybin() { - var renderer = new Rygel.Playbin.Renderer ("test playbin renderer"); + var renderer = new Rygel.PlaybinRenderer ("test playbin renderer"); assert (renderer != null); try { - var player = Rygel.Playbin.Player.instance (); + var player = Rygel.PlaybinPlayer.instance (); assert (player.playbin != null); } catch (Error error) { assert_not_reached (); |