[rygel] core,test,i18n: Rename LiveResponse to HTTPGstResponse
- From: Zeeshan Ali Khattak <zeeshanak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rygel] core,test,i18n: Rename LiveResponse to HTTPGstResponse
- Date: Fri, 14 Jan 2011 23:55:52 +0000 (UTC)
commit 062e75f0eb4f1d79abeded7a1e2aeeb349a4e7e0
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date: Fri Jan 14 23:07:00 2011 +0200
core,test,i18n: Rename LiveResponse to HTTPGstResponse
po/POTFILES.in | 2 +-
po/POTFILES.skip | 4 +-
src/rygel/Makefile.am | 2 +-
...-response.vala => rygel-http-gst-response.vala} | 16 +++++++-------
src/rygel/rygel-http-identity-handler.vala | 12 +++++-----
src/rygel/rygel-http-transcode-handler.vala | 12 +++++-----
tests/Makefile.am | 6 ++--
...test.vala => rygel-http-gst-response-test.vala} | 22 ++++++++++----------
.../rygel-http-gst-response.vala | 4 +-
tests/rygel-live-response.vala | 1 -
10 files changed, 40 insertions(+), 41 deletions(-)
---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 96badf2..a169d54 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -100,7 +100,7 @@ src/rygel/rygel-item-creator.vala
src/rygel/rygel-item-destroyer.vala
src/rygel/rygel-l16-transcoder-bin.vala
src/rygel/rygel-l16-transcoder.vala
-src/rygel/rygel-live-response.vala
+src/rygel/rygel-http-gst-response.vala
src/rygel/rygel-log-handler.vala
src/rygel/rygel-logical-expression.vala
src/rygel/rygel-main.vala
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 709ba2d..2fba594 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -59,7 +59,7 @@ src/rygel/rygel-import-resource.c
src/rygel/rygel-item-creator.c
src/rygel/rygel-item-destroyer.c
src/rygel/rygel-l16-transcoder-bin.c
-src/rygel/rygel-live-response.c
+src/rygel/rygel-http-gst-response.c
src/rygel/rygel-log-handler.c
src/rygel/rygel-main.c
src/rygel/rygel-media-container.c
@@ -101,7 +101,7 @@ tests/rygel-gst-utils.c
tests/rygel-http-byte-seek.c
tests/rygel-http-item-uri.c
tests/rygel-http-time-seek.c
-tests/rygel-live-response.c
+tests/rygel-http-gst-response.c
tests/rygel-seekable-response.c
tests/rygel-http-byte-seek_http-get.c
tests/rygel-http-get.c
diff --git a/src/rygel/Makefile.am b/src/rygel/Makefile.am
index c779988..769419f 100644
--- a/src/rygel/Makefile.am
+++ b/src/rygel/Makefile.am
@@ -69,7 +69,7 @@ VAPI_SOURCE_FILES = rygel-configuration.vala \
rygel-http-byte-seek.vala \
rygel-http-time-seek.vala \
rygel-http-response.vala \
- rygel-live-response.vala \
+ rygel-http-gst-response.vala \
rygel-seekable-response.vala \
rygel-resource-info.vala \
rygel-icon-info.vala \
diff --git a/src/rygel/rygel-live-response.vala b/src/rygel/rygel-http-gst-response.vala
similarity index 95%
copy from src/rygel/rygel-live-response.vala
copy to src/rygel/rygel-http-gst-response.vala
index 51481d9..f15660e 100644
--- a/src/rygel/rygel-live-response.vala
+++ b/src/rygel/rygel-http-gst-response.vala
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2008 Zeeshan Ali (Khattak) <zeeshanak gnome org>.
- * Copyright (C) 2008 Nokia Corporation.
+ * Copyright (C) 2008,2011 Nokia Corporation.
*
* Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
* <zeeshan ali nokia com>
@@ -25,7 +25,7 @@
using GUPnP;
using Gst;
-internal class Rygel.LiveResponse : Rygel.HTTPResponse {
+internal class Rygel.HTTPGstResponse : Rygel.HTTPResponse {
private const string SINK_NAME = "fakesink";
// High and low threshold for number of buffered chunks
private const uint MAX_BUFFERED_CHUNKS = 32;
@@ -38,12 +38,12 @@ internal class Rygel.LiveResponse : Rygel.HTTPResponse {
private int64 buffered;
private bool out_of_sync;
- public LiveResponse (Soup.Server server,
- Soup.Message msg,
- string name,
- Element src,
- HTTPSeek? time_range,
- Cancellable? cancellable) throws Error {
+ public HTTPGstResponse (Soup.Server server,
+ Soup.Message msg,
+ string name,
+ Element src,
+ HTTPSeek? time_range,
+ Cancellable? cancellable) throws Error {
base (server, msg, false, cancellable);
this.msg.response_headers.set_encoding (Soup.Encoding.EOF);
diff --git a/src/rygel/rygel-http-identity-handler.vala b/src/rygel/rygel-http-identity-handler.vala
index 1dc9c23..1ba10f8 100644
--- a/src/rygel/rygel-http-identity-handler.vala
+++ b/src/rygel/rygel-http-identity-handler.vala
@@ -97,12 +97,12 @@ internal class Rygel.HTTPIdentityHandler : Rygel.HTTPGetHandler {
throw new HTTPRequestError.NOT_FOUND (_("Not found"));
}
- return new LiveResponse (request.server,
- request.msg,
- "RygelLiveResponse",
- src,
- request.seek,
- this.cancellable);
+ return new HTTPGstResponse (request.server,
+ request.msg,
+ "RygelHTTPGstResponse",
+ src,
+ request.seek,
+ this.cancellable);
} else {
if (item.uris.size == 0) {
throw new HTTPRequestError.NOT_FOUND
diff --git a/src/rygel/rygel-http-transcode-handler.vala b/src/rygel/rygel-http-transcode-handler.vala
index 0e4e791..f85363f 100644
--- a/src/rygel/rygel-http-transcode-handler.vala
+++ b/src/rygel/rygel-http-transcode-handler.vala
@@ -59,12 +59,12 @@ internal class Rygel.HTTPTranscodeHandler : HTTPGetHandler {
try {
src = this.transcoder.create_source (item, src);
- return new LiveResponse (request.server,
- request.msg,
- "RygelLiveResponse",
- src,
- request.seek,
- this.cancellable);
+ return new HTTPGstResponse (request.server,
+ request.msg,
+ "RygelHTTPGstResponse",
+ src,
+ request.seek,
+ this.cancellable);
} catch (GLib.Error err) {
throw new HTTPRequestError.NOT_FOUND (err.message);
}
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 11136a1..152f0ea 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -26,7 +26,7 @@ AM_VALAFLAGS = --disable-warnings --thread \
--pkg gio-2.0 --pkg gee-1.0 -g
check_PROGRAMS = rygel-http-item-uri-test \
- rygel-live-response-test \
+ rygel-http-gst-response-test \
rygel-seekable-response-test \
rygel-http-byte-seek-test \
rygel-http-time-seek-test \
@@ -39,8 +39,8 @@ TESTS = $(check_PROGRAMS)
rygel_http_item_uri_test_SOURCES = rygel-http-item-uri-test.vala \
rygel-http-item-uri.vala
-rygel_live_response_test_SOURCES = rygel-live-response-test.vala \
- rygel-live-response.vala \
+rygel_http_gst_response_test_SOURCES = rygel-http-gst-response-test.vala \
+ rygel-http-gst-response.vala \
rygel-http-response_live-response.vala \
rygel-http-response-test_live-response.vala \
rygel-state-machine_live-response.vala \
diff --git a/tests/rygel-live-response-test.vala b/tests/rygel-http-gst-response-test.vala
similarity index 75%
rename from tests/rygel-live-response-test.vala
rename to tests/rygel-http-gst-response-test.vala
index 078cc55..0b3217c 100644
--- a/tests/rygel-live-response-test.vala
+++ b/tests/rygel-http-gst-response-test.vala
@@ -24,7 +24,7 @@
using Soup;
using Gst;
-public class Rygel.LiveResponseTest : Rygel.HTTPResponseTest {
+public class Rygel.HTTPGstResponseTest : Rygel.HTTPResponseTest {
private static const long BLOCK_SIZE = MAX_BYTES / 16;
private static const long MAX_BUFFERS = MAX_BYTES / BLOCK_SIZE;
@@ -34,10 +34,10 @@ public class Rygel.LiveResponseTest : Rygel.HTTPResponseTest {
Gst.init (ref args);
try {
- var test = new LiveResponseTest.complete ();
+ var test = new HTTPGstResponseTest.complete ();
test.run ();
- test = new LiveResponseTest.abort ();
+ test = new HTTPGstResponseTest.abort ();
test.run ();
} catch (TestError.SKIP error) {
return error.code;
@@ -54,24 +54,24 @@ public class Rygel.LiveResponseTest : Rygel.HTTPResponseTest {
this.src = GstUtils.create_element ("audiotestsrc", null);
}
- private LiveResponseTest.complete () throws Error {
+ private HTTPGstResponseTest.complete () throws Error {
base.complete ();
this.src.blocksize = BLOCK_SIZE;
this.src.num_buffers = MAX_BUFFERS;
}
- private LiveResponseTest.abort () throws Error {
+ private HTTPGstResponseTest.abort () throws Error {
base.abort ();
}
internal override HTTPResponse create_response (Soup.Message msg)
throws Error {
- return new LiveResponse (this.server.context.server,
- msg,
- "TestingLiveResponse",
- this.src,
- null,
- this.cancellable);
+ return new HTTPGstResponse (this.server.context.server,
+ msg,
+ "TestingHTTPGstResponse",
+ this.src,
+ null,
+ this.cancellable);
}
}
diff --git a/src/rygel/rygel-live-response.vala b/tests/rygel-http-gst-response.vala
similarity index 98%
rename from src/rygel/rygel-live-response.vala
rename to tests/rygel-http-gst-response.vala
index 51481d9..6581084 100644
--- a/src/rygel/rygel-live-response.vala
+++ b/tests/rygel-http-gst-response.vala
@@ -25,7 +25,7 @@
using GUPnP;
using Gst;
-internal class Rygel.LiveResponse : Rygel.HTTPResponse {
+internal class Rygel.HTTPGstResponse : Rygel.HTTPResponse {
private const string SINK_NAME = "fakesink";
// High and low threshold for number of buffered chunks
private const uint MAX_BUFFERED_CHUNKS = 32;
@@ -38,7 +38,7 @@ internal class Rygel.LiveResponse : Rygel.HTTPResponse {
private int64 buffered;
private bool out_of_sync;
- public LiveResponse (Soup.Server server,
+ public HTTPGstResponse (Soup.Server server,
Soup.Message msg,
string name,
Element src,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
