From 22cb20d4cedd1276a2997c49e09b6f58beeac922 Mon Sep 17 00:00:00 2001
From: Anna Schumaker <schumaker.anna@gmail.com>
Date: Wed, 22 Jan 2014 19:27:36 -0500
Subject: [PATCH] audio: Change state to NULL before quitting

This prevents a possible hang when de-initializing gstreamer.

Signed-off-by: Anna Schumaker <schumaker.anna@gmail.com>
---
 lib/audio.cpp         | 1 +
 tests/audio/audio.cpp | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/audio.cpp b/lib/audio.cpp
index 790644e0..7ccd1347 100644
--- a/lib/audio.cpp
+++ b/lib/audio.cpp
@@ -107,6 +107,7 @@ void audio :: init(int *argc, char ***argv)
 
 void audio :: quit()
 {
+	change_state(GST_STATE_NULL);
 	gst_deinit();
 }
 
diff --git a/tests/audio/audio.cpp b/tests/audio/audio.cpp
index a67222e6..c705724c 100644
--- a/tests/audio/audio.cpp
+++ b/tests/audio/audio.cpp
@@ -208,7 +208,8 @@ int main(int argc, char **argv)
 	test_0();
 
 	/* Read in library, set up a playlist */
-	library :: init();
+	library::init();
+	deck::init();
 	library :: reset();
 	library :: add_path("/tmp/library/0");
 	while (idle :: run_task());
@@ -220,6 +221,6 @@ int main(int argc, char **argv)
 	test_1();
 	test_2();
 
-	//audio :: quit();
+	audio :: quit();
 	return 0;
 }