diff options
author | Max Horn | 2003-07-31 12:33:33 +0000 |
---|---|---|
committer | Max Horn | 2003-07-31 12:33:33 +0000 |
commit | 1b52e9f19cec1693dc9331b0d503aff07f507427 (patch) | |
tree | b58aeeb9e9156a9c3b7477c6116da3f78ee07675 /backends/x11/x11.cpp | |
parent | f7ee6d2ce10fb215067ee1a32d4cb124aaa881af (diff) | |
download | scummvm-rg350-1b52e9f19cec1693dc9331b0d503aff07f507427.tar.gz scummvm-rg350-1b52e9f19cec1693dc9331b0d503aff07f507427.tar.bz2 scummvm-rg350-1b52e9f19cec1693dc9331b0d503aff07f507427.zip |
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)
svn-id: r9327
Diffstat (limited to 'backends/x11/x11.cpp')
-rw-r--r-- | backends/x11/x11.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/backends/x11/x11.cpp b/backends/x11/x11.cpp index 026dbeb148..f146f02824 100644 --- a/backends/x11/x11.cpp +++ b/backends/x11/x11.cpp @@ -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 @@ static void *sound_and_music_thread(void *params) 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 @@ uint32 OSystem_X11::property(int param, Property *value) { switch (param) { case PROP_GET_SAMPLE_RATE: - return 22050; + return SAMPLES_PER_SEC; case PROP_GET_FULLSCREEN: return 0; } |