1 files changed, 28 insertions, 93 deletions

diff --git a/noncore/multimedia/opierec/qtrec.cpp b/noncore/multimedia/opierec/qtrec.cpp
index 6793b4e..e827083 100644
--- a/noncore/multimedia/opierec/qtrec.cpp
+++ b/noncore/multimedia/opierec/qtrec.cpp
@@ -1,12 +1,12 @@
 /****************************************************************************
          // qtrec.cpp
  Created: Thu Jan 17 11:19:58 2002
  copyright 2002 by L.J. Potter <ljp@llornkcor.com>
 ****************************************************************************/
-#define DEV_VERSION
+//#define DEV_VERSION
 
 #include "pixmaps.h"
 #include "qtrec.h"
 #include "waveform.h"
 extern "C" {
 #include "adpcm.h"
@@ -60,41 +60,12 @@ static int deviceSampleRates[8] = { 32000, 44100, 48000, 88200, 96000, 176400, 1
 static int deviceBitRates[] = { 8, 16, 24, 32, -1 };
 #else //OSS
 static int deviceSampleRates[6] = { 11025, 16000, 22050, 32000, 44100, -1 };
 static int deviceBitRates[] = { 8, 16, -1 };
 #endif
 
-#if defined(QT_QWS_SL5XXX)
-///#if defined(QT_QWS_EBX)
-
-#define DSPSTROUT "/dev/dsp"
-#define DSPSTRMIXEROUT "/dev/mixer"
-
-#ifdef SHARP
-#define DSPSTRIN "/dev/dsp1"
-#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 {
@@ -190,14 +161,14 @@ void quickRec()
                                                                 waveform->newSamples( sbuf, number );
 
                                                                 total += bytesWritten;
                                                                 filePara.numberSamples = total;
                                                                 timeSlider->setValue( total);
 
-         printf("%d, bytes %d,total %d\r",number, bytesWritten, total);
-         fflush(stdout);
+          printf("%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;
@@ -240,14 +211,14 @@ void quickRec()
                                                                 total += bytesWritten;
 
                                                                 filePara.numberSamples = total;
 
                                                                 if( filePara.SecondsToRecord != 0)
                                                                                 timeSlider->setValue( total);
-         printf("%d, bytes %d,total %d\r",number,  bytesWritten , total);
-         fflush(stdout);
+          printf("%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) {
@@ -293,12 +264,13 @@ void quickRec()
                                                 if( total >= filePara.samplesToRecord) {
                                                                 stopped = true;
                                                                 break;
                                                 }
                                 } //end main loop
                 }
+                printf("\n");
 } /// END quickRec()
 
 
 #ifdef THREADED
 void playIt()
 #else
@@ -447,20 +419,13 @@ QtRec::QtRec( QWidget* parent,  const char* name, WFlags fl )
 
 // open sound device to get volumes
                 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);
+                soundDevice = new Device( this, false); //open play
 
                 getInVol();
                 getOutVol();
 
                 soundDevice->closeDevice( true);
                 soundDevice->sd = -1;
