From 4c113cda836e58e48613a0d75ab4250e4d653115 Mon Sep 17 00:00:00 2001 From: "Zeeshan Ali (Khattak)" Date: Mon, 19 Jan 2009 15:56:06 +0000 Subject: [PATCH] Rename StreamingResponse to LiveResponse. svn path=/trunk/; revision=459 --- src/plugins/test/rygel-test-audio-item.vala | 2 +- src/plugins/test/rygel-test-video-item.vala | 2 +- src/rygel/Makefile.am | 10 +++++----- src/rygel/rygel-http-server.vala | 10 +++++----- ...aming-response.vala => rygel-live-response.vala} | 21 ++++++++++----------- 5 files changed, 22 insertions(+), 23 deletions(-) rename src/rygel/{rygel-streaming-response.vala => rygel-live-response.vala} (92%) diff --git a/src/plugins/test/rygel-test-audio-item.vala b/src/plugins/test/rygel-test-audio-item.vala index b6ca2bc..06b2595 100644 --- a/src/plugins/test/rygel-test-audio-item.vala +++ b/src/plugins/test/rygel-test-audio-item.vala @@ -54,7 +54,7 @@ public class Rygel.TestAudioItem : Rygel.TestItem { Element encoder = ElementFactory.make ("wavenc", null); if (src == null || encoder == null) { - throw new StreamingResponseError.MISSING_PLUGIN ( + throw new LiveResponseError.MISSING_PLUGIN ( "Required plugin missing"); } diff --git a/src/plugins/test/rygel-test-video-item.vala b/src/plugins/test/rygel-test-video-item.vala index e0522a9..1c8d98c 100644 --- a/src/plugins/test/rygel-test-video-item.vala +++ b/src/plugins/test/rygel-test-video-item.vala @@ -55,7 +55,7 @@ public class Rygel.TestVideoItem : Rygel.TestItem { Element muxer = ElementFactory.make ("mpegtsmux", null); if (src == null || muxer == null || encoder == null) { - throw new StreamingResponseError.MISSING_PLUGIN ( + throw new LiveResponseError.MISSING_PLUGIN ( "Required plugin missing"); } diff --git a/src/rygel/Makefile.am b/src/rygel/Makefile.am index 85562f0..48f7636 100644 --- a/src/rygel/Makefile.am +++ b/src/rygel/Makefile.am @@ -39,8 +39,8 @@ BUILT_SOURCES = rygel-1.0.vapi \ rygel-http-server.h \ rygel-http-response.c \ rygel-http-response.h \ - rygel-streaming-response.c \ - rygel-streaming-response.h \ + rygel-live-response.c \ + rygel-live-response.h \ rygel-seekable-response.c \ rygel-seekable-response.h \ rygel-resource-info.h \ @@ -81,8 +81,8 @@ rygel_SOURCES = rygel-1.0.vapi \ rygel-http-server.h \ rygel-http-response.c \ rygel-http-response.h \ - rygel-streaming-response.c \ - rygel-streaming-response.h \ + rygel-live-response.c \ + rygel-live-response.h \ rygel-seekable-response.c \ rygel-seekable-response.h \ rygel-resource-info.h \ @@ -121,7 +121,7 @@ rygel-1.0.vapi: rygel-content-directory.vala \ rygel-media-receiver-registrar.vala \ rygel-http-server.vala \ rygel-http-response.vala \ - rygel-streaming-response.vala \ + rygel-live-response.vala \ rygel-seekable-response.vala \ rygel-resource-info.vala \ rygel-icon-info.vala \ diff --git a/src/rygel/rygel-http-server.vala b/src/rygel/rygel-http-server.vala index 250f7bc..4765649 100644 --- a/src/rygel/rygel-http-server.vala +++ b/src/rygel/rygel-http-server.vala @@ -49,7 +49,7 @@ public class Rygel.HTTPServer : GLib.Object { public HTTPServer (GUPnP.Context context, string name) { this.context = context; - this.responses = new ArrayList (); + this.responses = new ArrayList (); this.path_root = SERVER_PATH_PREFIX + "/" + name; @@ -76,10 +76,10 @@ public class Rygel.HTTPServer : GLib.Object { private void stream_from_gst_source (Element# src, Soup.Message msg) throws Error { - var response = new StreamingResponse (this.context.server, - msg, - "RygelStreamingResponse", - src); + var response = new LiveResponse (this.context.server, + msg, + "RygelLiveResponse", + src); response.start (); response.ended += on_response_ended; diff --git a/src/rygel/rygel-streaming-response.vala b/src/rygel/rygel-live-response.vala similarity index 92% rename from src/rygel/rygel-streaming-response.vala rename to src/rygel/rygel-live-response.vala index 96d40be..66c5e2f 100644 --- a/src/rygel/rygel-streaming-response.vala +++ b/src/rygel/rygel-live-response.vala @@ -29,22 +29,22 @@ using GUPnP; using Gee; using Gst; -public errordomain Rygel.StreamingResponseError { +public errordomain Rygel.LiveResponseError { MISSING_PLUGIN, LINK } -public class Rygel.StreamingResponse : Rygel.HTTPResponse { +public class Rygel.LiveResponse : Rygel.HTTPResponse { private const string SINK_NAME = "fakesink"; private Pipeline pipeline; private AsyncQueue buffers; - public StreamingResponse (Soup.Server server, - Soup.Message msg, - string name, - Element src) throws Error { + public LiveResponse (Soup.Server server, + Soup.Message msg, + string name, + Element src) throws Error { base (server, msg, false); this.msg.response_headers.set_encoding (Soup.Encoding.CHUNKED); @@ -80,7 +80,7 @@ public class Rygel.StreamingResponse : Rygel.HTTPResponse { dynamic Element sink = ElementFactory.make ("fakesink", SINK_NAME); if (sink == null) { - throw new StreamingResponseError.MISSING_PLUGIN ( + throw new LiveResponseError.MISSING_PLUGIN ( "Required plugin 'fakesink' missing"); } @@ -98,10 +98,9 @@ public class Rygel.StreamingResponse : Rygel.HTTPResponse { } else { // static pads? easy! if (!src.link (sink)) { - throw new StreamingResponseError.LINK ( - "Failed to link %s to %s", - src.name, - sink.name); + throw new LiveResponseError.LINK ("Failed to link %s to %s", + src.name, + sink.name); } } -- 2.7.4