[rygel] Fix ASX class for style



commit b1eb780fa2086c3ce027aca55c3aedbd20304677
Author: Jens Georg <mail jensge org>
Date:   Sun May 3 01:19:52 2009 +0200

    Fix ASX class for style
---
 src/plugins/mediathek/Makefile.am                  |    6 +++---
 ...-asx.vala => rygel-mediathek-asx-playlist.vala} |   12 ++++++------
 src/plugins/mediathek/rygel-mediathek-item.vala    |    4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/plugins/mediathek/Makefile.am b/src/plugins/mediathek/Makefile.am
index b3d37c0..814ec9c 100644
--- a/src/plugins/mediathek/Makefile.am
+++ b/src/plugins/mediathek/Makefile.am
@@ -13,15 +13,15 @@ AM_CFLAGS = \
 	-DDATA_DIR='"$(datadir)"'
 
 BUILT_SOURCES = rygel-media-mediathek.stamp \
-				rygel-mediathek-asx.c \
+				rygel-mediathek-asx-playlist.c \
 				rygel-mediathek-plugin.c \
 				rygel-mediathek-item.c \
 				rygel-mediathek-container-root.c \
 				rygel-mediathek-container-rss.c
 
 librygel_media_mediathek_la_SOURCES = \
-	rygel-mediathek-asx.c \
-	rygel-mediathek-asx.vala \
+	rygel-mediathek-asx-playlist.c \
+	rygel-mediathek-asx-playlist.vala \
 	rygel-mediathek-plugin.c \
 	rygel-mediathek-plugin.vala \
 	rygel-mediathek-item.c \
diff --git a/src/plugins/mediathek/rygel-mediathek-asx.vala b/src/plugins/mediathek/rygel-mediathek-asx-playlist.vala
similarity index 87%
rename from src/plugins/mediathek/rygel-mediathek-asx.vala
rename to src/plugins/mediathek/rygel-mediathek-asx-playlist.vala
index 14203f9..08c7510 100644
--- a/src/plugins/mediathek/rygel-mediathek-asx.vala
+++ b/src/plugins/mediathek/rygel-mediathek-asx-playlist.vala
@@ -23,7 +23,7 @@ using Gee;
 using Soup;
 using Xml;
 
-public errordomain ZdfMediathek.AsxPlaylistError {
+public errordomain Rygel.MediathekAsxPlaylistError {
     XML_ERROR,
     NETWORK_ERROR
 }
@@ -37,11 +37,11 @@ public errordomain ZdfMediathek.AsxPlaylistError {
  * This parser is //only// intended to work with the simple 
  * ASX files presented by the ZDF Mediathek streaming server
  */
-public class ZdfMediathek.AsxPlaylist : Object {
+public class Rygel.MediathekAsxPlaylist : Object {
     public ArrayList<string> uris;
     private string uri;
 
-    public AsxPlaylist(string uri) {
+    public MediathekAsxPlaylist(string uri) {
         this.uris = new ArrayList<string>();
         this.uri = uri;
     }
@@ -56,7 +56,7 @@ public class ZdfMediathek.AsxPlaylist : Object {
      * to extract all of the href attributes for every entry
      * in the file
      */
-    public void parse() throws AsxPlaylistError {
+    public void parse() throws MediathekAsxPlaylistError {
         // FIXME make async using global soup session
         var session = new Soup.SessionSync();
         var message = new Soup.Message("GET",
@@ -82,13 +82,13 @@ public class ZdfMediathek.AsxPlaylist : Object {
                     }
                 }
                 else {
-                    throw new AsxPlaylistError.XML_ERROR("Could not received XML");
+                    throw new MediathekAsxPlaylistError.XML_ERROR("Could not received XML");
                 }
             }
             catch (RegexError error) { }
         }
         else {
-            throw new AsxPlaylistError.NETWORK_ERROR("Could not download playlist, error code was %u (%s)".printf(message.status_code, 
+            throw new MediathekAsxPlaylistError.NETWORK_ERROR("Could not download playlist, error code was %u (%s)".printf(message.status_code, 
                 Soup.status_get_phrase(message.status_code)));
         }
     }
diff --git a/src/plugins/mediathek/rygel-mediathek-item.vala b/src/plugins/mediathek/rygel-mediathek-item.vala
index 51cb831..eef7801 100644
--- a/src/plugins/mediathek/rygel-mediathek-item.vala
+++ b/src/plugins/mediathek/rygel-mediathek-item.vala
@@ -40,7 +40,7 @@ public class ZdfMediathek.VideoItem : Rygel.MediaItem {
     public static VideoItem create_from_xml(MediaContainer parent, Xml.Node *item) throws VideoItemError {
         string title = null;
         VideoItem video_item = null;
-        AsxPlaylist asx = null;
+        MediathekAsxPlaylist asx = null;
 
         for (Xml.Node* item_child = item->children; item_child != null; item_child = item_child->next)
         {
@@ -60,7 +60,7 @@ public class ZdfMediathek.VideoItem : Rygel.MediaItem {
                                         var url = attr->children->content;
                                         if (url.has_suffix(".asx")) {
                                             debug("Found Url %s", url);
-                                            asx = new AsxPlaylist(url);
+                                            asx = new MediathekAsxPlaylist(url);
                                             asx.parse();
                                         }
                                     }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]