summaryrefslogtreecommitdiff
path: root/src/xine-engine/xine.c
diff options
context:
space:
mode:
authorRich J Wareham <richwareham@users.sourceforge.net>2001-06-18 09:39:05 +0000
committerRich J Wareham <richwareham@users.sourceforge.net>2001-06-18 09:39:05 +0000
commit32693b7bdcac89e60654ad3f01d1739be45c1d1f (patch)
tree29f31b90f6e3ad64ca609788f79379a081e11426 /src/xine-engine/xine.c
parent7ab2e7c31144b68d3f550e470fd2d1cc9dc441d7 (diff)
downloadxine-lib-32693b7bdcac89e60654ad3f01d1739be45c1d1f.tar.gz
xine-lib-32693b7bdcac89e60654ad3f01d1739be45c1d1f.tar.bz2
Added first step towards integrating SPU decoder into the new framework.
CVS patchset: 207 CVS date: 2001/06/18 09:39:05
Diffstat (limited to 'src/xine-engine/xine.c')
-rw-r--r--src/xine-engine/xine.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c
index 1844d0974..142a29452 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.26 2001/06/17 19:14:26 guenter Exp $
+ * $Id: xine.c,v 1.27 2001/06/18 09:39:05 richwareham Exp $
*
* top-level xine functions
*
@@ -325,6 +325,10 @@ void xine_exit (xine_t *this) {
pthread_mutex_unlock (&this->xine_lock);
+ printf ("xine_exit: shutdown spu\n");
+
+ spu_decoder_shutdown (this);
+
printf ("xine_exit: shutdown audio\n");
audio_decoder_shutdown (this);
@@ -430,10 +434,7 @@ xine_t *xine_init (vo_driver_t *vo,
/*
* init SPU decoder
*/
-
-
- this->spu_fifo = fifo_buffer_new (1000, 4096);
- /* FIXME spudec_init(NULL); */
+ spu_decoder_init (this);
return this;
}