summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuenter Bartsch <guenter@users.sourceforge.net>2001-08-25 07:51:24 +0000
committerGuenter Bartsch <guenter@users.sourceforge.net>2001-08-25 07:51:24 +0000
commitf26cc59ce1190093f886330f100d2c609339dc7e (patch)
tree016fbf9db7bb82a65d4f49ebce8153585ebb3991
parent61b6b1fc20e889b1bd2e440d59f2728ee8a70aea (diff)
downloadxine-lib-f26cc59ce1190093f886330f100d2c609339dc7e.tar.gz
xine-lib-f26cc59ce1190093f886330f100d2c609339dc7e.tar.bz2
small cleanups and fixes for new pause implementation
CVS patchset: 484 CVS date: 2001/08/25 07:51:24
-rw-r--r--src/xine-engine/audio_decoder.c8
-rw-r--r--src/xine-engine/xine.c3
2 files changed, 7 insertions, 4 deletions
diff --git a/src/xine-engine/audio_decoder.c b/src/xine-engine/audio_decoder.c
index ca701d0ad..7760d087b 100644
--- a/src/xine-engine/audio_decoder.c
+++ b/src/xine-engine/audio_decoder.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: audio_decoder.c,v 1.29 2001/08/25 07:12:16 guenter Exp $
+ * $Id: audio_decoder.c,v 1.30 2001/08/25 07:51:24 guenter Exp $
*
*
* functions that implement audio decoding
@@ -27,9 +27,11 @@
#include "config.h"
#endif
+#include <sched.h>
+#include <unistd.h>
+
#include "xine_internal.h"
#include "monitor.h"
-#include <sched.h>
void *audio_decoder_loop (void *this_gen) {
@@ -229,7 +231,7 @@ void audio_decoder_shutdown (xine_t *this) {
buf->type = BUF_CONTROL_QUIT;
this->audio_fifo->put (this->audio_fifo, buf);
- pthread_join (this->audio_thread, &p);
+ pthread_join (this->audio_thread, &p);
}
}
diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c
index 3760af606..3067e88d1 100644
--- a/src/xine-engine/xine.c
+++ b/src/xine-engine/xine.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: xine.c,v 1.48 2001/08/25 07:12:16 guenter Exp $
+ * $Id: xine.c,v 1.49 2001/08/25 07:51:24 guenter Exp $
*
* top-level xine functions
*
@@ -320,6 +320,7 @@ void xine_exit (xine_t *this) {
printf ("xine_exit: shutdown audio\n");
+ this->audio_mute = 1;
audio_decoder_shutdown (this);
printf ("xine_exit: shutdown video\n");