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

profile: improve prch_sq destroy

Browse source
This commit is contained in:
Jaroslav Kysela 2015-03-11 15:09:29 +01:00
parent 9dbaa441f3
commit ffa0639149
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/profile.c
View file

@ -680,6 +680,7 @@ profile_chain_init(profile_chain_t *prch, profile_t *pro, void *id)
prch->prch_pro = pro;
prch->prch_id = id;
streaming_queue_init(&prch->prch_sq, 0, 0);
prch->prch_sq_used = 1;
LIST_INSERT_HEAD(&profile_chains, prch, prch_link);
prch->prch_linked = 1;
prch->prch_stop = 1;
@ -738,6 +739,7 @@ profile_chain_raw_open(profile_chain_t *prch, void *id, size_t qsize)
prch->prch_id = id;
prch->prch_flags = SUBSCRIPTION_RAW_MPEGTS;
streaming_queue_init(&prch->prch_sq, SMT_PACKET, qsize);
prch->prch_sq_used = 1;
prch->prch_st = &prch->prch_sq.sq_st;
prch->prch_muxer = muxer_create(&c);
return 0;
@ -772,8 +774,12 @@ profile_chain_close(profile_chain_t *prch)
prch->prch_st = NULL;
if (prch->prch_linked) {
if (prch->prch_sq_used) {
streaming_queue_deinit(&prch->prch_sq);
prch->prch_sq_used = 0;
}
if (prch->prch_linked) {
LIST_REMOVE(prch, prch_link);
prch->prch_linked = 0;
}
@ -782,6 +788,8 @@ profile_chain_close(profile_chain_t *prch)
profile_release(prch->prch_pro);
prch->prch_pro = NULL;
}
prch->prch_id = NULL;
}
/*

1
src/profile.h
View file

@ -74,6 +74,7 @@ typedef struct profile_chain {
int prch_flags;
int prch_stop;
int prch_start_pending;
int prch_sq_used;
struct streaming_queue prch_sq;
struct streaming_target *prch_post_share;
struct streaming_target *prch_st;