[rygel-gst-0-10-media-engine] cleanup



commit 2e1c26a06e0b9ae60d69e15a07f8b89626c9761f
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Dec 21 11:34:26 2012 +0100

    cleanup

 src/rygel-gst-data-source.c  |    7 ++-----
 src/rygel-gst-media-engine.c |   16 ++++++++--------
 src/rygel-gst-transcoder.c   |    4 ++--
 src/rygel-wmv-transcoder.c   |    2 +-
 4 files changed, 13 insertions(+), 16 deletions(-)
---
diff --git a/src/rygel-gst-data-source.c b/src/rygel-gst-data-source.c
index eebc81e..c4dd320 100644
--- a/src/rygel-gst-data-source.c
+++ b/src/rygel-gst-data-source.c
@@ -131,11 +131,8 @@ rygel_gst_data_source_real_freeze (RygelDataSource *base) {
 
 static void
 rygel_gst_data_source_real_thaw (RygelDataSource *base) {
-  RygelGstDataSource *self;
-  RygelGstSink* _tmp0_;
-  self = (RygelGstDataSource*) base;
-  _tmp0_ = self->priv->sink;
-  rygel_gst_sink_thaw (_tmp0_);
+  RygelGstDataSource *self = RYGEL_GST_DATA_SOURCE (base);
+  rygel_gst_sink_thaw (self->priv->sink);
 }
 
 static gboolean
diff --git a/src/rygel-gst-media-engine.c b/src/rygel-gst-media-engine.c
index 2a93622..fa0471e 100644
--- a/src/rygel-gst-media-engine.c
+++ b/src/rygel-gst-media-engine.c
@@ -57,7 +57,7 @@ rygel_gst_media_engine_construct (GType object_type) {
 
   GList *profile_it = NULL;
   for (profile_it = profile_collection; profile_it != NULL; profile_it = profile_it->next) {
-    GUPnPDLNAProfile *profile = (GUPnPDLNAProfile*) profile_it->data;
+    GUPnPDLNAProfile *profile = GUPNP_DLNA_PROFILE (profile_it->data);
     const gchar *name = gupnp_dlna_profile_get_name (profile);
     const gchar *mime = gupnp_dlna_profile_get_mime (profile);
 
@@ -97,24 +97,24 @@ rygel_gst_media_engine_construct (GType object_type) {
     transcoder_name = (gchar*) gee_abstract_list_get ((GeeAbstractList*)transcoder_list, transcoder_index);
     if (g_strcmp0 (transcoder_name, "lpcm")) {
       RygelL16Transcoder *transcoder = rygel_l16_transcoder_new ();
-      self->priv->transcoders = g_list_prepend (self->priv->transcoders, (RygelTranscoder*) transcoder);
+      self->priv->transcoders = g_list_prepend (self->priv->transcoders, RYGEL_TRANSCODER (transcoder));
     } else if (g_strcmp0 (transcoder_name, "mp3")) {
       RygelMP3Transcoder *transcoder = rygel_mp3_transcoder_new ();
-      self->priv->transcoders = g_list_prepend (self->priv->transcoders, (RygelTranscoder*) transcoder);
+      self->priv->transcoders = g_list_prepend (self->priv->transcoders, RYGEL_TRANSCODER (transcoder));
     } else if (g_strcmp0 (transcoder_name, "mp2ts")) {
       RygelMP2TSTranscoder *transcoder = rygel_mp2_ts_transcoder_new (RYGEL_MP2_TS_PROFILE_SD);
-      self->priv->transcoders = g_list_prepend (self->priv->transcoders, (RygelTranscoder*) transcoder);
+      self->priv->transcoders = g_list_prepend (self->priv->transcoders, RYGEL_TRANSCODER (transcoder));
       transcoder = rygel_mp2_ts_transcoder_new (RYGEL_MP2_TS_PROFILE_HD);
-      self->priv->transcoders = g_list_prepend (self->priv->transcoders, (RygelTranscoder*) transcoder);
+      self->priv->transcoders = g_list_prepend (self->priv->transcoders, RYGEL_TRANSCODER (transcoder));
     } else if (g_strcmp0 (transcoder_name, "wmv")) {
       RygelWMVTranscoder *transcoder = rygel_wmv_transcoder_new ();
-      self->priv->transcoders = g_list_prepend (self->priv->transcoders, (RygelTranscoder*) transcoder);
+      self->priv->transcoders = g_list_prepend (self->priv->transcoders, RYGEL_TRANSCODER (transcoder));
     } else if (g_strcmp0 (transcoder_name, "aac")) {
       RygelAACTranscoder *transcoder = rygel_aac_transcoder_new ();
-      self->priv->transcoders = g_list_prepend (self->priv->transcoders, (RygelTranscoder*) transcoder);
+      self->priv->transcoders = g_list_prepend (self->priv->transcoders, RYGEL_TRANSCODER (transcoder));
     } else if (g_strcmp0 (transcoder_name, "avc")) {
       RygelAVCTranscoder *transcoder = rygel_avc_transcoder_new ();
-      self->priv->transcoders = g_list_prepend (self->priv->transcoders, (RygelTranscoder*) transcoder);
+      self->priv->transcoders = g_list_prepend (self->priv->transcoders, RYGEL_TRANSCODER (transcoder));
     } else {
       g_debug ("Unsupported transcoder: \"%s\"", transcoder_name);
     }
diff --git a/src/rygel-gst-transcoder.c b/src/rygel-gst-transcoder.c
index 489a05d..ea26599 100644
--- a/src/rygel-gst-transcoder.c
+++ b/src/rygel-gst-transcoder.c
@@ -173,7 +173,7 @@ rygel_gst_transcoder_create_source (RygelTranscoder *base, RygelMediaItem *item,
   g_debug ("%s using the following encoding profile:", G_OBJECT_TYPE_NAME (self));
   rygel_gst_utils_dump_encoding_profile (encoding_profile, 2);
 
-  bin = (GstBin*) gst_bin_new ("transcoder-source");
+  bin = GST_BIN (gst_bin_new ("transcoder-source"));
   gst_object_ref_sink (bin);
   
   GstElement *element = rygel_gst_data_source_get_source (data_source);
@@ -186,7 +186,7 @@ rygel_gst_transcoder_create_source (RygelTranscoder *base, RygelMediaItem *item,
   g_signal_connect_object (self->priv->decoder, "no-more-pads", (GCallback) on_decoder_no_more_pads, self, 0);
   
   GstPad *pad = gst_element_get_static_pad (self->priv->encoder, "src");
-  GstGhostPad *ghost_pad = (GstGhostPad*) gst_ghost_pad_new (NULL, pad);
+  GstGhostPad *ghost_pad = GST_GHOST_PAD (gst_ghost_pad_new (NULL, pad));
   gst_object_ref_sink (ghost_pad);
   gst_element_add_pad (GST_ELEMENT (bin), GST_PAD (ghost_pad));
 
diff --git a/src/rygel-wmv-transcoder.c b/src/rygel-wmv-transcoder.c
index 62a28cf..037e25b 100644
--- a/src/rygel-wmv-transcoder.c
+++ b/src/rygel-wmv-transcoder.c
@@ -30,7 +30,7 @@ G_DEFINE_TYPE (RygelWMVTranscoder, rygel_wmv_transcoder, RYGEL_TYPE_VIDEO_TRANSC
 
 RygelWMVTranscoder* rygel_wmv_transcoder_construct (GType object_type) {
   RygelWMVTranscoder *self = NULL;
-  self = (RygelWMVTranscoder*) rygel_video_transcoder_construct (object_type, "video/x-ms-wmv", "WMVHIGH_FULL", RYGEL_WMV_TRANSCODER_AUDIO_BITRATE, RYGEL_WMV_TRANSCODER_VIDEO_BITRATE, "video/x-ms-asf,parsed=true", "audio/x-wma,channels=2,wmaversion=1", "video/x-wmv,wmvversion=1", "wmv", NULL);
+  self = RYGEL_WMV_TRANSCODER (rygel_video_transcoder_construct (object_type, "video/x-ms-wmv", "WMVHIGH_FULL", RYGEL_WMV_TRANSCODER_AUDIO_BITRATE, RYGEL_WMV_TRANSCODER_VIDEO_BITRATE, "video/x-ms-asf,parsed=true", "audio/x-wma,channels=2,wmaversion=1", "video/x-wmv,wmvversion=1", "wmv", NULL));
   return self;
 }
 



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