[xine-cvs] CVS: xine-lib/src/libspudec spu_decoder_api.h,1.21,1.22 xine_decoder.c,1.76,1.77

[Michael R. <mr...@us...>]

Update of /cvsroot/xine/xine-lib/src/libspudec
In directory usw-pr-cvs1:/tmp/cvs-serv21069/src/libspudec

Modified Files:
	spu_decoder_api.h xine_decoder.c 
Log Message:
why void *, it is a pci_t *


Index: spu_decoder_api.h
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libspudec/spu_decoder_api.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- spu_decoder_api.h	18 Sep 2002 06:42:23 -0000	1.21
+++ spu_decoder_api.h	18 Sep 2002 15:39:51 -0000	1.22
@@ -25,9 +25,6 @@
 #define HAVE_SPU_API_H
 
 #define SPU_DECODER_IFACE_VERSION 9
-/* FIXME: Needed for spu_button_t */
-/* But will not be on all users's systems. (From the libspudec directory or libdvdread). */
-//#include "nav_types.h"
 
 /*
  * generic xine spu decoder plugin interface
@@ -53,7 +50,7 @@
 
   void (*dispose) (spu_decoder_t *this);
 
-  int (*get_nav_pci) (spu_decoder_t *this, void *nav_pci);
+  int (*get_nav_pci) (spu_decoder_t *this, pci_t *nav_pci);
 
 };
 

Index: xine_decoder.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libspudec/xine_decoder.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- xine_decoder.c	18 Sep 2002 04:20:09 -0000	1.76
+++ xine_decoder.c	18 Sep 2002 15:39:51 -0000	1.77
@@ -295,15 +295,14 @@
 /* This is not perfectly in sync with the display, but all the same, */
 /* much closer than doing it at the input stage. */
 /* returns a bool for error/success.*/
-static int spudec_get_nav_pci (spu_decoder_t *this_gen, void *pci) {
+static int spudec_get_nav_pci (spu_decoder_t *this_gen, pci_t *pci) {
   spudec_decoder_t *this  = (spudec_decoder_t *) this_gen;
-  pci_t *nav_pci = (pci_t *) pci;
 
-  if (!this || !nav_pci) 
+  if (!this || !pci) 
     return 0;
  
   pthread_mutex_lock(&this->nav_pci_lock);
-  memcpy(nav_pci, &this->pci, sizeof(pci_t) );
+  memcpy(pci, &this->pci, sizeof(pci_t) );
   pthread_mutex_unlock(&this->nav_pci_lock);
   return 1;