anna/ocarina
1
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

audio: Change state to NULL before quitting

Browse Source 
This prevents a possible hang when de-initializing gstreamer.

Signed-off-by: Anna Schumaker <schumaker.anna@gmail.com>
This commit is contained in:
Anna Schumaker 2014-01-22 19:27:36 -05:00 committed by Anna Schumaker
parent aa21ab5602
commit 22cb20d4ce
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/audio.cpp
View File

@ -107,6 +107,7 @@ void audio :: init(int *argc, char ***argv)
void audio :: quit() void audio :: quit()
{ {
change_state(GST_STATE_NULL);
gst_deinit(); gst_deinit();
} }

5
tests/audio/audio.cpp
View File

@ -208,7 +208,8 @@ int main(int argc, char **argv)
test_0(); test_0();
/* Read in library, set up a playlist */ /* Read in library, set up a playlist */
library :: init(); library::init();
deck::init();
library :: reset(); library :: reset();
library :: add_path("/tmp/library/0"); library :: add_path("/tmp/library/0");
while (idle :: run_task()); while (idle :: run_task());
@ -220,6 +221,6 @@ int main(int argc, char **argv)
test_1(); test_1();
test_2(); test_2();
//audio :: quit(); audio :: quit();
return 0; return 0;
} }