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

[Murray Cumming <murrayc src gnome org>]

commit 90b37ef265337f9444d65a3f3547bad220c44440
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Dec 21 11:22:12 2012 +0100

    cleanup

 src/rygel-video-transcoder.c |   56 ++++++++++-------------------------------
 src/rygel-wmv-transcoder.c   |   14 ++++------
 2 files changed, 20 insertions(+), 50 deletions(-)
---
diff --git a/src/rygel-video-transcoder.c b/src/rygel-video-transcoder.c
index 2c35309..4929507 100644
--- a/src/rygel-video-transcoder.c
+++ b/src/rygel-video-transcoder.c
@@ -36,61 +36,32 @@ struct _RygelVideoTranscoderPrivate {
 
 static void rygel_video_transcoder_finalize (GObject* obj);
 
-
 RygelVideoTranscoder*
 rygel_video_transcoder_construct (GType object_type, const gchar* content_type, gint audio_bitrate, gint video_bitrate, const gchar* container_caps, const gchar* audio_codec_caps, const gchar* video_codec_caps, const gchar* extension, const gchar* restrictions) {
   RygelVideoTranscoder * self = NULL;
-  const gchar* _tmp0_;
-  const gchar* _tmp1_;
-  gint _tmp2_;
-  const gchar* _tmp3_;
-  const gchar* _tmp4_;
-  const gchar* _tmp5_;
-  gint _tmp6_;
-  const gchar* _tmp7_;
-  GstCaps* _tmp8_ = NULL;
-  const gchar* _tmp9_;
+
   g_return_val_if_fail (content_type != NULL, NULL);
   g_return_val_if_fail (container_caps != NULL, NULL);
   g_return_val_if_fail (audio_codec_caps != NULL, NULL);
   g_return_val_if_fail (video_codec_caps != NULL, NULL);
   g_return_val_if_fail (extension != NULL, NULL);
-  _tmp0_ = content_type;
-  _tmp2_ = audio_bitrate;
-  _tmp3_ = container_caps;
-  _tmp4_ = audio_codec_caps;
-  _tmp5_ = extension;
-  self = (RygelVideoTranscoder*) rygel_audio_transcoder_construct_with_class (object_type, _tmp0_, RYGEL_VIDEO_ITEM_UPNP_CLASS, _tmp2_, _tmp3_, _tmp4_, _tmp5_);
-  _tmp6_ = video_bitrate;
-  self->priv->video_bitrate = _tmp6_;
-  _tmp7_ = video_codec_caps;
-  _tmp8_ = gst_caps_from_string (_tmp7_);
-  _gst_caps_unref0 (self->priv->video_codec_format);
-  self->priv->video_codec_format = _tmp8_;
-  _tmp9_ = restrictions;
-  if (_tmp9_ != NULL) {
-    const gchar* _tmp10_;
-    GstCaps* _tmp11_ = NULL;
-    _tmp10_ = restrictions;
-    _tmp11_ = gst_caps_from_string (_tmp10_);
-    _gst_caps_unref0 (self->priv->video_restrictions);
-    self->priv->video_restrictions = _tmp11_;
+
+  self = RYGEL_VIDEO_TRANSCODER (rygel_audio_transcoder_construct_with_class (object_type, content_type, RYGEL_VIDEO_ITEM_UPNP_CLASS, audio_bitrate, container_caps, audio_codec_caps));
+
+  self->priv->video_bitrate = video_bitrate;
+  self->priv->video_codec_format = gst_caps_from_string (video_codec_caps);
+  if (restrictions) {
+    self->priv->video_restrictions = gst_caps_from_string (restrictions);
   }
+
   return self;
 }
 
-
 RygelVideoTranscoder*
 rygel_video_transcoder_new (const gchar* content_type, gint audio_bitrate, gint video_bitrate, const gchar* container_caps, const gchar* audio_codec_caps, const gchar* video_codec_caps, const gchar* extension, const gchar* restrictions) {
   return rygel_video_transcoder_construct (RYGEL_TYPE_VIDEO_TRANSCODER, content_type, audio_bitrate, video_bitrate, container_caps, audio_codec_caps, video_codec_caps, extension, restrictions);
 }
 
-
-static gpointer _g_object_ref0 (gpointer self) {
-  return self ? g_object_ref (self) : NULL;
-}
-
-
 static GUPnPDIDLLiteResource* rygel_video_transcoder_real_add_resource (RygelTranscoder* base, GUPnPDIDLLiteItem* didl_item, RygelMediaItem* item, RygelTranscodeManager* manager, GError** error) {
   RygelVideoTranscoder * self;
   GUPnPDIDLLiteResource* result = NULL;
@@ -118,7 +89,7 @@ static GUPnPDIDLLiteResource* rygel_video_transcoder_real_add_resource (RygelTra
   _tmp0_ = didl_item;
   _tmp1_ = item;
   _tmp2_ = manager;
-  _tmp3_ = RYGEL_TRANSCODER_CLASS (rygel_video_transcoder_parent_class)->add_resource ((RygelTranscoder*) G_TYPE_CHECK_INSTANCE_CAST (self, RYGEL_TYPE_AUDIO_TRANSCODER, RygelAudioTranscoder), _tmp0_, _tmp1_, _tmp2_, &inner_error);
+  _tmp3_ = RYGEL_TRANSCODER_CLASS (rygel_video_transcoder_parent_class)->add_resource ((RygelTranscoder*) G_TYPE_CHECK_INSTANCE_CAST (self, RYGEL_TYPE_AUDIO_TRANSCODER, RygelVideoTranscoder), _tmp0_, _tmp1_, _tmp2_, &inner_error);
   resource = _tmp3_;
   if (inner_error != NULL) {
     g_propagate_error (error, inner_error);
@@ -130,7 +101,7 @@ static GUPnPDIDLLiteResource* rygel_video_transcoder_real_add_resource (RygelTra
     return result;
   }
   _tmp4_ = item;
-  _tmp5_ = _g_object_ref0 (RYGEL_IS_VIDEO_ITEM (_tmp4_) ? ((RygelVideoItem*) _tmp4_) : NULL);
+  _tmp5_ = g_object_ref (RYGEL_IS_VIDEO_ITEM (_tmp4_) ? ((RygelVideoItem*) _tmp4_) : NULL);
   video_item = _tmp5_;
   _tmp6_ = video_item;
   _tmp7_ = rygel_visual_item_get_width ((RygelVisualItem*) _tmp6_);
@@ -150,6 +121,7 @@ static GUPnPDIDLLiteResource* rygel_video_transcoder_real_add_resource (RygelTra
 
 
 static guint rygel_video_transcoder_real_get_distance (RygelTranscoder* base, RygelMediaItem* item) {
+  
   RygelVideoTranscoder * self;
   guint result = 0U;
   RygelMediaItem* _tmp0_;
@@ -171,7 +143,7 @@ static guint rygel_video_transcoder_real_get_distance (RygelTranscoder* base, Ry
     return result;
   }
   _tmp2_ = item;
-  _tmp3_ = _g_object_ref0 (RYGEL_IS_VIDEO_ITEM (_tmp2_) ? ((RygelVideoItem*) _tmp2_) : NULL);
+  _tmp3_ = g_object_ref (RYGEL_IS_VIDEO_ITEM (_tmp2_) ? ((RygelVideoItem*) _tmp2_) : NULL);
   video_item = _tmp3_;
   _tmp4_ = 0;
   distance = _tmp4_;
@@ -217,7 +189,7 @@ static GstEncodingProfile* rygel_video_transcoder_real_get_encoding_profile (Ryg
   GstEncodingVideoProfile* enc_video_profile;
   GstEncodingProfile* _tmp6_;
   self = (RygelVideoTranscoder*) base;
-  _tmp0_ = RYGEL_GST_TRANSCODER_CLASS (rygel_video_transcoder_parent_class)->get_encoding_profile ((RygelGstTranscoder*) G_TYPE_CHECK_INSTANCE_CAST (self, RYGEL_TYPE_AUDIO_TRANSCODER, RygelAudioTranscoder));
+  _tmp0_ = RYGEL_GST_TRANSCODER_CLASS (rygel_video_transcoder_parent_class)->get_encoding_profile ((RygelGstTranscoder*) G_TYPE_CHECK_INSTANCE_CAST (self, RYGEL_TYPE_AUDIO_TRANSCODER, RygelVideoTranscoder));
   enc_container_profile = GST_IS_ENCODING_CONTAINER_PROFILE (_tmp0_) ? ((GstEncodingContainerProfile*) _tmp0_) : NULL;
   _tmp1_ = self->priv->video_codec_format;
   _tmp2_ = rygel_gst_transcoder_get_preset (RYGEL_GST_TRANSCODER (self));
diff --git a/src/rygel-wmv-transcoder.c b/src/rygel-wmv-transcoder.c
index 3e9328b..599e66e 100644
--- a/src/rygel-wmv-transcoder.c
+++ b/src/rygel-wmv-transcoder.c
@@ -27,8 +27,6 @@ G_DEFINE_TYPE (RygelWMVTranscoder, rygel_wmv_transcoder, RYGEL_TYPE_VIDEO_TRANSC
 
 #define RYGEL_WMV_TRANSCODER_VIDEO_BITRATE 1200
 #define RYGEL_WMV_TRANSCODER_AUDIO_BITRATE 64
-RygelWMVTranscoder* rygel_wmv_transcoder_new (void);
-RygelWMVTranscoder* rygel_wmv_transcoder_construct (GType object_type);
 
 RygelWMVTranscoder* rygel_wmv_transcoder_construct (GType object_type) {
   RygelWMVTranscoder * self = NULL;
@@ -36,18 +34,18 @@ RygelWMVTranscoder* rygel_wmv_transcoder_construct (GType object_type) {
   return self;
 }
 
-
-RygelWMVTranscoder* rygel_wmv_transcoder_new (void) {
+RygelWMVTranscoder*
+rygel_wmv_transcoder_new (void) {
   return rygel_wmv_transcoder_construct (RYGEL_TYPE_WMV_TRANSCODER);
 }
 
-
-static void rygel_wmv_transcoder_class_init (RygelWMVTranscoderClass * klass) {
+static void
+rygel_wmv_transcoder_class_init (RygelWMVTranscoderClass * klass) {
   rygel_wmv_transcoder_parent_class = g_type_class_peek_parent (klass);
 }
 
-
-static void rygel_wmv_transcoder_init (RygelWMVTranscoder * self) {
+static void
+rygel_wmv_transcoder_init (RygelWMVTranscoder * self) {
 }