Add reject filter to streaming_queue_init()

Implement streaming_queue_deinit()

diff --git a/src/dvr/dvr_rec.c b/src/dvr/dvr_rec.c
index 003a1d85c631c72802095918c745f1989b492d3a..051836fa94430a3f173750124801c3213ff16e3c 100644 (file)
--- a/src/dvr/dvr_rec.c
+++ b/src/dvr/dvr_rec.c
@@ -65,7 +65,7 @@ dvr_rec_subscribe(dvr_entry_t *de)
 
   snprintf(buf, sizeof(buf), "DVR: %s", de->de_title);
 
-  streaming_queue_init(&de->de_sq);
+  streaming_queue_init(&de->de_sq, 0);
 
   pthread_create(&de->de_thread, NULL, dvr_thread, de);
 

diff --git a/src/serviceprobe.c b/src/serviceprobe.c
index 777a3c86daa3dbf2bcc52e0cfde6fe42a5576123..1c7494934b25451cf800333096e0a889aaa9aab9 100644 (file)
--- a/src/serviceprobe.c
+++ b/src/serviceprobe.c
@@ -91,7 +91,7 @@ serviceprobe_thread(void *aux)
 
   pthread_mutex_lock(&global_lock);
 
-  streaming_queue_init(&sq);
+  streaming_queue_init(&sq, 0);
 
   while(1) {
 

diff --git a/src/streaming.c b/src/streaming.c
index b7b1770b5fde4aea4142b14d39f327bd75c61736..21954474927b24180a616ee7fafaa796b33ee3c1 100644 (file)
--- a/src/streaming.c
+++ b/src/streaming.c
@@ -62,9 +62,9 @@ streaming_queue_deliver(void *opauqe, streaming_message_t *sm)
  *
  */
 void
-streaming_queue_init(streaming_queue_t *sq)
+streaming_queue_init(streaming_queue_t *sq, int reject_filter)
 {
-  streaming_target_init(&sq->sq_st, streaming_queue_deliver, sq, 0);
+  streaming_target_init(&sq->sq_st, streaming_queue_deliver, sq, reject_filter);
 
   pthread_mutex_init(&sq->sq_mutex, NULL);
   pthread_cond_init(&sq->sq_cond, NULL);
@@ -72,6 +72,18 @@ streaming_queue_init(streaming_queue_t *sq)
 }
 
 
+/**
+ *
+ */
+void
+streaming_queue_deinit(streaming_queue_t *sq)
+{
+  streaming_queue_clear(&sq->sq_queue);
+  pthread_mutex_destroy(&sq->sq_mutex);
+  pthread_cond_destroy(&sq->sq_cond);
+}
+
+
 /**
  *
  */

diff --git a/src/streaming.h b/src/streaming.h
index 7a439bba16343408f78c426f06d30b4fd97106cf..c13b53183ec33828b636f455981f2abed34a39ae 100644 (file)
--- a/src/streaming.h
+++ b/src/streaming.h
@@ -62,10 +62,12 @@ void streaming_target_init(streaming_target_t *st,
                           st_callback_t *cb, void *opaque,
                           int reject_filter);
 
-void streaming_queue_init(streaming_queue_t *sq);
+void streaming_queue_init(streaming_queue_t *sq, int reject_filter);
 
 void streaming_queue_clear(struct streaming_message_queue *q);
 
+void streaming_queue_deinit(streaming_queue_t *sq);
+
 void streaming_target_connect(streaming_pad_t *sp, streaming_target_t *st);
 
 void streaming_target_disconnect(streaming_pad_t *sp, streaming_target_t *st);