Revert "dvb: close dvr device on each re-tune"
This reverts commit 03e9f1179d
.
This commit is contained in:
parent
7a7835dc0a
commit
bec277d699
3 changed files with 12 additions and 21 deletions
|
@ -346,8 +346,6 @@ void dvb_adapter_start (th_dvb_adapter_t *tda);
|
|||
|
||||
void dvb_adapter_stop (th_dvb_adapter_t *tda);
|
||||
|
||||
void dvb_adapter_stop_dvr (th_dvb_adapter_t *tda);
|
||||
|
||||
void dvb_adapter_set_displayname(th_dvb_adapter_t *tda, const char *s);
|
||||
|
||||
void dvb_adapter_set_enabled(th_dvb_adapter_t *tda, int on);
|
||||
|
|
|
@ -714,22 +714,6 @@ dvb_adapter_start ( th_dvb_adapter_t *tda )
|
|||
}
|
||||
}
|
||||
|
||||
void
|
||||
dvb_adapter_stop_dvr ( th_dvb_adapter_t *tda )
|
||||
{
|
||||
/* Stop DVR thread */
|
||||
if (tda->tda_dvr_pipe.rd != -1) {
|
||||
tvhlog(LOG_DEBUG, "dvb", "%s stopping thread", tda->tda_rootpath);
|
||||
int err = tvh_write(tda->tda_dvr_pipe.wr, "", 1);
|
||||
assert(!err);
|
||||
pthread_join(tda->tda_dvr_thread, NULL);
|
||||
close(tda->tda_dvr_pipe.rd);
|
||||
close(tda->tda_dvr_pipe.wr);
|
||||
tda->tda_dvr_pipe.rd = -1;
|
||||
tvhlog(LOG_DEBUG, "dvb", "%s stopped thread", tda->tda_rootpath);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
dvb_adapter_stop ( th_dvb_adapter_t *tda )
|
||||
{
|
||||
|
@ -746,8 +730,18 @@ dvb_adapter_stop ( th_dvb_adapter_t *tda )
|
|||
tda->tda_fe_fd = -1;
|
||||
}
|
||||
|
||||
dvb_adapter_stop_dvr(tda);
|
||||
|
||||
/* Stop DVR thread */
|
||||
if (tda->tda_dvr_pipe.rd != -1) {
|
||||
tvhlog(LOG_DEBUG, "dvb", "%s stopping thread", tda->tda_rootpath);
|
||||
int err = tvh_write(tda->tda_dvr_pipe.wr, "", 1);
|
||||
assert(!err);
|
||||
pthread_join(tda->tda_dvr_thread, NULL);
|
||||
close(tda->tda_dvr_pipe.rd);
|
||||
close(tda->tda_dvr_pipe.wr);
|
||||
tda->tda_dvr_pipe.rd = -1;
|
||||
tvhlog(LOG_DEBUG, "dvb", "%s stopped thread", tda->tda_rootpath);
|
||||
}
|
||||
|
||||
dvb_adapter_notify(tda);
|
||||
}
|
||||
|
||||
|
|
|
@ -286,7 +286,6 @@ dvb_fe_stop(th_dvb_mux_instance_t *tdmi, int retune)
|
|||
}
|
||||
|
||||
dvb_table_flush_all(tdmi);
|
||||
dvb_adapter_stop_dvr(tda);
|
||||
|
||||
assert(tdmi->tdmi_scan_queue == NULL);
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue