[Scummvm-cvs-logs] CVS: scummvm/backends/x11 x11.cpp,1.15,1.16
Max Horn
fingolfin at users.sourceforge.net
Thu Jul 31 05:34:08 CEST 2003
Update of /cvsroot/scummvm/scummvm/backends/x11
In directory sc8-pr-cvs1:/tmp/cvs-serv5146/backends/x11
Modified Files:
x11.cpp
Log Message:
added new header file backends/intern.h; removed some stuff from common/system.h which is either only of interest to backends or code instantiating a backend (->backends/intern.h); also removed fmopl specific enums (->sound/fmopl.h)
Index: x11.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/x11/x11.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- x11.cpp 22 Jul 2003 20:36:43 -0000 1.15
+++ x11.cpp 31 Jul 2003 12:33:32 -0000 1.16
@@ -22,6 +22,7 @@
/* The bare pure X11 port done by Lionel 'BBrox' Ulmer */
+#include "backends/intern.h"
#include "common/util.h"
#include "common/engine.h" // Only #included for error() and warning()
@@ -254,13 +255,13 @@
error("Stereo mode not supported !\n");
exit(1);
}
- param = 22050;
+ param = SAMPLES_PER_SEC;
if (ioctl(sound_fd, SNDCTL_DSP_SPEED, ¶m) == -1) {
perror("Error in the SNDCTL_DSP_SPEED ioctl !\n");
exit(1);
}
- if (param != 22050) {
- error("22050 kHz not supported !\n");
+ if (param != SAMPLES_PER_SEC) {
+ error("%d kHz not supported !\n", SAMPLES_PER_SEC);
exit(1);
}
if (ioctl(sound_fd, SNDCTL_DSP_GETOSPACE, &info) != 0) {
@@ -788,7 +789,7 @@
{
switch (param) {
case PROP_GET_SAMPLE_RATE:
- return 22050;
+ return SAMPLES_PER_SEC;
case PROP_GET_FULLSCREEN:
return 0;
}
More information about the Scummvm-git-logs
mailing list