stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

tsfile: update to make it compile with new MPEGTS API

Browse source
This commit is contained in:
Adam Sutton 2013-06-17 17:10:41 +01:00
parent 88578c22a6
commit 1a9c3a766b
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/input/mpegts/tsfile/tsfile.c
View file

@ -41,7 +41,7 @@ tsfile_network_create_service
{
static int t = 0;
pthread_mutex_lock(&tsfile_lock);
mpegts_service_t *s = mpegts_service_create1(NULL, mm, sid, pmt_pid);
mpegts_service_t *s = mpegts_service_create1(NULL, mm, sid, pmt_pid, NULL);
pthread_mutex_unlock(&tsfile_lock);
// TODO: HACK: REMOVE ME
@ -50,6 +50,7 @@ tsfile_network_create_service
sprintf(buf, "channel-%d", t);
channel_t *c = channel_find_by_name(buf, 1, t);
service_map_channel((service_t*)s, c, 1);
t++;
}
return s;
}
@ -67,17 +68,17 @@ void tsfile_init ( int tuners )
/* Shared network */
mpegts_network_create0(&tsfile_network, &mpegts_network_class, NULL,
"TSfile Network");
"TSfile Network", NULL);
tsfile_network.mn_create_service = tsfile_network_create_service;
/* IPTV like setup */
if (tuners <= 0) {
mi = tsfile_input_create(0);
mpegts_network_add_input(&tsfile_network, mi);
mpegts_input_set_network(mi, &tsfile_network);
} else {
for (i = 0; i < tuners; i++) {
mi = tsfile_input_create(i+1);
mpegts_network_add_input(&tsfile_network, mi);
mpegts_input_set_network(mi, &tsfile_network);
}
}
}

5
src/input/mpegts/tsfile/tsfile_input.c
View file

@ -124,7 +124,7 @@ tsfile_input_thread ( void *aux )
/* Process */
if (c >= 0) {
pcr = PTS_UNSET;
pos = mpegts_input_recv_packets(mi, mmi, tsb, c, &pcr, &tmi->mmi_tsfile_pcr_pid);
pos = mpegts_input_recv_packets(mi, mmi, tsb, c, &pcr, &tmi->mmi_tsfile_pcr_pid, "tsfile");
/* Delay */
if (pcr != PTS_UNSET) {
@ -234,8 +234,9 @@ tsfile_input_create ( int idx )
mpegts_input_t *mi;
/* Create object */
mi = mpegts_input_create1(NULL);
mi = mpegts_input_create1(NULL, NULL);
mi->mi_instance = idx;
mi->mi_enabled = 1;
mi->mi_start_mux = tsfile_input_start_mux;
mi->mi_stop_mux = tsfile_input_stop_mux;
LIST_INSERT_HEAD(&tsfile_inputs, mi, mi_global_link);