[prev in list] [next in list] [prev in thread] [next in thread] 

List:       xine-cvslog
Subject:    [xine-cvs] CVS: xine-vcdnav/input xineplug_inp_cd.c,1.50,1.51
From:       Rocky Bernstein <rockyb () users ! sourceforge ! net>
Date:       2005-01-30 7:11:18
Message-ID: E1Cv9Es-0000gv-L3 () sc8-pr-cvs1 ! sourceforge ! net
[Download RAW message or body]

Update of /cvsroot/xine/xine-vcdnav/input
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2441/input

Modified Files:
	xineplug_inp_cd.c 
Log Message:
paranoia now tested (sort of) and working. 


Index: xineplug_inp_cd.c
===================================================================
RCS file: /cvsroot/xine/xine-vcdnav/input/xineplug_inp_cd.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- xineplug_inp_cd.c	30 Jan 2005 04:15:39 -0000	1.50
+++ xineplug_inp_cd.c	30 Jan 2005 07:11:15 -0000	1.51
@@ -932,8 +932,7 @@
   }
   
   if ( this->v_config.b_paranoia && this->class->paranoia ) {
-    uint16_t *p_data = (uint16_t *) frame_data;
-    p_data = cdio_paranoia_read(this->class->paranoia, NULL);
+    uint16_t *p_data = cdio_paranoia_read(this->class->paranoia, NULL);
     char *psz_err = cdio_cddap_errors(this->class->paranoia_cd);
     char *psz_mes = cdio_cddap_messages(this->class->paranoia_cd);
     
@@ -946,6 +945,7 @@
       LOG_ERR( "paranoia read error on frame %i\n", this->i_lsn++ );
       return NULL;
     }
+    memcpy(frame_data, p_data, CDIO_CD_FRAMESIZE_RAW);
   } else {
     if (cdio_read_audio_sector(this->class->p_cdio, frame_data, 
 			       this->i_lsn++)) {
@@ -1722,14 +1722,14 @@
   
 #endif /*HAVE_LIBCDDB*/
 
-  if (class->v_config.b_paranoia) {
+  if (this->v_config.b_paranoia) {
     class->paranoia_cd = cdio_cddap_identify_cdio(p_cdio, 1, NULL);
     /* We'll set for verbose paranoia messages. */
     cdio_cddap_verbose_set(class->paranoia_cd, CDDA_MESSAGE_PRINTIT, 
 			   CDDA_MESSAGE_PRINTIT);
     if ( 0 != cdio_cddap_open(class->paranoia_cd) ) {
       LOG_MSG( "Unable to get paranoia support - continuing without it." );
-      class->v_config.b_paranoia = false;
+      this->v_config.b_paranoia = false;
     } else {
       class->paranoia = cdio_paranoia_init(class->paranoia_cd);
       



-------------------------------------------------------
This SF.Net email is sponsored by: IntelliVIEW -- Interactive Reporting
Tool for open source databases. Create drag-&-drop reports. Save time
by over 75%! Publish reports on the web. Export to DOC, XLS, RTF, etc.
Download a FREE copy at http://www.intelliview.com/go/osdn_nl
_______________________________________________
Xine-cvslog mailing list
Xine-cvslog@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xine-cvslog
[prev in list] [next in list] [prev in thread] [next in thread]