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

linuxdvb: fixed leaving dangling file handles and stop FE on stop

Browse source 
Note: really we don't want to close the FE if we're planning to
retune, but I need to change the API to support that operation.
This commit is contained in:
Adam Sutton 2013-09-02 11:21:58 +01:00
parent 16f9e11fd8
commit 84677dd6c1
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/input/mpegts/linuxdvb/linuxdvb_frontend.c
View file

@ -270,6 +270,16 @@ linuxdvb_frontend_stop_mux
tvhdebug("linuxdvb", "%s - stopped dvr thread", buf1);
}
/* TODO: no way to know whether we need to close the FE or not */
if (lfe->lfe_fe_fd > 0) {
tvhtrace("linuxdvb", "%s - closing frontend", buf1);
close(lfe->lfe_fe_fd);
lfe->lfe_fe_fd = -1;
}
/* Stop monitor */
gtimer_disarm(&lfe->lfe_monitor_timer);
/* Not locked */
lfe->lfe_locked = 0;
}
@ -287,7 +297,7 @@ linuxdvb_frontend_open_pid
{
char buf[256];
struct dmx_pes_filter_params dmx_param;
int fd = tvh_open(lfe->lfe_dmx_path, O_RDWR, 0);
int fd = -1;
if (!lfe->lfe_locked || lfe->lfe_fullmux)
return -1;
@ -297,13 +307,14 @@ linuxdvb_frontend_open_pid
name = buf;
}
fd = tvh_open(lfe->lfe_dmx_path, O_RDWR, 0);
if(fd == -1) {
tvherror("linuxdvb", "%s - failed to open dmx for pid %d [e=%s]",
name, pid, strerror(errno));
return -1;
}
tvhtrace("linuxdvb", "%s - open PID %04X (%d)", name, pid, pid);
tvhtrace("linuxdvb", "%s - open PID %04X (%d) fd %d", name, pid, pid, fd);
memset(&dmx_param, 0, sizeof(dmx_param));
dmx_param.pid = pid;
dmx_param.input = DMX_IN_FRONTEND;