summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2004-03-07 21:02:25 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2004-03-07 21:02:25 +0000
commitc0e613839347e4e5455c1947f0615ab0e94170f8 (patch)
tree1a7d64ae75503028e20f70f09e3f2e161ce60f7c
parenta9cf545d20567e3453625511e025861b39903db1 (diff)
downloadgstreamer-plugins-base-c0e613839347e4e5455c1947f0615ab0e94170f8.tar.gz
compile fixes
Original commit message from CVS: compile fixes
-rw-r--r--gst-libs/gst/media-info/media-info-priv.h6
-rw-r--r--gst-libs/gst/media-info/media-info.c5
2 files changed, 7 insertions, 4 deletions
diff --git a/gst-libs/gst/media-info/media-info-priv.h b/gst-libs/gst/media-info/media-info-priv.h
index 239cbb4aa..4353b6952 100644
--- a/gst-libs/gst/media-info/media-info-priv.h
+++ b/gst-libs/gst/media-info/media-info-priv.h
@@ -103,7 +103,11 @@ void gmi_stream_free (GstMediaInfoStream *stream);
GstMediaInfoTrack *
gmi_track_new (void);
-void gmi_reset (GstMediaInfo *info);
+void gmip_reset (GstMediaInfoPriv *priv);
+void gmip_init (GstMediaInfoPriv *priv, GError **error);
+
+void gmi_clear_decoder (GstMediaInfo *info);
+
gboolean gmi_seek_to_track (GstMediaInfo *info,
long track);
diff --git a/gst-libs/gst/media-info/media-info.c b/gst-libs/gst/media-info/media-info.c
index 6b25fcb89..e60303151 100644
--- a/gst-libs/gst/media-info/media-info.c
+++ b/gst-libs/gst/media-info/media-info.c
@@ -25,7 +25,6 @@
#include <string.h>
#include "media-info.h"
#include "media-info-priv.h"
-#include "media-info-marshal.h"
static void gst_media_info_class_init (GstMediaInfoClass *klass);
static void gst_media_info_instance_init (GstMediaInfo *info);
@@ -147,7 +146,7 @@ gst_media_info_class_init (GstMediaInfoClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GstMediaInfoClass, media_info_signal),
NULL, NULL,
- gst_media_info_marshal_VOID__VOID,
+ gst_marshal_VOID__VOID,
G_TYPE_NONE, 0);
}
@@ -161,7 +160,7 @@ gst_media_info_instance_init (GstMediaInfo *info)
if (!_media_info_inited) { gst_media_info_init (); }
- gmip_init (info->priv);
+ gmip_init (info->priv, error);
gmip_reset (info->priv);
}