new action if /dev/dsp can't open, instead of sending to bytes to /dev/null.. lets immediately exit

1 files changed, 13 insertions, 2 deletions

diff --git a/core/multimedia/opieplayer/audiodevice.cpp b/core/multimedia/opieplayer/audiodevice.cpp
index faadd72..8f04d0d 100644
--- a/core/multimedia/opieplayer/audiodevice.cpp
+++ b/core/multimedia/opieplayer/audiodevice.cpp
@@ -21,14 +21,19 @@
 
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
+#include <qmessagebox.h>
+
 #include "audiodevice.h"
 
+
+#include <errno.h>
+
 #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP)
 #include "qpe/qcopenvelope_qws.h"
 #endif
 
 // #ifdef Q_WS_WIN
 // #include <windows.h>
@@ -206,14 +211,20 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) {
 
     
 #ifdef KEEP_DEVICE_OPEN
     if ( AudioDevicePrivate::dspFd == 0 ) {
 #endif
         if ( ( d->handle = ::open( "/dev/dsp", O_WRONLY ) ) < 0 ) {
-            perror("open(\"/dev/dsp\") sending to /dev/null instead");
-            d->handle = ::open( "/dev/null", O_WRONLY );
+
+//            perror("open(\"/dev/dsp\") sending to /dev/null instead");
+        perror("open(\"/dev/dsp\")");
+        QString errorMsg=tr("Somethin's wrong with\nyour sound device.\nopen(\"/dev/dsp\")\n")+(QString)strerror(errno)+tr("\n\nClosing player now.");
+        QMessageBox::critical(0, "Vmemo", errorMsg, tr("Abort"));
+        exit(-1); //harsh?
+//            d->handle = ::open( "/dev/null", O_WRONLY );
+          // WTF?!?!
         }
 #ifdef KEEP_DEVICE_OPEN 
         AudioDevicePrivate::dspFd = d->handle;
     } else {
         d->handle = AudioDevicePrivate::dspFd;
     }