@@ -501,13 +466,13 @@ void QtRec::init() {
                 needsStereoOut = false;
                 QPixmap image3( ( const char** ) image3_data );
                 QPixmap image4( ( const char** ) image4_data );
                 QPixmap image6( ( const char** ) image6_data );
 
                 stopped = true;
-                setCaption( tr( "OpieRecord " ) + QString::number(VERSION) );
+                setCaption( tr( "OpieRecord " ));
                 QGridLayout *layout = new QGridLayout( this );
                 layout->setSpacing( 2);
                 layout->setMargin( 2);
 
                 TabWidget = new QTabWidget( this, "TabWidget" );
                 layout->addMultiCellWidget(TabWidget, 0, 7, 0, 8);
@@ -573,27 +538,16 @@ void QtRec::init() {
                 deleteSoundButton->setText( tr( "Del" ) );
 
                 ListView1 = new QListView( tab, "IconView1" );
                 layout1->addMultiCellWidget( ListView1, 2, 2, 0, 8);
 
                 ListView1->addColumn( tr( "Name" ) );
-        //      ListView1->setColumnWidth( 0, 140);
                 ListView1->setSorting( 1, false);
                 ListView1->addColumn( tr( "Time" ) ); //in seconds
-        //      ListView1->setColumnWidth( 1, -1);
-        //      ListView1->addColumn( tr("Location") );
-        //      ListView1->setColumnWidth( 2, -1);
-        //      ListView1->addColumn( tr("Date") );
-        //      ListView1->setColumnWidth( 3, -1);
                 ListView1->setColumnWidthMode(0, QListView::Maximum);
-        //      ListView1->setColumnWidthMode(1, QListView::Maximum);
-
-        //      ListView1->setColumnWidthMode( 0, QListView::Manual);
                 ListView1->setColumnAlignment( 1, QListView::AlignCenter);
-        //      ListView1->setColumnAlignment( 2, QListView::AlignRight);
-        //      ListView1->setColumnAlignment( 3, QListView::AlignLeft);
                 ListView1->setAllColumnsShowFocus( true );
                 QPEApplication::setStylusOperation( ListView1->viewport(), QPEApplication::RightOnHold);
 
                 TabWidget->insertTab( tab, tr( "Files" ) );
 
                         ///**********<<<<<<<<<<<<>>>>>>>>>>>>***************
@@ -605,13 +559,12 @@ void QtRec::init() {
                 sampleGroup = new QGroupBox( tab_3, "samplegroup" );
                 sampleGroup->setTitle( tr( "Sample Rate" ) );
                 sampleGroup->setFixedSize( 95,50);
 
                 sampleRateComboBox = new QComboBox( false, sampleGroup, "SampleRateComboBox" );
                 sampleRateComboBox->setGeometry( QRect( 10, 20, 80, 25 ) );
-//#ifndef QT_QWS_EBX
                 QString s;
                 int z = 0;
                 while( deviceSampleRates[z] != -1) {
                                 sampleRateComboBox->insertItem( s.setNum( deviceSampleRates[z], 10));
                                 z++;
                 }
@@ -714,31 +667,28 @@ void QtRec::init() {
                 fillDirectoryCombo();
 
                 TabWidget->insertTab( tab_3, tr( "Options" ) );
 
                 TabWidget->insertTab( tab_5, tr( "Volume" ) );
 
-
                 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, 8);
                 waveform->setBackgroundColor ( black );
 }
 
 void QtRec::initIconView() {
-                owarn << "initIconView" << oendl;
                 ListView1->clear();
                 Config cfg("OpieRec");
                 cfg.setGroup("Sounds");
                 QString temp;
                 QPixmap image0( ( const char** ) image0_data );
 
                 int nFiles = cfg.readNumEntry("NumberofFiles",0);
-    owarn << "init number of files " << nFiles << "" << oendl;
+//    owarn << "init number of files " << nFiles << "" << oendl;
 
                 for(int i = 1; i <= nFiles; i++) {
 
                                 QListViewItem * item;
                                 QString fileS, mediaLocation, fileDate,  filePath;
 
@@ -749,13 +699,13 @@ void QtRec::initIconView() {
                                 QFileInfo info(filePath);
                                 fileDate = info.lastModified().toString();
 
                                 fileS = cfg.readEntry( filePath, "0" );// file length in seconds
                                 mediaLocation = getStorage( filePath);
                                 if( info.exists()) {
-                                                owarn << "new item " << temp << oendl;
+        //                                      owarn << "new item " << temp << oendl;
                                                 item = new QListViewItem( ListView1, temp,  fileS /*,  mediaLocation, fileDate*/);
                                                 item->setPixmap( 0, image0);
                                                 if( currentFileName == filePath)
                                                                 ListView1->setSelected( item, true);
                                 }
                 }
@@ -853,13 +803,13 @@ void QtRec::initConfig() {
                 cofg.setGroup( "Volume");
                 outMuteCheckBox->setChecked( cofg.readBoolEntry( "Mute",0));
                 inMuteCheckBox->setChecked( cofg.readBoolEntry( "MicMute",0));
 }
 
 void QtRec::stop() {
-                owarn << "STOP" << oendl;
+        //      owarn << "STOP" << oendl;
                 setRecordButton(false);
 
                 if( !recording)
                                 endPlaying();
                 else
                                 endRecording();
@@ -1058,16 +1008,12 @@ bool QtRec::setupAudio( bool b) {
                                                 filePara.resolution = 8;
                                 }
 #endif
 
                                 stereo = filePara.channels;
                                 flags = O_WRONLY;
-                                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;
@@ -1095,25 +1041,21 @@ bool QtRec::setupAudio( bool b) {
 #endif
 
                                 stereo = filePara.channels;
 //        filePara.sampleRate = sampleRateComboBox->currentText().toInt( &ok,10);//44100;
                                 flags= O_RDWR;
 //        flags= O_RDONLY;
-                                Config hwcfg("OpieRec");
-                                hwcfg.setGroup("Hardware");
-                                dspString = hwcfg.readEntry( "Audio", DSPSTRIN);
-                                mixerString = hwcfg.readEntry( "Mixer", DSPSTRMIXERIN);
                                 recording = true;
                 }
 
                         // if(soundDevice) delete soundDevice;
                 odebug << "<<<<<<<<<<<<<<<<<<<open dsp " << filePara.sampleRate << " " << filePara.channels << " " << sampleformat << "" << oendl;
-                owarn << "change waveform settings" << oendl;
+        //      owarn << "change waveform settings" << oendl;
                 waveform->changeSettings( filePara.sampleRate, filePara.channels );
 
-                soundDevice = new Device( this, dspString, mixerString, b);
+                soundDevice = new Device( this, b); //open rec
 //    soundDevice->openDsp();
                 soundDevice->reset();
 
                 odebug << "device has been made " << soundDevice->sd << "" << oendl;
 
                         //////////////////         <<<<<<<<<<<<>>>>>>>>>>>>
@@ -1278,19 +1220,19 @@ void QtRec::itClick(QListViewItem *item) {
 
 void QtRec::deleteSound() {
                 Config cfg("OpieRec");
                 cfg.setGroup("Sounds");
                 if( ListView1->currentItem() == NULL)
                                 return;
-#ifndef DEV_VERSION
-                switch ( QMessageBox::warning(this,tr("Delete"),
-                                                                                                                                        tr("Do you really want to <font size=+2><B>DELETE</B></font>\nthe selected file?"),
-                                                                                                                                        tr("Yes"),tr("No"),0,1,1) ) {
-                        case 0:
-#endif
-                        {
+// #ifndef DEV_VERSION
+        //      switch ( QMessageBox::warning(this,tr("Delete"),
+        //                                                                                                                              tr("Do you really want to <font size=+2><B>DELETE</B></font>\nthe selected file?"),
+        //                                                                                                                              tr("Yes"),tr("No"),0,1,1) ) {
+        //              case 0:
+// #endif
+                                //      {
                                         QString file = ListView1->currentItem()->text(0);
                                         QString fileName;
                                         fileName = cfg.readEntry( file, "");
                                         QFile f( fileName);
                                         if( f.exists())
                                                         if( !f.remove())
@@ -1317,18 +1259,13 @@ void QtRec::deleteSound() {
                                         delete ListView1->currentItem();
 
                                         ListView1->clear();
                                         ListView1->setSelected( ListView1->firstChild(), true);
                                         initIconView();
                                         update();
-                        }
-#ifndef DEV_VERSION
-                };
-#endif
-                setCaption( tr( "OpieRecord " ) + QString::number(VERSION) );
-
+                setCaption( tr( "OpieRecord " ));
 }
 
 void QtRec::keyPressEvent( QKeyEvent *e) {
 
                 switch ( e->key() ) {
                                         //  case Key_F1:
@@ -1440,12 +1377,13 @@ void  QtRec::keyReleaseEvent( QKeyEvent *e) {
                                         FastforwardReleased();
                                         break;
                 }
 }
 
 void QtRec::endRecording() {
+                
                 monitoring = false;
                 recording = false;
                 stopped = true;
                 waveform->reset();
                 setRecordButton( false);
 
@@ -1500,12 +1438,14 @@ void QtRec::endRecording() {
 
 //      if(soundDevice) delete soundDevice;
 
                 timeSlider->setValue(0);
                 initIconView();
                 selectItemByName( currentFile);
+                setCaption( tr( "OpieRecord " ));
+                
 }
 
 void QtRec::endPlaying() {
                 monitoring = false;
                 recording = false;
                 playing = false;
@@ -1532,13 +1472,13 @@ void QtRec::endPlaying() {
 //   wavFile->closeFile();
                 filePara.fd = 0;
 //  if(wavFile) delete wavFile; //this crashes
 
     odebug << "track closed" << oendl;
                 killTimers();
-                owarn << "reset slider" << oendl;
+        //      owarn << "reset slider" << oendl;
                 timeSlider->setValue(0);
 
 //      if(soundDevice) delete soundDevice;
 
 }
 
@@ -1565,13 +1505,13 @@ bool QtRec::openPlayFile() {
                                                                                                         false);
                 filePara.fd = wavFile->wavHandle();
                 if(filePara.fd == -1) {
                                         //  if(!track.open(IO_ReadOnly)) {
                                 QString errorMsg = (QString)strerror(errno);
                                 monitoring = false;
-                                setCaption( tr( "OpieRecord " ) + QString::number(VERSION) );
+                                setCaption( tr( "OpieRecord " ));
                                 QMessageBox::message(tr("Note"), tr("Could not open audio file.\n")
                                                                                                                  + errorMsg + "\n" + currentFile);
                                 return false;
                 } else {
 
                                 filePara.numberSamples = wavFile->getNumberSamples();
@@ -1582,13 +1522,13 @@ bool QtRec::openPlayFile() {
                                 timeSlider->setPageStep(1);
                                 monitoring = true;
 
                                 odebug << "file " << filePara.fd << ", samples " << filePara.numberSamples << " " << filePara.sampleRate << "" << oendl;
                                 int sec = (int) (( filePara.numberSamples / filePara.sampleRate) / filePara.channels) / ( filePara.channels*( filePara.resolution/8));
 
-                                owarn << "seconds " << sec << "" << oendl;
+        //                      owarn << "seconds " << sec << "" << oendl;
 
                                 timeSlider->setRange(0, filePara.numberSamples );
                 }
 
                 return true;
 }
@@ -1599,13 +1539,13 @@ void QtRec::listPressed( int mouse, QListViewItem *item, const QPoint &, int ) {
                 switch (mouse) {
                         case 1: {
                                         if( renameBox != 0 ) //tricky
                                                         cancelRename();
 
                                         currentFile = item->text(0);
-                                        setCaption( "OpieRecord  " + currentFile);
+        //                              setCaption( "OpieRecord  " + currentFile);
                         }
                                         break;
                         case 2:
                                         showListMenu(item);
                                         ListView1->clearSelection();
                                         break;
@@ -1849,17 +1789,12 @@ void QtRec::timerEvent( QTimerEvent * ) {
                 if( recording && filePara.SecondsToRecord < secCount && filePara.SecondsToRecord != 0) {
                                 stop();
                 }
 
                 odebug << "" << secCount << "" << oendl;
                 QString  timeString;
-#ifdef DEV_VERSION
-                QString msg;
-                msg.sprintf("%d, %d, %d", filePara.sampleRate, filePara.channels, filePara.resolution);
-                setCaption( msg +" ::  "+QString::number(secCount));
-#endif
 
                 timeString.sprintf("%d", secCount);
         //      timeLabel->setText( timeString + " seconds");
 
                 secCount++;
 }