rygel r753 - trunk/src/rygel

[zeeshanak svn gnome org]

Author: zeeshanak
Date: Sat Mar 28 00:45:06 2009
New Revision: 753
URL: http://svn.gnome.org/viewvc/rygel?rev=753&view=rev

Log:
Remove unneeded args of Transcoder.create_resource().

Transcoder.create_resource() doesn't need to be passed 'mime_type' and
'dlna_profile' arguments anymore.

Modified:
   trunk/src/rygel/rygel-l16-transcoder.vala
   trunk/src/rygel/rygel-mp2ts-transcoder.vala
   trunk/src/rygel/rygel-mp3-transcoder.vala
   trunk/src/rygel/rygel-transcoder.vala

Modified: trunk/src/rygel/rygel-l16-transcoder.vala
==============================================================================
--- trunk/src/rygel/rygel-l16-transcoder.vala	(original)
+++ trunk/src/rygel/rygel-l16-transcoder.vala	Sat Mar 28 00:45:06 2009
@@ -55,22 +55,15 @@
             return;
         }
 
-        resources.add (this.create_resource (item,
-                                             this.mime_type,
-                                             this.dlna_profile,
-                                             manager));
+        resources.add (this.create_resource (item, manager));
     }
 
     public override DIDLLiteResource create_resource (
                                         MediaItem        item,
-                                        string           mime_type,
-                                        string           dlna_profile,
                                         TranscodeManager manager)
                                         throws Error {
-        var res = base.create_resource (item,
-                                        mime_type,
-                                        dlna_profile,
-                                        manager);
+        var res = base.create_resource (item, manager);
+
         res.sample_freq = L16Transcoder.FREQUENCY;
         res.n_audio_channels = L16Transcoder.CHANNELS;
         res.bits_per_sample = L16Transcoder.WIDTH;

Modified: trunk/src/rygel/rygel-mp2ts-transcoder.vala
==============================================================================
--- trunk/src/rygel/rygel-mp2ts-transcoder.vala	(original)
+++ trunk/src/rygel/rygel-mp2ts-transcoder.vala	Sat Mar 28 00:45:06 2009
@@ -58,22 +58,14 @@
             return;
         }
 
-        resources.add (this.create_resource (item,
-                                             this.mime_type,
-                                             PROFILES[this.profile],
-                                             manager));
+        resources.add (this.create_resource (item, manager));
     }
 
-    public override DIDLLiteResource create_resource (
-                                        MediaItem        item,
-                                        string           mime_type,
-                                        string           dlna_profile,
-                                        TranscodeManager manager)
-                                        throws Error {
-        var res = base.create_resource (item,
-                                        mime_type,
-                                        dlna_profile,
-                                        manager);
+    public override DIDLLiteResource create_resource (MediaItem        item,
+                                                      TranscodeManager manager)
+                                                      throws Error {
+        var res = base.create_resource (item, manager);
+
         res.width = WIDTH[profile];
         res.height = HEIGHT[profile];
 

Modified: trunk/src/rygel/rygel-mp3-transcoder.vala
==============================================================================
--- trunk/src/rygel/rygel-mp3-transcoder.vala	(original)
+++ trunk/src/rygel/rygel-mp3-transcoder.vala	Sat Mar 28 00:45:06 2009
@@ -59,10 +59,7 @@
             return;
         }
 
-        resources.add (this.create_resource (item,
-                                             this.mime_type,
-                                             this.dlna_profile,
-                                             manager));
+        resources.add (this.create_resource (item, manager));
     }
 }
 

Modified: trunk/src/rygel/rygel-transcoder.vala
==============================================================================
--- trunk/src/rygel/rygel-transcoder.vala	(original)
+++ trunk/src/rygel/rygel-transcoder.vala	Sat Mar 28 00:45:06 2009
@@ -42,20 +42,17 @@
                                         throws Error;
 
 
-    public virtual DIDLLiteResource create_resource (
-                                        MediaItem        item,
-                                        string           mime_type,
-                                        string           dlna_profile,
-                                        TranscodeManager manager)
-                                        throws Error {
+    public virtual DIDLLiteResource create_resource (MediaItem        item,
+                                                     TranscodeManager manager)
+                                                     throws Error {
         string protocol;
         var uri = manager.create_uri_for_item (item,
-                                               dlna_profile,
+                                               this.dlna_profile,
                                                out protocol);
         DIDLLiteResource res = item.create_res (uri);
-        res.mime_type = mime_type;
+        res.mime_type = this.mime_type;
         res.protocol = protocol;
-        res.dlna_profile = dlna_profile;
+        res.dlna_profile = this.dlna_profile;
         res.dlna_conversion = DLNAConversion.TRANSCODED;
         res.dlna_flags = DLNAFlags.STREAMING_TRANSFER_MODE;
         res.dlna_operation = DLNAOperation.NONE;