[rygel-gst-0-10-plugins] Do stringent checks in item factory.

[Krzesimir Nowak <krnowak src gnome org>]

commit 14233ef8b2a91294fe2d7273c9083413f3166021
Author: Krzesimir Nowak <krnowak openismus com>
Date:   Mon Feb 11 13:37:07 2013 +0100

    Do stringent checks in item factory.

 src/media-export/rygel-media-export-item-factory.c |   57 ++++++++++---------
 1 files changed, 30 insertions(+), 27 deletions(-)
---
diff --git a/src/media-export/rygel-media-export-item-factory.c b/src/media-export/rygel-media-export-item-factory.c
index d7d824f..2c49b01 100644
--- a/src/media-export/rygel-media-export-item-factory.c
+++ b/src/media-export/rygel-media-export-item-factory.c
@@ -33,9 +33,9 @@ rygel_media_export_item_factory_create_simple (RygelMediaContainer *parent, GFil
   gchar *title = NULL;
   gchar *mime = NULL;
 
-  g_return_val_if_fail (parent, NULL);
-  g_return_val_if_fail (file, NULL);
-  g_return_val_if_fail (info, NULL);
+  g_return_val_if_fail (RYGEL_IS_MEDIA_CONTAINER (parent), NULL);
+  g_return_val_if_fail (G_IS_FILE (file), NULL);
+  g_return_val_if_fail (G_IS_FILE_INFO (info), NULL);
 
   title =  g_strdup (g_file_info_get_display_name (info));
   mime = g_content_type_get_mime_type (g_file_info_get_content_type (info));
@@ -80,10 +80,10 @@ rygel_media_export_item_factory_create_from_info (RygelMediaContainer *parent, G
   GList *audio_streams = NULL;
   GList *video_streams = NULL;
 
-  g_return_val_if_fail (parent, NULL);
-  g_return_val_if_fail (file, NULL);
-  g_return_val_if_fail (dlna_info, NULL);
-  g_return_val_if_fail (file_info, NULL);
+  g_return_val_if_fail (RYGEL_IS_MEDIA_CONTAINER (parent), NULL);
+  g_return_val_if_fail (G_IS_FILE (file), NULL);
+  g_return_val_if_fail (GUPNP_IS_DLNA_INFORMATION (dlna_info), NULL);
+  g_return_val_if_fail (G_IS_FILE_INFO (file_info), NULL);
 
   id = rygel_media_export_media_cache_get_id (file);
   discoverer_info = gupnp_dlna_information_get_info (dlna_info);
@@ -137,8 +137,9 @@ rygel_media_export_item_factory_create_from_info (RygelMediaContainer *parent, G
 
 void
 rygel_media_export_item_factory_fill_audio_item (RygelAudioItem *item, GUPnPDLNAInformation *dlna_info, GstDiscovererAudioInfo *audio_info) {
-  g_return_if_fail (item);
-  g_return_if_fail (dlna_info);
+  g_return_if_fail (RYGEL_IS_AUDIO_ITEM (item));
+  g_return_if_fail (GUPNP_IS_DLNA_INFORMATION (dlna_info));
+  g_return_if_fail (audio_info == NULL || GST_IS_DISCOVERER_AUDIO_INFO (audio_info));
 
   const GstDiscovererInfo *info = gupnp_dlna_information_get_info (dlna_info);
   GstClockTime duration = gst_discoverer_info_get_duration (info);
@@ -168,11 +169,12 @@ rygel_media_export_item_factory_fill_audio_item (RygelAudioItem *item, GUPnPDLNA
 
 RygelMediaItem*
 rygel_media_export_item_factory_fill_video_item (RygelMediaExportVideoItem *item, GFile *file, GUPnPDLNAInformation *dlna_info, GstDiscovererVideoInfo *video_info, GstDiscovererAudioInfo *audio_info, GFileInfo *file_info) {
-  g_return_val_if_fail (item, NULL);
-  g_return_val_if_fail (file, NULL);
-  g_return_val_if_fail (dlna_info, NULL);
-  g_return_val_if_fail (video_info, NULL);
-  g_return_val_if_fail (file_info, NULL);
+  g_return_val_if_fail (RYGEL_MEDIA_EXPORT_IS_VIDEO_ITEM (item), NULL);
+  g_return_val_if_fail (G_IS_FILE (file), NULL);
+  g_return_val_if_fail (GUPNP_IS_DLNA_INFORMATION (dlna_info), NULL);
+  g_return_val_if_fail (GST_IS_DISCOVERER_VIDEO_INFO (video_info), NULL);
+  g_return_val_if_fail (audio_info == NULL || GST_IS_DISCOVERER_AUDIO_INFO (audio_info), NULL);
+  g_return_val_if_fail (G_IS_FILE_INFO (file_info), NULL);
 
   rygel_media_export_item_factory_fill_audio_item (RYGEL_AUDIO_ITEM (item), dlna_info, audio_info);
   rygel_media_export_item_factory_fill_media_item (RYGEL_MEDIA_ITEM (item), file, dlna_info, file_info);
@@ -192,11 +194,11 @@ rygel_media_export_item_factory_fill_video_item (RygelMediaExportVideoItem *item
 
 RygelMediaItem*
 rygel_media_export_item_factory_fill_photo_item (RygelMediaExportPhotoItem *item, GFile *file, GUPnPDLNAInformation *dlna_info, GstDiscovererVideoInfo *video_info, GFileInfo *file_info) {
-  g_return_val_if_fail (item, NULL);
-  g_return_val_if_fail (file, NULL);
-  g_return_val_if_fail (dlna_info, NULL);
-  g_return_val_if_fail (video_info, NULL);
-  g_return_val_if_fail (file_info, NULL);
+  g_return_val_if_fail (RYGEL_MEDIA_EXPORT_IS_PHOTO_ITEM (item), NULL);
+  g_return_val_if_fail (G_IS_FILE (file), NULL);
+  g_return_val_if_fail (GUPNP_IS_DLNA_INFORMATION (dlna_info), NULL);
+  g_return_val_if_fail (GST_IS_DISCOVERER_VIDEO_INFO (video_info), NULL);
+  g_return_val_if_fail (G_IS_FILE_INFO (file_info), NULL);
 
   rygel_media_export_item_factory_fill_media_item (RYGEL_MEDIA_ITEM (item),
     file, dlna_info, file_info);
@@ -216,10 +218,11 @@ rygel_media_export_item_factory_fill_photo_item (RygelMediaExportPhotoItem *item
 RygelMediaItem *rygel_media_export_item_factory_fill_music_item (RygelMediaExportMusicItem *item, GFile *file, GUPnPDLNAInformation *dlna_info, GstDiscovererAudioInfo *audio_info, GFileInfo *file_info) {
   RygelMediaItem *result = RYGEL_MEDIA_ITEM (item);
 
-  g_return_val_if_fail (item, NULL);
-  g_return_val_if_fail (file, NULL);
-  g_return_val_if_fail (dlna_info, NULL);
-  g_return_val_if_fail (file_info, NULL);
+  g_return_val_if_fail (RYGEL_MEDIA_EXPORT_IS_MUSIC_ITEM (item), NULL);
+  g_return_val_if_fail (G_IS_FILE (file), NULL);
+  g_return_val_if_fail (GUPNP_IS_DLNA_INFORMATION (dlna_info), NULL);
+  g_return_val_if_fail (audio_info == NULL || GST_IS_DISCOVERER_AUDIO_INFO (audio_info), NULL);
+  g_return_val_if_fail (G_IS_FILE_INFO (file_info), NULL);
 
   rygel_media_export_item_factory_fill_audio_item (RYGEL_AUDIO_ITEM (item), dlna_info, audio_info);
   rygel_media_export_item_factory_fill_media_item (RYGEL_MEDIA_ITEM (item), file, dlna_info, file_info);
@@ -298,10 +301,10 @@ RygelMediaItem *rygel_media_export_item_factory_fill_music_item (RygelMediaExpor
 
 
 void rygel_media_export_item_factory_fill_media_item (RygelMediaItem *item, GFile *file, GUPnPDLNAInformation *dlna_info, GFileInfo *file_info) {
-  g_return_if_fail (item);
-  g_return_if_fail (file);
-  g_return_if_fail (dlna_info);
-  g_return_if_fail (file_info);
+  g_return_if_fail (RYGEL_IS_MEDIA_ITEM (item));
+  g_return_if_fail (G_IS_FILE (file));
+  g_return_if_fail (GUPNP_IS_DLNA_INFORMATION (dlna_info));
+  g_return_if_fail (G_IS_FILE_INFO (file_info));
 
   const GstDiscovererInfo *info = gupnp_dlna_information_get_info (dlna_info);
   if (!info)