3 files changed, 27 insertions, 0 deletions

diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp
index 7b4bfd9..e6afbd8 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp
@@ -276,17 +276,21 @@ void MediaPlayer::timerEvent( QTimerEvent * ) {
                 p.drawRect( (w - 200) / 2 + i * 20 + 3, h - yoff + 50, 3, 10 );
             }
         }
     }
 }
 
 
 void MediaPlayer::blank( bool b ) {
+#ifdef QT_QWS_DEVFS
+    fd=open("/dev/fb/0",O_RDWR);
+#else
     fd=open("/dev/fb0",O_RDWR);
+#endif
 #ifdef QT_QWS_SL5XXX
     fl= open( "/dev/fl", O_RDWR );
 #endif
     if (fd != -1) {
         if ( b ) {
             odebug << "do blanking" << oendl; 
 #ifdef QT_QWS_SL5XXX
             ioctl( fd, FBIOBLANK, 1 );
diff --git a/noncore/multimedia/opierec/device.cpp b/noncore/multimedia/opierec/device.cpp
index 683f0a5..cb47b77 100644
--- a/noncore/multimedia/opierec/device.cpp
+++ b/noncore/multimedia/opierec/device.cpp
@@ -70,17 +70,21 @@ qDebug( "Opening %s",dspstr);
               QString errorMsg="Could not open audio device\n /dev/dsp\n"
                   +(QString)strerror(errno);
               qDebug( "XXXXXXXXXXXXXXXXXXXXXXX  "+errorMsg );
               return -1;
           }
 
 qDebug( "Opening mixer" );
     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
             perror("open(\"/dev/mixer\")");
               QString errorMsg="Could not open audio device\n /dev/dsp\n"
                   +(QString)strerror(errno);
               qDebug( "XXXXXXXXXXXXXXXXXXXXXX  "+errorMsg );
         }
 
         if(ioctl(sd,SNDCTL_DSP_RESET,0)<0){
             perror("ioctl RESET");
@@ -163,49 +167,61 @@ int Device::getInVolume() {
     cfg.setGroup("Volume");
 
     return cfg.readNumEntry("Mic");
 }
 
 void Device::changedOutVolume(int vol) {
     int level = (vol << 8) + vol;
     int fd = 0;
+#ifdef QT_QWS_DEVFS
+    if ((fd = open("/dev/sound/mixer", O_RDWR))>=0) {
+#else
     if ((fd = open("/dev/mixer", O_RDWR))>=0) {
+#endif
         if(ioctl(fd, MIXER_WRITE(SOUND_MIXER_VOLUME), &level) == -1)
             perror("ioctl(\"MIXER_IN_WRITE\")");
 
         Config cfg("qpe");
         cfg.setGroup("Volume");
         cfg.writeEntry("VolumePercent", QString::number( vol ));
         QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << false;
         qDebug("changing output vol %d" ,vol );
     }
     ::close(fd);
 }
 
 void Device::changedInVolume(int vol ) {
     int level = (vol << 8) + vol;
     int fd = 0;
+#ifdef QT_QWS_DEVFS
+    if ((fd = open("/dev/sound/mixer", O_RDWR))>=0) {
+#else
     if ((fd = open("/dev/mixer", O_RDWR))>=0) {
+#endif
         if(ioctl(fd, MIXER_WRITE(SOUND_MIXER_MIC), &level) == -1)
             perror("ioctl(\"MIXER_IN_WRITE\")");
         Config cfg("qpe");
         cfg.setGroup("Volume");
         cfg.writeEntry("Mic", QString::number(vol ));
         QCopEnvelope( "QPE/System", "micChange(bool)" ) << false;
         qDebug("changing input volume %d",vol);
     }
     ::close(fd);
 }
 
 bool Device::selectMicInput() {
 
   int md=0;
   int info=MIXER_WRITE(SOUND_MIXER_MIC);
+#ifdef QT_QWS_DEVFS
+  md = ::open(  "/dev/sound/mixer", O_RDWR );
+#else
   md = ::open(  "/dev/mixer", O_RDWR );
+#endif
   if ( md == -1)
   perror("open(\"/dev/mixer\")");
   else {
   if( ioctl( md, SOUND_MIXER_WRITE_RECSRC, &info) == -1)
   perror("ioctl(\"SOUND_MIXER_WRITE_RECSRC\")");
   ::close(md);
   return false;
   }
diff --git a/noncore/multimedia/opierec/qtrec.cpp b/noncore/multimedia/opierec/qtrec.cpp
index 1141faa..c237726 100644
--- a/noncore/multimedia/opierec/qtrec.cpp
+++ b/noncore/multimedia/opierec/qtrec.cpp
@@ -74,20 +74,27 @@ static int deviceBitRates[] = { 8, 16, -1 };
 #define DSPSTRMIXERIN "/dev/mixer1"
 #else
 #define DSPSTRIN "/dev/dsp"
 #define DSPSTRMIXERIN "/dev/mixer"
 #endif
 
 #else
 
+#ifdef QT_QWS_DEVFS
+#define DSPSTROUT "/dev/sound/dsp"
+#define DSPSTRIN "/dev/sound/dsp"
+#define DSPSTRMIXERIN "/dev/sound/mixer"
+#define DSPSTRMIXEROUT "/dev/sound/mixer"
+#else
 #define DSPSTROUT "/dev/dsp"
 #define DSPSTRIN "/dev/dsp"
 #define DSPSTRMIXERIN "/dev/mixer"
 #define DSPSTRMIXEROUT "/dev/mixer"
+#endif
 
 #endif
 
 //#define ZAURUS 0
 struct adpcm_state encoder_state;
 struct adpcm_state decoder_state;
 
 typedef struct {