dvb: GstMpegTS => GstMpegTs

diff --git a/sys/dvb/camconditionalaccess.c b/sys/dvb/camconditionalaccess.c
index d61c83b..be0e359 100644 (file)
--- 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 c3ba492..d5fb621 100644 (file)
--- 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 049fc0f..0d90853 100644 (file)
--- 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 06933bc..afbc419 100644 (file)
--- 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 a8fb4ff..32c6a22 100644 (file)
--- a/sys/dvb/camswclient.c
+++ b/sys/dvb/camswclient.c
@@ -110,7 +110,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;
@@ -145,7 +145,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);
@@ -155,7 +155,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 199d9b8..794f353 100644 (file)
--- 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 8d5e20f..274a66b 100644 (file)
--- a/sys/dvb/camutils.c
+++ b/sys/dvb/camutils.c
@@ -178,8 +178,8 @@ get_ca_descriptors_length (GArray * descriptors)
   guint len = 0;
 
   for (i = 0; i < nb_desc; i++) {
-    GstMpegTSDescriptor *desc =
-        &g_array_index (descriptors, GstMpegTSDescriptor, i);
+    GstMpegTsDescriptor *desc =
+        &g_array_index (descriptors, GstMpegTsDescriptor, i);
     if (desc->descriptor_tag == 0x09)
       len += desc->descriptor_length;
   }
@@ -194,8 +194,8 @@ write_ca_descriptors (guint8 * body, GArray * descriptors)
 
   nb_desc = descriptors->len;
   for (i = 0; i < nb_desc; i++) {
-    GstMpegTSDescriptor *desc =
-        &g_array_index (descriptors, GstMpegTSDescriptor, i);
+    GstMpegTsDescriptor *desc =
+        &g_array_index (descriptors, GstMpegTsDescriptor, i);
     if (desc->descriptor_tag == 0x09) {
       memcpy (body, desc->descriptor_data, desc->descriptor_length);
       body += desc->descriptor_length;
@@ -206,10 +206,10 @@ write_ca_descriptors (guint8 * body, GArray * 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;
@@ -227,7 +227,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)
@@ -271,7 +271,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 10227e4..dc9bd3c 100644 (file)
--- 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 3df70f1..1970d19 100644 (file)
--- a/sys/dvb/dvbbasebin.c
+++ b/sys/dvb/dvbbasebin.c
@@ -85,8 +85,8 @@ typedef struct
   gint program_number;
   guint16 pmt_pid;
   guint16 pcr_pid;
-  GstMpegTSPMT *pmt;
-  GstMpegTSPMT *old_pmt;
+  GstMpegTsPMT *pmt;
+  GstMpegTsPMT *old_pmt;
   gboolean selected;
   gboolean pmt_active;
   gboolean active;
@@ -106,9 +106,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);
@@ -541,7 +541,7 @@ dvb_base_bin_reset_pmtlist (DvbBaseBin * dvbbasebin)
 {
   CamConditionalAccessPmtFlag flag;
   GList *walk;
-  GstMpegTSPMT *pmt;
+  GstMpegTsPMT *pmt;
 
   walk = dvbbasebin->pmtlist;
   while (walk) {
@@ -557,7 +557,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;
@@ -661,13 +661,13 @@ dvb_base_bin_rebuild_filter (DvbBaseBin * dvbbasebin)
 }
 
 static void
-dvb_base_bin_remove_pmt_streams (DvbBaseBin * dvbbasebin, GstMpegTSPMT * pmt)
+dvb_base_bin_remove_pmt_streams (DvbBaseBin * dvbbasebin, 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) {
@@ -681,13 +681,13 @@ dvb_base_bin_remove_pmt_streams (DvbBaseBin * dvbbasebin, GstMpegTSPMT * pmt)
 }
 
 static void
-dvb_base_bin_add_pmt_streams (DvbBaseBin * dvbbasebin, GstMpegTSPMT * pmt)
+dvb_base_bin_add_pmt_streams (DvbBaseBin * dvbbasebin, 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);
@@ -776,7 +776,7 @@ dvb_base_bin_handle_message (GstBin * bin, GstMessage * message)
   dvbbasebin = GST_DVB_BASE_BIN (bin);
 
   if (GST_ELEMENT (message->src) == GST_ELEMENT (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)) {
@@ -800,7 +800,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)
 {
   GArray *pat;
   DvbBaseBinProgram *program;
@@ -815,7 +815,7 @@ dvb_base_bin_pat_info_cb (DvbBaseBin * dvbbasebin, GstMpegTSSection * section)
   }
 
   for (i = 0; i < pat->len; i++) {
-    GstMpegTSPatProgram *patp = &g_array_index (pat, GstMpegTSPatProgram, i);
+    GstMpegTsPatProgram *patp = &g_array_index (pat, GstMpegTsPatProgram, i);
 
     program = dvb_base_bin_get_program (dvbbasebin, patp->program_number);
     if (program == NULL)
@@ -844,9 +844,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)
 {
-  GstMpegTSPMT *pmt = (GstMpegTSPMT *) section;
+  GstMpegTsPMT *pmt = (GstMpegTsPMT *) section;
   DvbBaseBinProgram *program;
   guint program_number;
 
@@ -860,7 +860,7 @@ dvb_base_bin_pmt_info_cb (DvbBaseBin * dvbbasebin, GstMpegTSSection * section)
   }
 
   program->old_pmt = program->pmt;
-  program->pmt = (GstMpegTSPMT *) gst_mpegts_section_ref (pmt);
+  program->pmt = (GstMpegTsPMT *) gst_mpegts_section_ref (pmt);
 
   /* activate the program if it's selected and either it's not active or its pmt
    * changed */