[rygel] core,gst-renderer: Rename Player to MediaPlayer
- From: Zeeshan Ali Khattak <zeeshanak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rygel] core,gst-renderer: Rename Player to MediaPlayer
- Date: Mon, 2 Aug 2010 12:02:38 +0000 (UTC)
commit bdc7bb0aab3f19b741fd02a0f49cd7a6438b3ddc
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date: Mon Aug 2 11:38:32 2010 +0300
core,gst-renderer: Rename Player to MediaPlayer
.../gst-renderer/rygel-gst-renderer-player.vala | 2 +-
.../gst-renderer/rygel-gst-renderer-plugin.vala | 2 +-
src/rygel/Makefile.am | 2 +-
src/rygel/rygel-av-transport.vala | 4 ++--
.../{rygel-player.vala => rygel-media-player.vala} | 4 ++--
src/rygel/rygel-media-renderer-plugin.vala | 2 +-
src/rygel/rygel-sink-connection-manager.vala | 2 +-
7 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/src/plugins/gst-renderer/rygel-gst-renderer-player.vala b/src/plugins/gst-renderer/rygel-gst-renderer-player.vala
index fcc1d6e..119f1f5 100644
--- a/src/plugins/gst-renderer/rygel-gst-renderer-player.vala
+++ b/src/plugins/gst-renderer/rygel-gst-renderer-player.vala
@@ -23,7 +23,7 @@
using Gst;
-public class Rygel.GstRenderer.Player : GLib.Object, Rygel.Player {
+public class Rygel.GstRenderer.Player : GLib.Object, Rygel.MediaPlayer {
private const string[] protocols = { "http-get", "rtsp" };
private const string[] mime_types = {
"audio/mpeg",
diff --git a/src/plugins/gst-renderer/rygel-gst-renderer-plugin.vala b/src/plugins/gst-renderer/rygel-gst-renderer-plugin.vala
index 9417b41..981976a 100644
--- a/src/plugins/gst-renderer/rygel-gst-renderer-plugin.vala
+++ b/src/plugins/gst-renderer/rygel-gst-renderer-plugin.vala
@@ -36,7 +36,7 @@ public class Rygel.GstRenderer.Plugin : Rygel.MediaRendererPlugin {
base ("GstRenderer", _("GStreamer Renderer"));
}
- public override Rygel.Player? get_player () {
+ public override MediaPlayer? get_player () {
return GstRenderer.Player.get_default ();
}
}
diff --git a/src/rygel/Makefile.am b/src/rygel/Makefile.am
index f6c6905..0acf3c8 100644
--- a/src/rygel/Makefile.am
+++ b/src/rygel/Makefile.am
@@ -111,7 +111,7 @@ VAPI_SOURCE_FILES = rygel-configuration.vala \
rygel-gst-utils.vala \
rygel-media-receiver-registrar.vala \
rygel-log-handler.vala \
- rygel-player.vala \
+ rygel-media-player.vala \
rygel-changelog.vala \
rygel-volume.vala
diff --git a/src/rygel/rygel-av-transport.vala b/src/rygel/rygel-av-transport.vala
index 5085fd3..b73a0a2 100644
--- a/src/rygel/rygel-av-transport.vala
+++ b/src/rygel/rygel-av-transport.vala
@@ -132,7 +132,7 @@ public class Rygel.AVTransport : Service {
}
private ChangeLog changelog;
- private Player player;
+ private MediaPlayer player;
public override void constructed () {
this.changelog = new ChangeLog (this, LAST_CHANGE_NS);
@@ -160,7 +160,7 @@ public class Rygel.AVTransport : Service {
this.player.notify["duration"].connect (this.notify_duration_cb);
}
- private Player get_player () {
+ private MediaPlayer get_player () {
var plugin = this.root_device.resource_factory as MediaRendererPlugin;
return plugin.get_player ();
diff --git a/src/rygel/rygel-player.vala b/src/rygel/rygel-media-player.vala
similarity index 93%
rename from src/rygel/rygel-player.vala
rename to src/rygel/rygel-media-player.vala
index 56afa33..a378854 100644
--- a/src/rygel/rygel-player.vala
+++ b/src/rygel/rygel-media-player.vala
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2008 OpenedHand Ltd.
- * Copyright (C) 2009 Nokia Corporation.
+ * Copyright (C) 2009,2010 Nokia Corporation.
*
* Author: Jorn Baayen <jorn openedhand com>
* Zeeshan Ali (Khattak) <zeeshanak gnome org>
@@ -21,7 +21,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-public interface Rygel.Player : GLib.Object {
+public interface Rygel.MediaPlayer : GLib.Object {
public abstract string playback_state { get; set; }
public abstract string uri { get; set; }
public abstract double volume { get; set; }
diff --git a/src/rygel/rygel-media-renderer-plugin.vala b/src/rygel/rygel-media-renderer-plugin.vala
index 82b535a..0918000 100644
--- a/src/rygel/rygel-media-renderer-plugin.vala
+++ b/src/rygel/rygel-media-renderer-plugin.vala
@@ -50,7 +50,7 @@ public class Rygel.MediaRendererPlugin : Rygel.Plugin {
this.add_resource (resource);
}
- public virtual Player? get_player () {
+ public virtual MediaPlayer? get_player () {
return null;
}
}
diff --git a/src/rygel/rygel-sink-connection-manager.vala b/src/rygel/rygel-sink-connection-manager.vala
index 239d273..6800cb0 100644
--- a/src/rygel/rygel-sink-connection-manager.vala
+++ b/src/rygel/rygel-sink-connection-manager.vala
@@ -24,7 +24,7 @@
using GUPnP;
public class Rygel.SinkConnectionManager : Rygel.ConnectionManager {
- private Player player;
+ private MediaPlayer player;
public override void constructed () {
base.constructed ();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]