[rygel] core: Rename Seek to HTTPSeek
- From: Zeeshan Ali Khattak <zeeshanak src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [rygel] core: Rename Seek to HTTPSeek
- Date: Tue, 1 Sep 2009 22:39:43 +0000 (UTC)
commit 18a669f142a3044b37455a0a56605c97dc22597d
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date: Tue Sep 1 16:41:53 2009 +0300
core: Rename Seek to HTTPSeek
src/rygel/Makefile.am | 2 +-
src/rygel/rygel-http-request.vala | 8 ++++----
.../{rygel-seek.vala => rygel-http-seek.vala} | 18 +++++++++---------
src/rygel/rygel-live-response.vala | 4 ++--
src/rygel/rygel-seekable-response.vala | 4 ++--
5 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/src/rygel/Makefile.am b/src/rygel/Makefile.am
index c107fd2..e9e289e 100644
--- a/src/rygel/Makefile.am
+++ b/src/rygel/Makefile.am
@@ -54,7 +54,7 @@ VAPI_SOURCE_FILES = rygel-configuration.vala \
rygel-http-request-handler.vala \
rygel-http-identity-handler.vala \
rygel-http-transcode-handler.vala \
- rygel-seek.vala \
+ rygel-http-seek.vala \
rygel-http-response.vala \
rygel-live-response.vala \
rygel-seekable-response.vala \
diff --git a/src/rygel/rygel-http-request.vala b/src/rygel/rygel-http-request.vala
index 61fb48d..93a9156 100644
--- a/src/rygel/rygel-http-request.vala
+++ b/src/rygel/rygel-http-request.vala
@@ -48,8 +48,8 @@ internal class Rygel.HTTPRequest : GLib.Object, Rygel.StateMachine {
private string item_id;
public MediaItem item;
- public Seek byte_range;
- public Seek time_range;
+ public HTTPSeek byte_range;
+ public HTTPSeek time_range;
private HTTPRequestHandler request_handler;
@@ -108,8 +108,8 @@ internal class Rygel.HTTPRequest : GLib.Object, Rygel.StateMachine {
private void handle_item_request () {
try {
- this.byte_range = Seek.from_byte_range(this.msg);
- this.time_range = Seek.from_time_range(this.msg);
+ this.byte_range = HTTPSeek.from_byte_range(this.msg);
+ this.time_range = HTTPSeek.from_time_range(this.msg);
// Add headers
this.request_handler.add_response_headers (this);
diff --git a/src/rygel/rygel-seek.vala b/src/rygel/rygel-http-seek.vala
similarity index 92%
rename from src/rygel/rygel-seek.vala
rename to src/rygel/rygel-http-seek.vala
index 59037e8..c992c4c 100644
--- a/src/rygel/rygel-seek.vala
+++ b/src/rygel/rygel-http-seek.vala
@@ -23,7 +23,7 @@
using Gst;
-internal class Rygel.Seek : GLib.Object {
+internal class Rygel.HTTPSeek : GLib.Object {
public Format format { get; private set; }
public int64 start { get; private set; }
@@ -35,16 +35,16 @@ internal class Rygel.Seek : GLib.Object {
}
}
- public Seek (Format format,
- int64 start,
- int64 stop) {
+ public HTTPSeek (Format format,
+ int64 start,
+ int64 stop) {
this.format = format;
this.start = start;
this.stop = stop;
}
- public static Seek? from_byte_range (Soup.Message msg)
- throws HTTPRequestError {
+ public static HTTPSeek? from_byte_range (Soup.Message msg)
+ throws HTTPRequestError {
string range, pos;
string[] range_tokens;
int64 start = 0, stop = -1;
@@ -88,10 +88,10 @@ internal class Rygel.Seek : GLib.Object {
range);
}
- return new Seek (Format.BYTES, start, stop);
+ return new HTTPSeek (Format.BYTES, start, stop);
}
- public static Seek? from_time_range (Soup.Message msg)
+ public static HTTPSeek? from_time_range (Soup.Message msg)
throws HTTPRequestError {
string range, time;
string[] range_tokens;
@@ -135,7 +135,7 @@ internal class Rygel.Seek : GLib.Object {
range);
}
- return new Seek (Format.TIME, start, stop);
+ return new HTTPSeek (Format.TIME, start, stop);
}
public void add_response_header (Soup.Message msg, int64 length=-1) {
diff --git a/src/rygel/rygel-live-response.vala b/src/rygel/rygel-live-response.vala
index 8cb1566..a8d3b6e 100644
--- a/src/rygel/rygel-live-response.vala
+++ b/src/rygel/rygel-live-response.vala
@@ -39,13 +39,13 @@ internal class Rygel.LiveResponse : Rygel.HTTPResponse {
private AsyncQueue<Buffer> buffers;
- private Seek time_range;
+ private HTTPSeek time_range;
public LiveResponse (Soup.Server server,
Soup.Message msg,
string name,
Element src,
- Seek? time_range) throws Error {
+ HTTPSeek? time_range) throws Error {
base (server, msg, false);
this.msg.response_headers.set_encoding (Soup.Encoding.EOF);
diff --git a/src/rygel/rygel-seekable-response.vala b/src/rygel/rygel-seekable-response.vala
index 133e462..8d31ba2 100644
--- a/src/rygel/rygel-seekable-response.vala
+++ b/src/rygel/rygel-seekable-response.vala
@@ -28,7 +28,7 @@ using GUPnP;
internal class Rygel.SeekableResponse : Rygel.HTTPResponse {
private const size_t BUFFER_LENGTH = 4096;
- private Seek seek;
+ private HTTPSeek seek;
private File file;
private FileInputStream input_stream;
@@ -40,7 +40,7 @@ internal class Rygel.SeekableResponse : Rygel.HTTPResponse {
public SeekableResponse (Soup.Server server,
Soup.Message msg,
string uri,
- Seek? seek,
+ HTTPSeek? seek,
size_t file_length) {
base (server, msg, seek != null);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]