[Scummvm-cvs-logs] CVS: scummvm x11.cpp,1.2,1.3

Lionel Ulmer bbrox at users.sourceforge.net
Wed Mar 6 15:15:04 CET 2002


Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv20070

Modified Files:
	x11.cpp 
Log Message:
Remove too strict error checking that prevented debugging.



Index: x11.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/x11.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** x11.cpp	6 Mar 2002 12:24:56 -0000	1.2
--- x11.cpp	6 Mar 2002 23:14:16 -0000	1.3
***************
*** 46,51 ****
  #include <sys/ioctl.h>
  
- #undef BUILD_FOR_IPAQ
- 
  Scumm scumm;
  ScummDebugger debugger;
--- 46,49 ----
***************
*** 148,151 ****
--- 146,150 ----
    while (1) {
      unsigned short *buf = (unsigned short *) sound_buffer;
+     int size, written;
  
      scumm.mixWaves((short *) sound_buffer, FRAG_SIZE >> 2);
***************
*** 154,160 ****
        buf[2 * i + 1] = buf[2 * i] = buf[i];
      }
!     if (write(sound_fd, sound_buffer, FRAG_SIZE) != FRAG_SIZE) {
!       error("Bad write to the audio device !\n");
!       exit(1);
      }
    }
--- 153,160 ----
        buf[2 * i + 1] = buf[2 * i] = buf[i];
      }
!     size = FRAG_SIZE;
!     while (size > 0) {
!       written = write(sound_fd, sound_buffer, size);
!       size -= written;
      }
    }





More information about the Scummvm-git-logs mailing list