summaryrefslogtreecommitdiff
path: root/gst/mpegtsdemux/mpegtsbase.h
diff options
context:
space:
mode:
authorEdward Hervey <bilboed@bilboed.com>2014-06-25 14:50:05 +0200
committerEdward Hervey <bilboed@bilboed.com>2014-06-25 14:50:05 +0200
commit22dfd9aef361c6e630fe32d6b7f6c07588a2dff9 (patch)
tree48cbfc0212922b7d8c6a98f1d7854a9326358788 /gst/mpegtsdemux/mpegtsbase.h
parentcddabd751c760454915bcd3a485f241939499292 (diff)
downloadgstreamer-plugins-bad-22dfd9aef361c6e630fe32d6b7f6c07588a2dff9.tar.gz
mpegts: Unify API : GstMpegts / gst_mpegts_ / GST_*_MPEGTS_
It was previously a mix and match of both variants, introducing just too much confusion. The prefix are from now on: * GstMpegts for structures and type names (and not GstMpegTs) * gst_mpegts_ for functions (and not gst_mpeg_ts_) * GST_MPEGTS_ for enums/flags (and not GST_MPEG_TS_) * GST_TYPE_MPEGTS_ for types (and not GST_TYPE_MPEG_TS_) The rationale for chosing that is: * the namespace is shorter/direct (it's mpegts, not mpeg_ts nor mpeg-ts) * the namespace is one word under Gst * it's shorter (yah)
Diffstat (limited to 'gst/mpegtsdemux/mpegtsbase.h')
-rw-r--r--gst/mpegtsdemux/mpegtsbase.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/gst/mpegtsdemux/mpegtsbase.h b/gst/mpegtsdemux/mpegtsbase.h
index 6e0bee1aa..6b2d7d304 100644
--- a/gst/mpegtsdemux/mpegtsbase.h
+++ b/gst/mpegtsdemux/mpegtsbase.h
@@ -63,7 +63,7 @@ struct _MpegTSBaseStream
/* Content of the registration descriptor (if present) */
guint32 registration_id;
- GstMpegTsPMTStream *stream;
+ GstMpegtsPMTStream *stream;
};
struct _MpegTSBaseProgram
@@ -75,8 +75,8 @@ struct _MpegTSBaseProgram
/* Content of the registration descriptor (if present) */
guint32 registration_id;
- GstMpegTsSection *section;
- const GstMpegTsPMT *pmt;
+ GstMpegtsSection *section;
+ const GstMpegtsPMT *pmt;
MpegTSBaseStream **streams;
GList *stream_list;
@@ -165,7 +165,7 @@ struct _MpegTSBaseClass {
/* Virtual methods */
void (*reset) (MpegTSBase *base);
- GstFlowReturn (*push) (MpegTSBase *base, MpegTSPacketizerPacket *packet, GstMpegTsSection * section);
+ GstFlowReturn (*push) (MpegTSBase *base, MpegTSPacketizerPacket *packet, GstMpegtsSection * section);
/* takes ownership of @event */
gboolean (*push_event) (MpegTSBase *base, GstEvent * event);
@@ -213,8 +213,8 @@ G_GNUC_INTERNAL GType mpegts_base_get_type(void);
G_GNUC_INTERNAL MpegTSBaseProgram *mpegts_base_get_program (MpegTSBase * base, gint program_number);
G_GNUC_INTERNAL MpegTSBaseProgram *mpegts_base_add_program (MpegTSBase * base, gint program_number, guint16 pmt_pid);
-G_GNUC_INTERNAL const GstMpegTsDescriptor *mpegts_get_descriptor_from_stream (MpegTSBaseStream * stream, guint8 tag);
-G_GNUC_INTERNAL const GstMpegTsDescriptor *mpegts_get_descriptor_from_program (MpegTSBaseProgram * program, guint8 tag);
+G_GNUC_INTERNAL const GstMpegtsDescriptor *mpegts_get_descriptor_from_stream (MpegTSBaseStream * stream, guint8 tag);
+G_GNUC_INTERNAL const GstMpegtsDescriptor *mpegts_get_descriptor_from_program (MpegTSBaseProgram * program, guint8 tag);
G_GNUC_INTERNAL gboolean
mpegts_base_handle_seek_event(MpegTSBase * base, GstPad * pad, GstEvent * event);