pbutils: port to new API

This commit is contained in:
Wim Taymans 2011-08-29 11:38:01 +02:00
parent e1287b97ab
commit dc2b00adb8
3 changed files with 19 additions and 11 deletions

View file

@ -201,16 +201,19 @@ G_DEFINE_TYPE (GstDiscovererAudioInfo, gst_discoverer_audio_info,
GST_TYPE_DISCOVERER_STREAM_INFO); GST_TYPE_DISCOVERER_STREAM_INFO);
static void static void
gst_discoverer_audio_info_finalize (GstDiscovererAudioInfo * info) gst_discoverer_audio_info_finalize (GObject * object)
{ {
GstDiscovererAudioInfo *info = (GstDiscovererAudioInfo *) object;
g_free (info->language); g_free (info->language);
G_OBJECT_CLASS (gst_discoverer_audio_info_parent_class)->finalize (object);
} }
static void static void
gst_discoverer_audio_info_class_init (GstDiscovererAudioInfoClass * klass) gst_discoverer_audio_info_class_init (GObjectClass * klass)
{ {
klass->finalize = klass->finalize = gst_discoverer_audio_info_finalize;
(GstMiniObjectFinalizeFunction) gst_discoverer_audio_info_finalize;
} }
static void static void
@ -254,23 +257,26 @@ gst_discoverer_subtitle_info_init (GstDiscovererSubtitleInfo * info)
} }
static void static void
gst_discoverer_subtitle_info_finalize (GstDiscovererSubtitleInfo * info) gst_discoverer_subtitle_info_finalize (GObject * object)
{ {
GstDiscovererSubtitleInfo *info = (GstDiscovererSubtitleInfo *) object;
g_free (info->language); g_free (info->language);
G_OBJECT_CLASS (gst_discoverer_subtitle_info_parent_class)->finalize (object);
} }
static void static void
gst_discoverer_subtitle_info_class_init (GstMiniObjectClass * klass) gst_discoverer_subtitle_info_class_init (GObjectClass * klass)
{ {
klass->finalize = klass->finalize = gst_discoverer_subtitle_info_finalize;
(GstMiniObjectFinalizeFunction) gst_discoverer_subtitle_info_finalize;
} }
static GstDiscovererSubtitleInfo * static GstDiscovererSubtitleInfo *
gst_discoverer_subtitle_info_new (void) gst_discoverer_subtitle_info_new (void)
{ {
return (GstDiscovererSubtitleInfo *) return (GstDiscovererSubtitleInfo *)
gst_mini_object_new (GST_TYPE_DISCOVERER_SUBTITLE_INFO); g_object_new (GST_TYPE_DISCOVERER_SUBTITLE_INFO, NULL);
} }
static GstDiscovererSubtitleInfo * static GstDiscovererSubtitleInfo *

View file

@ -44,6 +44,8 @@
#include "config.h" #include "config.h"
#endif #endif
#include <gst/video/video.h>
#include "pbutils.h" #include "pbutils.h"
#include "pbutils-marshal.h" #include "pbutils-marshal.h"
#include "pbutils-private.h" #include "pbutils-private.h"
@ -730,7 +732,7 @@ collect_information (GstDiscoverer * dc, const GstStructure * st,
info = (GstDiscovererSubtitleInfo *) parent; info = (GstDiscovererSubtitleInfo *) parent;
else { else {
info = (GstDiscovererSubtitleInfo *) info = (GstDiscovererSubtitleInfo *)
gst_mini_object_new (GST_TYPE_DISCOVERER_SUBTITLE_INFO); g_object_new (GST_TYPE_DISCOVERER_SUBTITLE_INFO, NULL);
info->parent.caps = caps; info->parent.caps = caps;
} }

View file

@ -156,7 +156,7 @@ gboolean gst_discoverer_video_info_is_image(const GstDiscovererVideoInfo*
#define GST_IS_DISCOVERER_SUBTITLE_INFO(obj) \ #define GST_IS_DISCOVERER_SUBTITLE_INFO(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_DISCOVERER_SUBTITLE_INFO)) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_DISCOVERER_SUBTITLE_INFO))
typedef struct _GstDiscovererSubtitleInfo GstDiscovererSubtitleInfo; typedef struct _GstDiscovererSubtitleInfo GstDiscovererSubtitleInfo;
typedef GstMiniObjectClass GstDiscovererSubtitleInfoClass; typedef GObjectClass GstDiscovererSubtitleInfoClass;
GType gst_discoverer_subtitle_info_get_type (void); GType gst_discoverer_subtitle_info_get_type (void);
const gchar * gst_discoverer_subtitle_info_get_language(const GstDiscovererSubtitleInfo* info); const gchar * gst_discoverer_subtitle_info_get_language(const GstDiscovererSubtitleInfo* info);