make device user configurable

3 files changed, 62 insertions, 88 deletions

diff --git a/noncore/multimedia/opierec/opierec.pro b/noncore/multimedia/opierec/opierec.pro
index 39fe493..5651151 100644
--- a/noncore/multimedia/opierec/opierec.pro
+++ b/noncore/multimedia/opierec/opierec.pro
@@ -1,8 +1,8 @@
-#CONFIG   = qt qtopia warn_on release pdaudio
-CONFIG   = qt warn_on release opie
+CONFIG   = qt qtopia warn_on release pdaudio
+#CONFIG   = qt warn_on release opie
 #CONFIG    = qt warn_on release quick-app
 HEADERS   = adpcm.h \
         pixmaps.h \
         helpwindow.h \
         qtrec.h \
         device.h \
@@ -20,12 +20,13 @@ INTERFACES  =
 contains(CONFIG, pdaudio) {
 #  LIBS += -L/opt/buildroot-opie/output/staging/target/lib -lqpe -lpthread -ljpeg -lpng -lz
   LIBS += -L$(QPEDIR)/lib -lqpe -lpthread -ljpeg -lpng -lz
   INCLUDEPATH += $(QPEDIR)/include
   DEPENDPATH  += $(QPEDIR)/include
   DEFINES += PDAUDIO
+  DEFINES += THREADED
   TARGET    = qperec
 
 #  DESTDIR=$(QPEDIR)/bin
 }
 
 contains(CONFIG, opie) {
diff --git a/noncore/multimedia/opierec/qtrec.cpp b/noncore/multimedia/opierec/qtrec.cpp
index bc6abcc..0a6e5ae 100644
--- a/noncore/multimedia/opierec/qtrec.cpp
+++ b/noncore/multimedia/opierec/qtrec.cpp
@@ -1,12 +1,11 @@
 /****************************************************************************
  // qtrec.cpp
  Created: Thu Jan 17 11:19:58 2002
  copyright 2002 by L.J. Potter <ljp@llornkcor.com>
 ****************************************************************************/
-
 #define DEV_VERSION
 
 #include "pixmaps.h"
 #include "qtrec.h"
 #include "waveform.h"
 #include "device.h"
@@ -113,17 +112,19 @@ QLabel *timeLabel;
 QSlider *timeSlider;
 int sd;
 
 Waveform* waveform;
 Device *soundDevice;
 
-// threaded recording
-//fuckin fulgy here
-//void quickRec()
-//{
-void QtRec::quickRec() {
+
+#ifdef THREADED
+void quickRec()
+#else
+                void QtRec::quickRec() 
+#endif
+{
 
    qDebug("%d",
           filePara.numberSamples/filePara.sampleRate * filePara.channels);
    qDebug("samples %d, rate %d, channels %d",
           filePara.numberSamples, filePara.sampleRate, filePara.channels);
 
@@ -154,13 +155,13 @@ void QtRec::quickRec() {
          memset( abuf, 0, BUFSIZE/2);
          memset( sbuf, 0, BUFSIZE);
          memset( sbuf2, 0, BUFSIZE);
 
          for(;;) {
             if ( stopped) {
-               qDebug("quickRec:: stopped");
+        //                                                                      qDebug("quickRec:: stopped");
                break;
             }
 
 //             number=::read( filePara.sd, sbuf, BUFSIZE);
             number =  soundDevice ->devRead( filePara.sd, sbuf, BUFSIZE);
 
@@ -230,23 +231,23 @@ void QtRec::quickRec() {
             if( filePara.SecondsToRecord != 0)
                timeSlider->setValue( total);
 //         printf("Writing number %d, bytes %d,total %d\r",number,  bytesWritten , total);
 //         fflush(stdout);
 
             filePara.numberOfRecordedSeconds = (float)total / (float)filePara.sampleRate / (float)2/filePara.channels;
-
             qApp->processEvents();
 
             if( total >= filePara.samplesToRecord) {
                stopped = true;
                break;
          }
          }
       } //end main loop
 
-   } else { // <<<<<<<<<<<<<<<<<<<<<<<   format = AFMT_U8;
+                } else {
+// <<<<<<<<<<<<<<<<<<<<<<<   format = AFMT_U8;
       unsigned char unsigned_inbuffer[ BUFSIZE ], unsigned_outbuffer[ BUFSIZE ];
       memset( unsigned_inbuffer, 0, BUFSIZE);
       memset( unsigned_outbuffer, 0, BUFSIZE);
 
       for(;;) {
          if ( stopped) {
@@ -279,17 +280,21 @@ void QtRec::quickRec() {
             break;
          }
       } //end main loop
    }
 } /// END quickRec()
 
-void QtRec::playIt()
 
-//void playIt()
+#ifdef THREADED
+void playIt()
+#else
+                void QtRec::playIt()
+#endif
 {
-   int bytesWritten, number;
+                int bytesWritten = 0;
+                int number = 0;
    int total = 0;  // Total number of bytes read in so far.
    if( filePara.resolution == 16 ) { //AFMT_S16_LE) {
       if( filePara.format == WAVE_FORMAT_DVI_ADPCM) {
          char abuf[ BUFSIZE / 2 ];
          short sbuf[ BUFSIZE ];
          short sbuf2[ BUFSIZE * 2 ];
@@ -319,14 +324,14 @@ void QtRec::playIt()
             filePara.numberOfRecordedSeconds = (float)total / (float)filePara.sampleRate / 2;
 
             timeSlider->setValue( total/4);
 //            timeString.sprintf("%.2f", filePara.numberOfRecordedSeconds);
 //         if(filePara.numberOfRecordedSeconds>1)
 //            timeLabel->setText( timeString+ tr(" seconds"));
-         printf("playing number %d, bytes %d, total %d\n",number,  bytesWritten, total/4);
-         fflush(stdout);
+        //                                                      printf("playing number %d, bytes %d, total %d\n",number,  bytesWritten, total/4);
+        //                                                      fflush(stdout);
 
             qApp->processEvents();
 
             if( /*total >= filePara.numberSamples || */ bytesWritten == 0) {
 //            if( total >= filePara.numberSamples ){//||  secCount > filePara.numberOfRecordedSeconds ) {
                stopped = true;
@@ -405,32 +410,38 @@ void QtRec::playIt()
 
          if( /*total >= filePara.numberSamples || */ bytesWritten == 0) {
 //         if( total >= filePara.numberSamples ) {
                stopped = true;
             break;
          }
-         printf("Writing number %d, bytes %d, total %d, numberSamples %d\r",number,  bytesWritten , total, filePara.numberSamples);
-        fflush(stdout);
+        //                                      printf("Writing number %d, bytes %d, total %d, numberSamples %d\r",number,  bytesWritten , total, filePara.numberSamples);
+        //                                      fflush(stdout);
       }
    }
 }
 
-/////////////////<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>
 
 QtRec::QtRec( QWidget* parent,  const char* name, WFlags fl )
    : QWidget( parent, name, fl )
 {
    if ( !name )
       setName( "OpieRec" );
    init();
    initConfig();
    initConnections();
    renameBox = 0;
 
 // open sound device to get volumes
-   soundDevice = new Device( this, DSPSTROUT, DSPSTRMIXEROUT, false);
+                Config hwcfg("OpieRec");
+                hwcfg.setGroup("Hardware");
+
+                
+                soundDevice = new Device( this,
+                                                                                                                        hwcfg.readEntry( "Audio",DSPSTROUT),
+                                                                                                                        hwcfg.readEntry( "Mixer",DSPSTRMIXEROUT), false);
+        //      soundDevice = new Device( this, hwcfg.readEntry( "Audio","hw:0"), hwcfg.readEntry( "Mixer","hw:0"), false);
 
 //     soundDevice->setDeviceFormat(AFMT_S16_LE);
 //     soundDevice->setDeviceChannels(1);
 //     soundDevice->setDeviceRate( 22050);
 
    getInVol();
@@ -637,18 +648,12 @@ void QtRec::init() {
    stereoCheckBox = new QCheckBox ( tr("Stereo Channels"), tab_3 );
 
    glayout3->addMultiCellWidget( compressionCheckBox, 2, 2, 0, 3);
    glayout3->addMultiCellWidget( autoMuteCheckBox, 3, 3, 0, 0);
    glayout3->addMultiCellWidget( stereoCheckBox, 3, 3, 1, 1);
 
-   QWidget *d = QApplication::desktop();
-   int width = d->width();
-   int height = d->height();
-
-   if( width < height) {
-
       tab_5 = new QWidget( TabWidget, "tab_5" );
 
       QHBoxLayout *Layout19a;
       Layout19a = new QHBoxLayout( tab_5);
       Layout19a->setSpacing( 2 );
       Layout19a->setMargin( 0 );
@@ -693,58 +698,12 @@ void QtRec::init() {
       fillDirectoryCombo();
 
       TabWidget->insertTab( tab_3, tr( "Options" ) );
 
       TabWidget->insertTab( tab_5, tr( "Volume" ) );
 
-   } else {// landscape
-
-      //  Layout16->addWidget( dirGroup );
-      //  Layout18->addLayout( Layout16 );
-      Layout15 = new QVBoxLayout(this);
-      Layout15->setSpacing( 2 );
-      Layout15->setMargin( 0 );
-
-      Layout15b = new QVBoxLayout(this);
-      Layout15b->setSpacing( 2 );
-      Layout15b->setMargin( 0 );
-
-      TextLabel2 = new QLabel( tab_3, "InputLabel" );
-      TextLabel2->setText( tr( "In"));
-      TextLabel2->setFixedWidth(35);
-      Layout15->addWidget( TextLabel2 );
-
-      TextLabel3 = new QLabel( tab_3, "OutputLabel" );
-      TextLabel3->setText( tr( "Out" ) );
-      Layout15b->addWidget( TextLabel3 );
-
-      InputSlider = new QSlider( -100, 0, 10, 0, QSlider::Vertical, tab_3, (const char *) "InputSlider" );
-      InputSlider->setTickmarks(QSlider::Both);
-      Layout15->addWidget( InputSlider);
-
-      OutputSlider = new QSlider( -100,0,10,0, QSlider::Vertical,tab_3,(const char *) "OutputSlider" );
-      OutputSlider->setTickmarks(QSlider::Both);
-
-      Layout15b->addWidget( OutputSlider );
-
-      outMuteCheckBox = new QCheckBox ( tr("mute"), tab_3 );
-      Layout15->addWidget( outMuteCheckBox );
-
-      inMuteCheckBox = new QCheckBox ( tr("mute"), tab_3 );
-      inMuteCheckBox-> setFocusPolicy ( QWidget::NoFocus );
-      Layout15b->addWidget( inMuteCheckBox );
-
-
-      Layout19->addLayout( Layout15 );
-      Layout19->addLayout( Layout15b );
-
-      fillDirectoryCombo();
-
-      TabWidget->insertTab( tab_3, tr( "Options" ) );
-
-   }
 
    waveform = new Waveform( this, "waveform" );
 //   waveform->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)3, waveform->sizePolicy().hasHeightForWidth() ) );
    waveform->setMinimumSize( QSize( 0, 50 ) );
 
    layout->addMultiCellWidget( waveform, 8, 8, 0, 7 );
@@ -757,13 +716,13 @@ void QtRec::initIconView() {
    Config cfg("OpieRec");
    cfg.setGroup("Sounds");
    QString temp;
    QPixmap image0( ( const char** ) image0_data );
 
    int nFiles = cfg.readNumEntry("NumberofFiles",0);
-   qDebug("init number of files %d", nFiles);
+        //      qDebug("init number of files %d", nFiles);
 
    for(int i=1;i<= nFiles;i++) {
 
       QListViewItem * item;
       QString fileS, mediaLocation, fileDate,  filePath;
 
@@ -1005,22 +964,26 @@ bool QtRec::rec() { //record
                QString msg;
                msg.sprintf("%d, %d, %d", filePara.sampleRate, filePara.channels, filePara.resolution);
 #ifdef DEV_VERSION
                setCaption( msg);
 #endif
                filePara.fileName=currentFile.latin1();
-//               qDebug("Start recording thread");
+                                                                                qDebug("Start recording thread");
                stopped = false;
 
-//                 pthread_t thread1;
-//                 pthread_create( &thread1, NULL, (void * (*)(void *))quickRec, NULL/* &*/);
+#ifdef THREADED
+                                                                                pthread_t thread1;
+                                                                                pthread_create( &thread1, NULL, (void * (*)(void *))quickRec, NULL/* &*/);
+#endif
                toBeginningButton->setEnabled( false);
                toEndButton->setEnabled( false);
 
                startTimer(1000);
+#ifndef THREADED
                quickRec();
+#endif
             }
          } //end setUpFile
    } //end setupAudio
    return true;
 }
 /*
@@ -1067,18 +1030,19 @@ void QtRec::changedInVolume( ) {
 }
 
 
 bool QtRec::setupAudio( bool b) {
    bool ok;
    int  sampleformat, stereo, flags;
-   char * dspString, *mixerString;
+                QString dspString, mixerString;
 
    filePara.resolution = bitRateComboBox->currentText().toInt( &ok,10);  //16
 
+                if( !b) {
+// we want to play
 #ifdef PDAUDIO //ALSA
-                if( !b) { // we want to play
                                 if( filePara.resolution == 16 || compressionCheckBox->isChecked() ) {
                                                 sampleformat = SND_PCM_FORMAT_S16;
                                                 filePara.resolution = 16;
                                 } else if( filePara.resolution == 24 || compressionCheckBox->isChecked() ) {
                                                 sampleformat = SND_PCM_FORMAT_S24;
                                                 filePara.resolution = 24;
@@ -1087,27 +1051,28 @@ bool QtRec::setupAudio( bool b) {
                                                 filePara.resolution = 32;
                                 } else {
                                                 sampleformat = SND_PCM_FORMAT_U8;
                                                 filePara.resolution = 8;
                                 }
 #else
-   if( !b) {
 // we want to play
       if( filePara.resolution == 16 || compressionCheckBox->isChecked() ) {
          sampleformat = AFMT_S16_LE;
          filePara.resolution = 16;
       } else {
          sampleformat = AFMT_U8;
          filePara.resolution = 8;
       }
 #endif
                         
       stereo = filePara.channels;
       flags = O_WRONLY;
-      dspString = DSPSTROUT;
-      mixerString = DSPSTRMIXEROUT;
+                                Config hwcfg("OpieRec");
+                                hwcfg.setGroup("Hardware");
+                                dspString = hwcfg.readEntry( "Audio", DSPSTROUT);
+                                mixerString = hwcfg.readEntry( "Mixer", DSPSTRMIXEROUT);
       recording = false;
    } else { // we want to record
 
 #ifdef PDAUDIO //ALSA
                                 if( !bitRateComboBox->isEnabled() || bitRateComboBox->currentText() == "16")
                                                 sampleformat = SND_PCM_FORMAT_S16;
@@ -1135,14 +1100,16 @@ bool QtRec::setupAudio( bool b) {
 #endif
                         
       stereo = filePara.channels;
 //        filePara.sampleRate = sampleRateComboBox->currentText().toInt( &ok,10);//44100;
       flags= O_RDWR;
 //        flags= O_RDONLY;
-      dspString = DSPSTRIN;
-      mixerString = DSPSTRMIXEROUT;
+                                Config hwcfg("OpieRec");
+                                hwcfg.setGroup("Hardware");
+                                dspString = hwcfg.readEntry( "Audio", DSPSTRIN);
+                                mixerString = hwcfg.readEntry( "Mixer", DSPSTRMIXERIN);
       recording = true;
    }
 
    // if(soundDevice) delete soundDevice;
    qDebug("<<<<<<<<<<<<<<<<<<<open dsp %d %d %d", filePara.sampleRate, filePara.channels, sampleformat);
    qWarning("change waveform settings");
@@ -1217,32 +1184,35 @@ bool QtRec::doPlay() {
 
    QString num;
    qDebug( "Play number of samples %d", filePara.numberSamples);
 
 //   timeSlider->setRange( 0, filePara.numberSamples);
 
-   timeString.sprintf("%d",  filePara.numberOfRecordedSeconds);
+                timeString.sprintf("%f",  filePara.numberOfRecordedSeconds);
    timeLabel->setText( timeString+ tr(" seconds"));
 
    QString msg;
    msg.sprintf("%d, %d, %d",
                filePara.sampleRate,
                filePara.channels,
                filePara.resolution);
 #ifdef DEV_VERSION
    setCaption( msg);
 #endif
 
     startTimer( 1000);
-//     pthread_t thread2;
-//     pthread_create( &thread2, NULL, (void * (*)(void *))playIt, NULL/* &*/);
+#ifdef THREADED
+                pthread_t thread2;
+                pthread_create( &thread2, NULL, (void * (*)(void *))playIt, NULL/* &*/);
+#endif
 
     toBeginningButton->setEnabled( false);
     toEndButton->setEnabled( false);
+#ifndef  THREADED
                 playIt();
-
+#endif
    return true;
 }
 
 
 void QtRec::changebitrateCombo(int i) {
    Config cfg("OpieRec");
@@ -1863,13 +1833,13 @@ void QtRec::receive( const QCString &msg, const QByteArray & ) {
    qDebug("Voicerecord received message "+msg);
 
 }
 
 
 ///////////////////////////// timerEvent
-void QtRec::timerEvent( QTimerEvent *e ) {
+void QtRec::timerEvent( QTimerEvent * ) {
 
 //    if(!recording)
 //       timeSlider->setValue( secCount);
 //     else
 //        timeSlider->setValue( filePara.numberOfRecordedSeconds);
 
@@ -2157,6 +2127,7 @@ void QtRec::changeStereoCheck(bool b) {
    cfg.writeEntry("stereo", b);
    filePara.channels = ch;
    
    cfg.write();
 }
 
+                
diff --git a/noncore/multimedia/opierec/qtrec.h b/noncore/multimedia/opierec/qtrec.h
index 31cff9e..5878d37 100644
--- a/noncore/multimedia/opierec/qtrec.h
+++ b/noncore/multimedia/opierec/qtrec.h
@@ -174,12 +174,14 @@ protected:
    void fileBeamFinished( Ir *ir);
    void initIconView();
    void keyPressEvent( QKeyEvent *e);
    void keyReleaseEvent( QKeyEvent *e);
    void receive( const QCString &, const QByteArray & );
    void showListMenu(QListViewItem * );
+#ifndef THREADED
    void quickRec();
          void playIt();
+#endif
   
 };
 
 #endif // QTREC_H