summaryrefslogtreecommitdiff
path: root/sys/dvb
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 /sys/dvb
parentcddabd751c760454915bcd3a485f241939499292 (diff)
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 'sys/dvb')
-rw-r--r--sys/dvb/camconditionalaccess.c4
-rw-r--r--sys/dvb/camconditionalaccess.h2
-rw-r--r--sys/dvb/camdevice.c2
-rw-r--r--sys/dvb/camdevice.h2
-rw-r--r--sys/dvb/camswclient.c6
-rw-r--r--sys/dvb/camswclient.h4
-rw-r--r--sys/dvb/camutils.c12
-rw-r--r--sys/dvb/camutils.h2
-rw-r--r--sys/dvb/dvbbasebin.c34
9 files changed, 34 insertions, 34 deletions
diff --git a/sys/dvb/camconditionalaccess.c b/sys/dvb/camconditionalaccess.c
index c09a6b7fb..a1fe1de41 100644
--- a/sys/dvb/camconditionalaccess.c
+++ b/sys/dvb/camconditionalaccess.c
@@ -70,7 +70,7 @@ cam_conditional_access_destroy (CamConditionalAccess * cas)
}
static CamReturn
-send_ca_pmt (CamConditionalAccess * cas, GstMpegTsPMT * pmt,
+send_ca_pmt (CamConditionalAccess * cas, GstMpegtsPMT * pmt,
guint8 list_management, guint8 cmd_id)
{
CamReturn ret;
@@ -108,7 +108,7 @@ send_ca_pmt (CamConditionalAccess * cas, GstMpegTsPMT * pmt,
CamReturn
cam_conditional_access_set_pmt (CamConditionalAccess * cas,
- GstMpegTsPMT * pmt, CamConditionalAccessPmtFlag flag)
+ GstMpegtsPMT * pmt, CamConditionalAccessPmtFlag flag)
{
return send_ca_pmt (cas, pmt, flag, 0x01 /* ok_descrambling */ );
}
diff --git a/sys/dvb/camconditionalaccess.h b/sys/dvb/camconditionalaccess.h
index d5fb621f2..92e94af3d 100644
--- a/sys/dvb/camconditionalaccess.h
+++ b/sys/dvb/camconditionalaccess.h
@@ -50,6 +50,6 @@ CamConditionalAccess *cam_conditional_access_new (void);
void cam_conditional_access_destroy (CamConditionalAccess *cas);
CamReturn cam_conditional_access_set_pmt (CamConditionalAccess *cas,
- GstMpegTsPMT *pmt, CamConditionalAccessPmtFlag flag);
+ GstMpegtsPMT *pmt, CamConditionalAccessPmtFlag flag);
#endif /* CAM_CONDITIONAL_ACCESS_H */
diff --git a/sys/dvb/camdevice.c b/sys/dvb/camdevice.c
index 0952bcf31..fad1900e8 100644
--- a/sys/dvb/camdevice.c
+++ b/sys/dvb/camdevice.c
@@ -217,7 +217,7 @@ cam_device_ready (CamDevice * device)
void
cam_device_set_pmt (CamDevice * device,
- GstMpegTsPMT * pmt, CamConditionalAccessPmtFlag flag)
+ GstMpegtsPMT * pmt, CamConditionalAccessPmtFlag flag)
{
g_return_if_fail (device != NULL);
g_return_if_fail (device->state == CAM_DEVICE_STATE_OPEN);
diff --git a/sys/dvb/camdevice.h b/sys/dvb/camdevice.h
index afbc41976..f3b359ca1 100644
--- a/sys/dvb/camdevice.h
+++ b/sys/dvb/camdevice.h
@@ -64,6 +64,6 @@ void cam_device_close (CamDevice *device);
gboolean cam_device_ready (CamDevice *device);
void cam_device_poll (CamDevice *device);
void cam_device_set_pmt (CamDevice *device,
- GstMpegTsPMT *pmt, CamConditionalAccessPmtFlag flag);
+ GstMpegtsPMT *pmt, CamConditionalAccessPmtFlag flag);
#endif /* CAM_DEVICE_H */
diff --git a/sys/dvb/camswclient.c b/sys/dvb/camswclient.c
index 12f54e34d..f5d07cf9b 100644
--- a/sys/dvb/camswclient.c
+++ b/sys/dvb/camswclient.c
@@ -114,7 +114,7 @@ cam_sw_client_close (CamSwClient * client)
}
static void
-send_ca_pmt (CamSwClient * client, GstMpegTsPMT * pmt,
+send_ca_pmt (CamSwClient * client, GstMpegtsPMT * pmt,
guint8 list_management, guint8 cmd_id)
{
guint8 *buffer;
@@ -150,7 +150,7 @@ send_ca_pmt (CamSwClient * client, GstMpegTsPMT * pmt,
}
void
-cam_sw_client_set_pmt (CamSwClient * client, GstMpegTsPMT * pmt)
+cam_sw_client_set_pmt (CamSwClient * client, GstMpegtsPMT * pmt)
{
g_return_if_fail (client != NULL);
g_return_if_fail (pmt != NULL);
@@ -160,7 +160,7 @@ cam_sw_client_set_pmt (CamSwClient * client, GstMpegTsPMT * pmt)
}
void
-cam_sw_client_update_pmt (CamSwClient * client, GstMpegTsPMT * pmt)
+cam_sw_client_update_pmt (CamSwClient * client, GstMpegtsPMT * pmt)
{
g_return_if_fail (client != NULL);
g_return_if_fail (pmt != NULL);
diff --git a/sys/dvb/camswclient.h b/sys/dvb/camswclient.h
index 794f3537b..299e268c9 100644
--- a/sys/dvb/camswclient.h
+++ b/sys/dvb/camswclient.h
@@ -48,7 +48,7 @@ void cam_sw_client_free (CamSwClient *sw_client);
gboolean cam_sw_client_open (CamSwClient *sw_client, const char *sock_path);
void cam_sw_client_close (CamSwClient *sw_client);
-void cam_sw_client_set_pmt (CamSwClient *sw_client, GstMpegTsPMT *pmt);
-void cam_sw_client_update_pmt (CamSwClient *sw_client, GstMpegTsPMT *pmt);
+void cam_sw_client_set_pmt (CamSwClient *sw_client, GstMpegtsPMT *pmt);
+void cam_sw_client_update_pmt (CamSwClient *sw_client, GstMpegtsPMT *pmt);
#endif /* CAM_SW_CLIENT_H */
diff --git a/sys/dvb/camutils.c b/sys/dvb/camutils.c
index 11c0aa294..dc7ed2049 100644
--- a/sys/dvb/camutils.c
+++ b/sys/dvb/camutils.c
@@ -178,7 +178,7 @@ get_ca_descriptors_length (GPtrArray * descriptors)
guint len = 0;
for (i = 0; i < nb_desc; i++) {
- GstMpegTsDescriptor *desc = g_ptr_array_index (descriptors, i);
+ GstMpegtsDescriptor *desc = g_ptr_array_index (descriptors, i);
if (desc->tag == 0x09)
len += desc->length;
}
@@ -193,7 +193,7 @@ write_ca_descriptors (guint8 * body, GPtrArray * descriptors)
nb_desc = descriptors->len;
for (i = 0; i < nb_desc; i++) {
- GstMpegTsDescriptor *desc = g_ptr_array_index (descriptors, i);
+ GstMpegtsDescriptor *desc = g_ptr_array_index (descriptors, i);
if (desc->tag == 0x09) {
memcpy (body, desc->data, desc->length);
body += desc->length;
@@ -204,10 +204,10 @@ write_ca_descriptors (guint8 * body, GPtrArray * descriptors)
}
guint8 *
-cam_build_ca_pmt (GstMpegTsPMT * pmt, guint8 list_management, guint8 cmd_id,
+cam_build_ca_pmt (GstMpegtsPMT * pmt, guint8 list_management, guint8 cmd_id,
guint * size)
{
- GstMpegTsSection *section = (GstMpegTsSection *) pmt;
+ GstMpegtsSection *section = (GstMpegtsSection *) pmt;
guint body_size = 0;
guint8 *buffer;
guint8 *body;
@@ -225,7 +225,7 @@ cam_build_ca_pmt (GstMpegTsPMT * pmt, guint8 list_management, guint8 cmd_id,
body_size += 6 + len;
for (i = 0; i < pmt->streams->len; i++) {
- GstMpegTsPMTStream *pmtstream = g_ptr_array_index (pmt->streams, i);
+ GstMpegtsPMTStream *pmtstream = g_ptr_array_index (pmt->streams, i);
len = get_ca_descriptors_length (pmtstream->descriptors);
if (len > 0)
@@ -269,7 +269,7 @@ cam_build_ca_pmt (GstMpegTsPMT * pmt, guint8 list_management, guint8 cmd_id,
}
for (i = 0; i < pmt->streams->len; i++) {
- GstMpegTsPMTStream *pmtstream = g_ptr_array_index (pmt->streams, i);
+ GstMpegtsPMTStream *pmtstream = g_ptr_array_index (pmt->streams, i);
*body++ = pmtstream->stream_type;
GST_WRITE_UINT16_BE (body, pmtstream->pid);
diff --git a/sys/dvb/camutils.h b/sys/dvb/camutils.h
index dc9bd3c15..67b0ca3a7 100644
--- a/sys/dvb/camutils.h
+++ b/sys/dvb/camutils.h
@@ -55,6 +55,6 @@ typedef enum
guint8 cam_calc_length_field_size (guint length);
guint8 cam_write_length_field (guint8 *buff, guint length);
guint8 cam_read_length_field (guint8 *buff, guint *length);
-guint8 *cam_build_ca_pmt (GstMpegTsPMT *pmt, guint8 list_management, guint8 cmd_id, guint *size);
+guint8 *cam_build_ca_pmt (GstMpegtsPMT *pmt, guint8 list_management, guint8 cmd_id, guint *size);
#endif /* CAM_UTILS_H */
diff --git a/sys/dvb/dvbbasebin.c b/sys/dvb/dvbbasebin.c
index 7da3f629a..9361200b8 100644
--- a/sys/dvb/dvbbasebin.c
+++ b/sys/dvb/dvbbasebin.c
@@ -94,10 +94,10 @@ typedef struct
gint program_number;
guint16 pmt_pid;
guint16 pcr_pid;
- GstMpegTsSection *section;
- GstMpegTsSection *old_section;
- const GstMpegTsPMT *pmt;
- const GstMpegTsPMT *old_pmt;
+ GstMpegtsSection *section;
+ GstMpegtsSection *old_section;
+ const GstMpegtsPMT *pmt;
+ const GstMpegtsPMT *old_pmt;
gboolean selected;
gboolean pmt_active;
gboolean active;
@@ -117,9 +117,9 @@ static GstStateChangeReturn dvb_base_bin_change_state (GstElement * element,
GstStateChange transition);
static void dvb_base_bin_handle_message (GstBin * bin, GstMessage * message);
static void dvb_base_bin_pat_info_cb (DvbBaseBin * dvbbasebin,
- GstMpegTsSection * pat);
+ GstMpegtsSection * pat);
static void dvb_base_bin_pmt_info_cb (DvbBaseBin * dvbbasebin,
- GstMpegTsSection * pmt);
+ GstMpegtsSection * pmt);
static GstPad *dvb_base_bin_request_new_pad (GstElement * element,
GstPadTemplate * templ, const gchar * name, const GstCaps * caps);
static void dvb_base_bin_release_pad (GstElement * element, GstPad * pad);
@@ -661,7 +661,7 @@ dvb_base_bin_reset_pmtlist (DvbBaseBin * dvbbasebin)
{
CamConditionalAccessPmtFlag flag;
GList *walk;
- GstMpegTsPMT *pmt;
+ GstMpegtsPMT *pmt;
walk = dvbbasebin->pmtlist;
while (walk) {
@@ -677,7 +677,7 @@ dvb_base_bin_reset_pmtlist (DvbBaseBin * dvbbasebin)
flag = CAM_CONDITIONAL_ACCESS_PMT_FLAG_MORE;
}
- pmt = (GstMpegTsPMT *) walk->data;
+ pmt = (GstMpegtsPMT *) walk->data;
cam_device_set_pmt (dvbbasebin->hwcam, pmt, flag);
walk = walk->next;
@@ -793,13 +793,13 @@ dvb_base_bin_rebuild_filter (DvbBaseBin * dvbbasebin)
static void
dvb_base_bin_remove_pmt_streams (DvbBaseBin * dvbbasebin,
- const GstMpegTsPMT * pmt)
+ const GstMpegtsPMT * pmt)
{
gint i;
DvbBaseBinStream *stream;
for (i = 0; i < pmt->streams->len; i++) {
- GstMpegTsPMTStream *pmtstream = g_ptr_array_index (pmt->streams, i);
+ GstMpegtsPMTStream *pmtstream = g_ptr_array_index (pmt->streams, i);
stream = dvb_base_bin_get_stream (dvbbasebin, pmtstream->pid);
if (stream == NULL) {
@@ -813,13 +813,13 @@ dvb_base_bin_remove_pmt_streams (DvbBaseBin * dvbbasebin,
}
static void
-dvb_base_bin_add_pmt_streams (DvbBaseBin * dvbbasebin, const GstMpegTsPMT * pmt)
+dvb_base_bin_add_pmt_streams (DvbBaseBin * dvbbasebin, const GstMpegtsPMT * pmt)
{
DvbBaseBinStream *stream;
gint i;
for (i = 0; i < pmt->streams->len; i++) {
- GstMpegTsPMTStream *pmtstream = g_ptr_array_index (pmt->streams, i);
+ GstMpegtsPMTStream *pmtstream = g_ptr_array_index (pmt->streams, i);
GST_DEBUG ("filtering stream %d stream_type %d", pmtstream->pid,
pmtstream->stream_type);
@@ -914,7 +914,7 @@ dvb_base_bin_handle_message (GstBin * bin, GstMessage * message)
/* note: message->src might be a GstPad, so use element cast w/o typecheck */
if (GST_ELEMENT_CAST (message->src) == dvbbasebin->tsparse) {
- GstMpegTsSection *section = gst_message_parse_mpegts_section (message);
+ GstMpegtsSection *section = gst_message_parse_mpegts_section (message);
if (section) {
switch (GST_MPEGTS_SECTION_TYPE (section)) {
@@ -938,7 +938,7 @@ dvb_base_bin_handle_message (GstBin * bin, GstMessage * message)
static void
-dvb_base_bin_pat_info_cb (DvbBaseBin * dvbbasebin, GstMpegTsSection * section)
+dvb_base_bin_pat_info_cb (DvbBaseBin * dvbbasebin, GstMpegtsSection * section)
{
GPtrArray *pat;
DvbBaseBinProgram *program;
@@ -953,7 +953,7 @@ dvb_base_bin_pat_info_cb (DvbBaseBin * dvbbasebin, GstMpegTsSection * section)
}
for (i = 0; i < pat->len; i++) {
- GstMpegTsPatProgram *patp = g_ptr_array_index (pat, i);
+ GstMpegtsPatProgram *patp = g_ptr_array_index (pat, i);
program = dvb_base_bin_get_program (dvbbasebin, patp->program_number);
if (program == NULL)
@@ -984,9 +984,9 @@ dvb_base_bin_pat_info_cb (DvbBaseBin * dvbbasebin, GstMpegTsSection * section)
}
static void
-dvb_base_bin_pmt_info_cb (DvbBaseBin * dvbbasebin, GstMpegTsSection * section)
+dvb_base_bin_pmt_info_cb (DvbBaseBin * dvbbasebin, GstMpegtsSection * section)
{
- const GstMpegTsPMT *pmt;
+ const GstMpegtsPMT *pmt;
DvbBaseBinProgram *program;
guint program_number;