Make MediaItem adhere style guide

diff --git a/src/plugins/folder/Makefile.am b/src/plugins/folder/Makefile.am
index e3493e3..e81d42d 100644 (file)
--- a/src/plugins/folder/Makefile.am
+++ b/src/plugins/folder/Makefile.am
@@ -14,7 +14,7 @@ BUILT_SOURCES = rygel-media-folder.stamp \
        rygel-folder-rootcontainer.c \
        rygel-folder-container.c \
        rygel-folder-directory-search-result.c \
-       rygel-folder-media-item.c \
+       rygel-folder-gio-media-item.c \
        rygel-folder-plugin.c
 
 librygel_media_folder_la_SOURCES = \
@@ -26,8 +26,8 @@ librygel_media_folder_la_SOURCES = \
        rygel-folder-container.vala \
        rygel-folder-directory-search-result.c \
        rygel-folder-directory-search-result.vala \
-       rygel-folder-media-item.c \
-       rygel-folder-media-item.vala
+       rygel-folder-gio-media-item.c \
+       rygel-folder-gio-media-item.vala
 
 rygel-media-folder.stamp: $(filter %.vala,$(librygel_media_folder_la_SOURCES))
        $(VALAC) -g -C --vapidir=$(top_srcdir)/src/rygel \

diff --git a/src/plugins/folder/rygel-folder-directory-search-result.vala b/src/plugins/folder/rygel-folder-directory-search-result.vala
index 30f29ab..bf4a818 100644 (file)
--- a/src/plugins/folder/rygel-folder-directory-search-result.vala
+++ b/src/plugins/folder/rygel-folder-directory-search-result.vala
@@ -77,7 +77,7 @@ public class Rygel.FolderDirectorySearchResult : Rygel.SimpleAsyncResult<Gee.Lis
                         }
                         else {
                             var upnp_class = get_upnp_class_from_content_type(file_info.get_content_type());
-                            item = new Folder.FilesystemMediaItem((MediaContainer)source_object, f, upnp_class, file_info);
+                            item = new Rygel.FolderGioMediaItem((MediaContainer)source_object, f, upnp_class, file_info);
                         }
                         if (item != null)
                             data.add(item);

diff --git a/src/plugins/folder/rygel-folder-media-item.vala b/src/plugins/folder/rygel-folder-gio-media-item.vala
similarity index 94%
rename from src/plugins/folder/rygel-folder-media-item.vala
rename to src/plugins/folder/rygel-folder-gio-media-item.vala
index 3310e9d..956d8f2 100644 (file)
--- a/src/plugins/folder/rygel-folder-media-item.vala
+++ b/src/plugins/folder/rygel-folder-gio-media-item.vala
@@ -25,11 +25,11 @@ using Gst;
 /**
  * Very simple media item. 
  */
-public class Folder.FilesystemMediaItem : Rygel.MediaItem {
+public class Rygel.FolderGioMediaItem : Rygel.MediaItem {
     private bool need_source;
     private string raw_uri;
 
-    public FilesystemMediaItem(MediaContainer parent, 
+    public FolderGioMediaItem(MediaContainer parent, 
                                File file, 
                                string item_class,
                                FileInfo file_info) {