1 files changed, 12 insertions, 3 deletions

diff --git a/core/multimedia/opieplayer/audiodevice.cpp b/core/multimedia/opieplayer/audiodevice.cpp
index d01d2ba..6a38fc9 100644
--- a/core/multimedia/opieplayer/audiodevice.cpp
+++ b/core/multimedia/opieplayer/audiodevice.cpp
@@ -93,3 +93,7 @@ void AudioDevice::getVolume( unsigned int& leftVolume, unsigned int& rightVolume
     unsigned int volume;
+#ifdef QT_QWS_DEVFS
+    int mixerHandle = open( "/dev/sound/mixer", O_RDWR );
+#else
     int mixerHandle = open( "/dev/mixer", O_RDWR );
+#endif
     if ( mixerHandle >= 0 ) {
@@ -123,3 +127,7 @@ void AudioDevice::setVolume( unsigned int leftVolume, unsigned int rightVolume,
     int mixerHandle = 0;
+#ifdef QT_QWS_DEVFS
+    if ( ( mixerHandle = open( "/dev/sound/mixer", O_RDWR ) ) >= 0 ) {
+#else
     if ( ( mixerHandle = open( "/dev/mixer", O_RDWR ) ) >= 0 ) {
+#endif
         if(ioctl( mixerHandle, MIXER_WRITE(0), &volume ) ==-1)
@@ -170,5 +178,8 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) {
 #endif
+#ifdef QT_QWS_DEVFS
+        if ( ( d->handle = ::open( "/dev/sound/dsp", O_WRONLY ) ) < 0 ) {
+#else
         if ( ( d->handle = ::open( "/dev/dsp", O_WRONLY ) ) < 0 ) {
+#endif
 
-//            perror("open(\"/dev/dsp\") sending to /dev/null instead");
         perror("open(\"/dev/dsp\")");
@@ -177,4 +188,2 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) {
         exit(-1); //harsh?
-//            d->handle = ::open( "/dev/null", O_WRONLY );
-          // WTF?!?!
         }