soundcard descriptor mucking about

1 files changed, 23 insertions, 23 deletions

diff --git a/noncore/multimedia/opierec/device.cpp b/noncore/multimedia/opierec/device.cpp
index 5319d97..db2d63f 100644
--- a/noncore/multimedia/opierec/device.cpp
+++ b/noncore/multimedia/opierec/device.cpp
@@ -17,34 +17,34 @@ using namespace Opie::Core;
 #include <unistd.h>
 #include <sys/wait.h>
 #include <unistd.h>
 #include <errno.h>
 
 //extern QtRec *qperec;
 
 Device::Device( QObject * parent, const char * dsp, const char * mixr, bool record )
         : QObject( parent)
 {
     dspstr = (char *)dsp;
     mixstr = (char *)mixr;
- 
+
     devForm=-1;
     devCh=-1;
     devRate=-1;
 
     if( !record){ //playing
-        odebug << "setting up DSP for playing" << oendl; 
+        odebug << "setting up DSP for playing" << oendl;
         flags = O_WRONLY;
     } else { //recording
-        odebug << "setting up DSP for recording" << oendl; 
+        odebug << "setting up DSP for recording" << oendl;
         flags = O_RDWR;
 //        flags = O_RDONLY;
 
 //        selectMicInput();
 
     }
 }
 
 bool Device::openDsp() {
     if( openDevice( flags) == -1) {
         perror("<<<<<<<<<<<<<<ioctl(\"Open device\")");
         return false;
@@ -87,40 +87,40 @@ int Device::getInVolume() {
 
 void Device::changedOutVolume(int vol) {
     int level = (vol << 8) + vol;
     int fd = 0;
     if ((fd = open("/dev/mixer", O_RDWR))>=0) {
         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;
-	owarn << "changing output vol " << vol << "" << oendl; 
+	owarn << "changing output vol " << vol << "" << oendl;
     }
     ::close(fd);
 }
 
 void Device::changedInVolume(int vol ) {
     int level = (vol << 8) + vol;
     int fd = 0;
     if ((fd = open("/dev/mixer", O_RDWR))>=0) {
         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;
-	owarn << "changing input volume " << vol << "" << oendl; 
+	owarn << "changing input volume " << vol << "" << oendl;
     }
     ::close(fd);
 }
 
 bool Device::selectMicInput() {
 
   int md=0;
   int info=MIXER_WRITE(SOUND_MIXER_MIC);
   md = ::open(  "/dev/mixer", O_RDWR );
   if ( md == -1)
   perror("open(\"/dev/mixer\")");
   else {
@@ -140,56 +140,56 @@ int Device::openDevice( int flags) {
      int pipefd[2];
      char message[20];
      if (pipe(pipefd) == -1){
          perror ("Error creating pipe");
 exit(1);
      }
      switch (pid = fork()) {
        case -1:
            perror("The fork failed!");
            break;
        case 0: {
  */
-odebug << "Opening " << dspstr << "" << oendl; 
+odebug << "Opening " << dspstr << "" << oendl;
  if (( sd = ::open( dspstr, flags)) == -1) {
               perror("open(\"/dev/dsp\")");
               QString errorMsg="Could not open audio device\n /dev/dsp\n"
                   +(QString)strerror(errno);
-              odebug << "XXXXXXXXXXXXXXXXXXXXXXX  "+errorMsg << oendl; 
+              odebug << "XXXXXXXXXXXXXXXXXXXXXXX  "+errorMsg << oendl;
               return -1;
           }
 
-odebug << "Opening mixer" << oendl; 
+odebug << "Opening mixer" << oendl;
     int mixerHandle=0;
         if  (( mixerHandle = open("/dev/mixer",O_RDWR))<0) {
             perror("open(\"/dev/mixer\")");
               QString errorMsg="Could not open audio device\n /dev/dsp\n"
                   +(QString)strerror(errno);
-              odebug << "XXXXXXXXXXXXXXXXXXXXXX  "+errorMsg << oendl; 
+              odebug << "XXXXXXXXXXXXXXXXXXXXXX  "+errorMsg << oendl;
         }
 
         if(ioctl(sd,SNDCTL_DSP_RESET,0)<0){
             perror("ioctl RESET");
         }
 //           sprintf(message, "%d", sd);
 
 /*           QFile f1("/pid");
            f1.open(IO_WriteOnly );
            f1.writeBlock(message, strlen(message));
            f1.close();
  */
   /*               close(pipefd[0]);
                  write(pipefd[1], message, sizeof(message));
      close(pipefd[1]);
- //              odebug << "" << soundDevice->sd << "" << oendl; 
+ //              odebug << "" << soundDevice->sd << "" << oendl;
            _exit(0);
        }
        default:
           // pid greater than zero is parent getting the child's pid
            printf("Child's pid is %d\n",pid);
            QString s;
                 close(pipefd[1]);
                 read(pipefd[0], message, sizeof(message));
     s = message;
                  close(pipefd[0]);
 
 //     while(wait(NULL)!=pid)
@@ -197,74 +197,74 @@ odebug << "Opening mixer" << oendl;
            printf("child %ld terminated normally, return status is zero\n", (long) pid);
              */
        //    filePara.sd=(long) pid;
    /*        QFile f2("/pid");
            f2.open(IO_ReadOnly);
            QTextStream t(&f2);
  //                for(int f=0; f < t.atEnd() ;f++) {
            s = t.readLine();
  //               }
            */
 //     bool ok;
 //           sd = s.toInt(&ok, 10);
-//           odebug << "<<<<<<<<<<<<<>>>>>>>>>>>>"+s << oendl; 
-                 
+//           odebug << "<<<<<<<<<<<<<>>>>>>>>>>>>"+s << oendl;
+
 //           f2.close();
 //     }
 ::close(mixerHandle );
-//         odebug << "open device " << dspstr << "" << oendl; 
-//     odebug << "success! " << sd << "" << oendl; 
+//         odebug << "open device " << dspstr << "" << oendl;
+//     odebug << "success! " << sd << "" << oendl;
     return sd;
 }
 
 bool Device::closeDevice( bool) {
 //      if(b) {//close now
 //          if (ioctl( sd, SNDCTL_DSP_RESET, 0) == -1) {
 //              perror("ioctl(\"SNDCTL_DSP_RESET\")");
 //          }
 //      } else { //let play
 //          if (ioctl( sd, SNDCTL_DSP_SYNC, 0) == -1) {
 //              perror("ioctl(\"SNDCTL_DSP_SYNC\")");
 //          }
 //      }
 
     ::close( sd); //close sound device
 //    sdfd=0;
  //   sd=0;
-//    odebug << "closed dsp" << oendl; 
+//    odebug << "closed dsp" << oendl;
     return true;
 }
 
 bool Device::setDeviceFormat( int form) {
-    odebug << "set device res " << form << " " << sd << "" << oendl; 
+    odebug << "set device res " << form << " " << sd << "" << oendl;
     if (ioctl( sd, SNDCTL_DSP_SETFMT,  &form)==-1) { //set format
         perror("ioctl(\"SNDCTL_DSP_SETFMT\")");
         return false;
     }
     devRes=form;
     return true;
 }
 
 bool Device::setDeviceChannels( int ch) {
-    odebug << "set channels " << ch << " " << sd << "" << oendl; 
+    odebug << "set channels " << ch << " " << sd << "" << oendl;
     if (ioctl( sd, SNDCTL_DSP_CHANNELS, &ch)==-1) {
         perror("ioctl(\"SNDCTL_DSP_CHANNELS\")");
         return false;
     }
     devCh=ch;
     return true;
 }
 
 bool Device::setDeviceRate( int rate) {
-    odebug << "set rate " << rate << " " << sd << "" << oendl; 
+    odebug << "set rate " << rate << " " << sd << "" << oendl;
     if (ioctl( sd, SNDCTL_DSP_SPEED, &rate) == -1) {
         perror("ioctl(\"SNDCTL_DSP_SPEED\")");
         return false;
     }
 
     devRate=rate;
 
     return true;
 }
 
 int Device::getRes() {
     return devRes;
@@ -307,52 +307,52 @@ int Device::getDeviceBits() {
 }
 
 int Device::getDeviceChannels() {
     int dCh=0;
     if (ioctl( sd, SOUND_PCM_READ_CHANNELS, &dCh) == -1) {
         perror("ioctl(\"SNDCTL_PCM_READ_CHANNELS\")");
     }
     return dCh;
 }
 
 int Device::getDeviceFragSize() {
     int frag_size;
-    
+
     if (ioctl( sd, SNDCTL_DSP_GETBLKSIZE, &frag_size) == -1) {
-      odebug << "no fragsize" << oendl; 
+      odebug << "no fragsize" << oendl;
     } else {
-      odebug << "driver says frag size is " << frag_size << "" << oendl; 
+      odebug << "driver says frag size is " << frag_size << "" << oendl;
     }
     return frag_size;
 }
 
 bool Device::setFragSize(int frag) {
     if (ioctl(sd, SNDCTL_DSP_SETFRAGMENT, &frag)) {
         perror("ioctl(\"SNDCTL_DSP_SETFRAGMENT\")");
         return false;
     }
     return true;
 }
 
 bool Device::reset() {
   closeDevice(true);
   openDsp();
          if (ioctl( sd, SNDCTL_DSP_RESET, 0) == -1) {
              perror("ioctl(\"SNDCTL_DSP_RESET\")");
        return false;
          }
    return true;
 }
 
 int Device::devRead(int soundDescriptor, short *buf, int size) {
    int number = 0;
-   number = ::read(  soundDescriptor, (char *)buf, size);
+   number = ::read(  sd /*soundDescriptor*/, (char *)buf, size);
    return number;
 }
 
 int Device::devWrite(int soundDescriptor, short * buf, int size) {
    int bytesWritten = 0;
-   bytesWritten = ::write( soundDescriptor, buf, size);
+   bytesWritten = ::write( sd /*soundDescriptor*/, buf, size);
    return bytesWritten;
 }