diff options
author | Edward Hervey <edward@collabora.com> | 2013-08-21 08:58:52 +0200 |
---|---|---|
committer | Edward Hervey <edward@collabora.com> | 2013-08-21 08:59:42 +0200 |
commit | c3e4fe4edc16ec5707b87e5de23ab1b42b5b7d92 (patch) | |
tree | 5e4dce72aeb5671987805deb53fc6c0c20f89f19 | |
parent | d6b55b8a666db2cf639aee6ddf37815b0a3d87f8 (diff) |
dvb: Adapt for latest mpegts lib changes
-rw-r--r-- | sys/dvb/camutils.c | 20 | ||||
-rw-r--r-- | sys/dvb/dvbbasebin.c | 4 |
2 files changed, 11 insertions, 13 deletions
diff --git a/sys/dvb/camutils.c b/sys/dvb/camutils.c index 274a66bdc8..11c0aa294b 100644 --- a/sys/dvb/camutils.c +++ b/sys/dvb/camutils.c @@ -171,34 +171,32 @@ cam_read_length_field (guint8 * buff, guint * length) */ static guint -get_ca_descriptors_length (GArray * descriptors) +get_ca_descriptors_length (GPtrArray * descriptors) { guint i; guint nb_desc = descriptors->len; guint len = 0; for (i = 0; i < nb_desc; i++) { - GstMpegTsDescriptor *desc = - &g_array_index (descriptors, GstMpegTsDescriptor, i); - if (desc->descriptor_tag == 0x09) - len += desc->descriptor_length; + GstMpegTsDescriptor *desc = g_ptr_array_index (descriptors, i); + if (desc->tag == 0x09) + len += desc->length; } return len; } static guint8 * -write_ca_descriptors (guint8 * body, GArray * descriptors) +write_ca_descriptors (guint8 * body, GPtrArray * descriptors) { guint i, nb_desc; nb_desc = descriptors->len; for (i = 0; i < nb_desc; 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; + GstMpegTsDescriptor *desc = g_ptr_array_index (descriptors, i); + if (desc->tag == 0x09) { + memcpy (body, desc->data, desc->length); + body += desc->length; } } diff --git a/sys/dvb/dvbbasebin.c b/sys/dvb/dvbbasebin.c index 7f810ac1a5..8abedb7746 100644 --- a/sys/dvb/dvbbasebin.c +++ b/sys/dvb/dvbbasebin.c @@ -807,7 +807,7 @@ dvb_base_bin_handle_message (GstBin * bin, GstMessage * message) static void dvb_base_bin_pat_info_cb (DvbBaseBin * dvbbasebin, GstMpegTsSection * section) { - GArray *pat; + GPtrArray *pat; DvbBaseBinProgram *program; DvbBaseBinStream *stream; guint old_pmt_pid; @@ -820,7 +820,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_ptr_array_index (pat, i); program = dvb_base_bin_get_program (dvbbasebin, patp->program_number); if (program == NULL) |