summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar waker <wakeroid@gmail.com>2012-11-25 22:08:34 +0100
committerGravatar waker <wakeroid@gmail.com>2012-11-25 22:08:34 +0100
commit82e3b823e1b42d7c5c04c4ec54ab60068311a598 (patch)
tree7046f98c8ee55e262024ddac57bedc95cd2a9982
parentb77b07311b729449e3c2d78741c4b0643fae6fad (diff)
added message queue instance to the streamer
-rw-r--r--streamer.c14
-rw-r--r--streamer.h3
2 files changed, 17 insertions, 0 deletions
diff --git a/streamer.c b/streamer.c
index c97014c4..8737ee3d 100644
--- a/streamer.c
+++ b/streamer.c
@@ -48,6 +48,7 @@
#include "ringbuf.h"
#include "replaygain.h"
#include "fft.h"
+#include "handler.h"
//#define trace(...) { fprintf(stderr, __VA_ARGS__); }
#define trace(fmt,...)
@@ -134,6 +135,9 @@ static DB_FILE *streamer_file;
static float freq_data[DDB_AUDIO_MEMORY_FRAMES];
static float audio_data[DDB_AUDIO_MEMORY_FRAMES];
+// message queue
+static struct handler_s *handler;
+
#if DETECT_PL_LOCK_RC
volatile pthread_t streamer_lock_tid = 0;
#endif
@@ -1748,6 +1752,7 @@ streamer_dsp_init (void) {
int
streamer_init (void) {
streaming_terminate = 0;
+ handler = handler_alloc (100);
#if WRITE_DUMP
out = fopen ("out.raw", "w+b");
#endif
@@ -1805,6 +1810,11 @@ streamer_free (void) {
eqplug = NULL;
eq = NULL;
+
+ if (handler) {
+ handler_free (handler);
+ handler = NULL;
+ }
}
void
@@ -2362,3 +2372,7 @@ streamer_set_streamer_playlist (playlist_t *plt) {
}
}
+struct handler_s *
+streamer_get_handler (void) {
+ return handler;
+}
diff --git a/streamer.h b/streamer.h
index aee63c35..0e14b1f2 100644
--- a/streamer.h
+++ b/streamer.h
@@ -145,4 +145,7 @@ audio_get_waveform_data (int type, float *data);
void
streamer_set_streamer_playlist (playlist_t *plt);
+struct handler_s *
+streamer_get_handler (void);
+
#endif // __STREAMER_H