Adaptions for QT_QWS_DEVFS

3 files changed, 21 insertions, 4 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
@@ -82,25 +82,29 @@ public:
 #endif
 
 
 int AudioDevicePrivate::dspFd = 0;
 bool AudioDevicePrivate::muted = FALSE;
 unsigned int AudioDevicePrivate::leftVolume = 0;
 unsigned int AudioDevicePrivate::rightVolume = 0;
 
 
 void AudioDevice::getVolume( unsigned int& leftVolume, unsigned int& rightVolume, bool &muted ) {
     muted = AudioDevicePrivate::muted;
     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 ) {
         if(ioctl( mixerHandle, MIXER_READ(0), &volume )==-1)
             perror("ioctl(\"MIXER_READ\")");
         close( mixerHandle );
     } else
         perror("open(\"/dev/mixer\")");
     leftVolume  = ((volume & 0x00FF) << 16) / 101;
     rightVolume = ((volume & 0xFF00) <<  8) / 101;
 }
 
 
 void AudioDevice::setVolume( unsigned int leftVolume, unsigned int rightVolume, bool muted ) {
@@ -112,25 +116,29 @@ void AudioDevice::setVolume( unsigned int leftVolume, unsigned int rightVolume,
         rightVolume = 0;
     } else {
         leftVolume  = ( (int) leftVolume < 0 ) ? 0 : ((  leftVolume > 0xFFFF ) ? 0xFFFF :  leftVolume );
         rightVolume = ( (int)rightVolume < 0 ) ? 0 : (( rightVolume > 0xFFFF ) ? 0xFFFF : rightVolume );
     }
       // Volume can be from 0 to 100 which is 101 distinct values
     unsigned int rV = (rightVolume * 101) >> 16;
 
 # if 0
     unsigned int lV = (leftVolume  * 101) >> 16;
     unsigned int volume = ((rV << 8) & 0xFF00) | (lV & 0x00FF);
     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)
             perror("ioctl(\"MIXER_WRITE\")");
         close( mixerHandle );
     } else
         perror("open(\"/dev/mixer\")");
 
 # else
       // This is the way this has to be done now I guess, doesn't allow for
       // independant right and left channel setting, or setting for different outputs
     Config cfg("qpe"); // qtopia is "Sound"
     cfg.setGroup("Volume"); // qtopia is "Settings"
     cfg.writeEntry("VolumePercent",(int)rV); //qtopia is Volume
@@ -159,33 +167,34 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) {
     else if( bps <= 0) format = AFMT_S16_LE;
     else format = AFMT_S16_LE;
     //    qDebug("AD- freq %d, channels %d, b/sample %d, bitrate %d",f,chs,bps,format);
     connect( qApp, SIGNAL( volumeChanged(bool) ), this, SLOT( volumeChanged(bool) ) );
 
     int fragments = 0x10000 * 8 + sound_fragment_shift;
     int capabilities = 0;
 
     
 #ifdef KEEP_DEVICE_OPEN
     if ( AudioDevicePrivate::dspFd == 0 ) {
 #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\")");
         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;
     }
 #endif
 
     if(ioctl( d->handle, SNDCTL_DSP_GETCAPS, &capabilities )==-1)
         perror("ioctl(\"SNDCTL_DSP_GETCAPS\")");
     if(ioctl( d->handle, SNDCTL_DSP_SETFRAGMENT, &fragments )==-1)
         perror("ioctl(\"SNDCTL_DSP_SETFRAGMENT\")");
diff --git a/core/multimedia/opieplayer/libflash/libflashplugin.cpp b/core/multimedia/opieplayer/libflash/libflashplugin.cpp
index 538c695..78cf555 100644
--- a/core/multimedia/opieplayer/libflash/libflashplugin.cpp
+++ b/core/multimedia/opieplayer/libflash/libflashplugin.cpp
@@ -142,25 +142,29 @@ bool LibFlashPlugin::open( const QString& fileName ) {
 
     if (!(file = FlashNew()))
 	    exit(1);
 
     do
 	status = FlashParse(file, 0, buffer, size);
     while (status & FLASH_PARSE_NEED_DATA);
 
     free(buffer);
     FlashGetInfo(file, &fi);
     //FlashSettings(flashHandle, PLAYER_LOOP);
     FlashGraphicInit(file, fd);
+#ifdef QT_QWS_DEVFS
+    FlashSoundInit(file, "/dev/sound/dsp");
+#else
     FlashSoundInit(file, "/dev/dsp");
+#endif
     FlashSetGetUrlMethod(file, showUrl, 0);
     FlashSetGetSwfMethod(file, getSwf, (void*)file);
 
     printf("opened file\n");
 }
 
 // If decoder doesn't support audio then return 0 here
 bool LibFlashPlugin::audioSetSample( long sample, int stream ) { return TRUE; }
 long LibFlashPlugin::audioGetSample( int stream ) { return 0; }
 //bool LibFlashPlugin::audioReadMonoSamples( short *output, long samples, long& samplesRead, int stream ) { return TRUE; }
 //bool LibFlashPlugin::audioReadStereoSamples( short *output, long samples, long& samplesRead, int stream ) { return FALSE; }
 bool LibFlashPlugin::audioReadSamples( short *output, int channels, long samples, long& samplesRead, int stream ) { return FALSE; }
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index efea385..b393230 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -1363,26 +1363,30 @@ void PlayListWidget::keyPressEvent( QKeyEvent *)
 //       case Key_P: //play
 //           qDebug("Play");
 //           playSelected();
 //           break;
 //       case Key_Space:
 //           qDebug("Play");
 //           playSelected();
 //           break;
 //     }
 }
 
 void PlayListWidget::doBlank() {
-   //    qDebug("do blanking");
+	// TODO: why do we blank this way, why don't we use ODevice or ScreenSaver?
+#ifdef QT_QWS_DEVFS
+   fd=open("/dev/fb/0",O_RDWR);
+#else
    fd=open("/dev/fb0",O_RDWR);
+#endif
    if (fd != -1) {
       ioctl(fd,FBIOBLANK,1);
       //            close(fd);
    }
 }
 
 void PlayListWidget::doUnblank() {
    // this crashes opieplayer with a segfault
    //      int fd;
    //       fd=open("/dev/fb0",O_RDWR);
    //    qDebug("do unblanking");
    if (fd != -1) {