1 files changed, 10 insertions, 23 deletions

diff --git a/noncore/multimedia/opierec/qtrec.cpp b/noncore/multimedia/opierec/qtrec.cpp
index 9b761aa..9d3d5cf 100644
--- a/noncore/multimedia/opierec/qtrec.cpp
+++ b/noncore/multimedia/opierec/qtrec.cpp
@@ -711,26 +711,31 @@ void QtRec::initIconView() {
                                                                 ListView1->setSelected( item, true);
                                 }
                 }
 }
 
 void QtRec::initConnections() {
                 connect(qApp,SIGNAL(aboutToQuit()),SLOT(cleanUp()));
 
                 connect(toBeginningButton,SIGNAL(pressed()),this,SLOT(rewindPressed()));
                 connect(toBeginningButton,SIGNAL(released()),this,SLOT(rewindReleased()));
                 connect(toEndButton,SIGNAL(pressed()),this,SLOT(FastforwardPressed()));
                 connect(toEndButton,SIGNAL(released()),this,SLOT(FastforwardReleased()));
+
                 connect(deleteSoundButton,SIGNAL(released()),this,SLOT(deleteSound()));
+
                 connect(Stop_PushButton,SIGNAL(released()),this,SLOT(doPlayBtn()));
+        //      connect(Stop_PushButton,SIGNAL(released()),this,SLOT(doPlayBtn()));
+
+        //      connect(Rec_PushButton,SIGNAL(released()),this,SIGNAL(startRecording()));
                 connect(Rec_PushButton,SIGNAL(released()),this,SLOT(newSound()));
 
                 connect(TabWidget,SIGNAL(currentChanged(QWidget*)),this,SLOT(thisTab(QWidget*)));
 
                 connect(OutputSlider,SIGNAL(sliderReleased()),this,SLOT(changedOutVolume()));
                 connect(InputSlider,SIGNAL(sliderReleased()),this,SLOT(changedInVolume()));
 
                 connect(sampleRateComboBox,SIGNAL(activated(int)),this,SLOT(changesamplerateCombo(int)));
                 connect(bitRateComboBox,SIGNAL(activated(int)),this,SLOT(changebitrateCombo(int)));
                 connect(directoryComboBox,SIGNAL(activated(int)),this,SLOT(changeDirCombo(int)));
                 connect(sizeLimitCombo,SIGNAL(activated(int)),this,SLOT(changeSizeLimitCombo(int)));
 
@@ -802,28 +807,31 @@ void QtRec::initConfig() {
                                 slotAutoMute(false);
 
                 Config cofg( "qpe");
                 cofg.setGroup( "Volume");
                 outMuteCheckBox->setChecked( cofg.readBoolEntry( "Mute",0));
                 inMuteCheckBox->setChecked( cofg.readBoolEntry( "MicMute",0));
 }
 
 void QtRec::stop() {
         //      owarn << "STOP" << oendl;
                 setRecordButton(false);
 
-                if( !recording)
+                if( !recording) {
+                                emit stopPlaying();
                                 endPlaying();
-                else
+                } else {
+                                emit stopRecording();
                                 endRecording();
+                }
                 timeSlider->setValue(0);
 }
 
 void QtRec::doPlayBtn() {
 
                 if(!stopped) {
         //                      playLabel2->setText(tr("Play"));
                                 stop();
                 } else {
                                 if(ListView1->currentItem() == 0) return;
         //                      playLabel2->setText(tr("Stop"));
                                 currentFile = ListView1->currentItem()->text(0);
@@ -855,33 +863,25 @@ bool QtRec::rec() { //record
                                 return false;
                 } else {
                                 secCount = 1;
         //                      playLabel2->setText(tr("Stop"));
                                 monitoring = false;
                                 setRecordButton( true);
 
                                 if( setupAudio( true))
                                                 if(setUpFile())  {
                                                                 int fileSize = 0;
                                                                 Config cfg("OpieRec");
                                                                 cfg.setGroup("Settings");
-//             odebug << "<<<<<<<Device bits " << soundDevice->getDeviceBits()
-//                    << ", device rate " << soundDevice->getDeviceRate()
-//                    << ", device channels " << soundDevice->getDeviceChannels() << oendl;
-
-                                                                        //filePara.sampleRate = cfg.readNumEntry("samplerate", 22050);
-//             odebug << "sample rate is " << filePara.sampleRate << "" << oendl;
                                                                 filePara.SecondsToRecord = getCurrentSizeLimit();
-
-//             odebug << "size limit " << filePara.SecondsToRecord << " sec" << oendl;
                                                                 int diskSize = checkDiskSpace( (const QString &) wavFile->trackName());
 
                                                                 if( filePara.SecondsToRecord == 0) {
                                                                                 fileSize = diskSize;
                                                                 } else if( filePara.format == WAVE_FORMAT_PCM) {
 //                odebug << "WAVE_FORMAT_PCM" << oendl;
                                                                                 fileSize = (filePara.SecondsToRecord ) * filePara.channels
                                                                                                 * filePara.sampleRate * ( filePara.resolution / 8) + 1000;
                                                                 } else {
 //                odebug << "WAVE_FORMAT_DVI_ADPCM" << oendl;
                                                                                 fileSize = ((filePara.SecondsToRecord) * filePara.channels
                                                                                                                                 * filePara.sampleRate * ( filePara.resolution / 8) ) / 4 + 250;
@@ -1040,25 +1040,24 @@ bool QtRec::setupAudio( bool b) {
                                                 sampleformat = AFMT_S16_LE;
 //          odebug << "WAVE_FORMAT_DVI_ADPCM" << oendl;
                                 }
 #endif
 
                                 stereo = filePara.channels;
 //        filePara.sampleRate = sampleRateComboBox->currentText().toInt( &ok,10);//44100;
                                 flags= O_RDWR;
 //        flags= O_RDONLY;
                                 recording = true;
                 }
 
-                        // if(soundDevice) delete soundDevice;
                 owarn << "<<<<<<<<<<<<<<<<<<<open dsp " << filePara.sampleRate << " " << filePara.channels << " " << sampleformat << "" << oendl;
         //      owarn << "change waveform settings" << oendl;
                 waveform->changeSettings( filePara.sampleRate, filePara.channels );
 
                 soundDevice = new Device( this, b); //open rec
 //    soundDevice->openDsp();
                 soundDevice->reset();
 
                 odebug << "device has been made " << soundDevice->sd << "" << oendl;
 
                         //////////////////         <<<<<<<<<<<<>>>>>>>>>>>>
                 soundDevice->setDeviceFormat( sampleformat);
@@ -1080,38 +1079,35 @@ bool QtRec::setupAudio( bool b) {
                                 update();
                                 setCaption( tr( "OpieRecord " )+ QString::number(VERSION) );
                                 return false;
                 }
                 if(autoMute)
                                 doMute(false);
 
                 return true;
 }
 
 
 bool QtRec::setUpFile() { //setup file for recording
-//    odebug << "Setting up wavfile" << oendl;
-//  if(wavFile) delete wavFile;
                 wavFile = new WavFile( this, (const QString &)"",
                                                                                                          true,
                                                                                                          filePara.sampleRate,
                                                                                                          filePara.channels,
                                                                                                          filePara.resolution,
                                                                                                          filePara.format);
 
                 filePara.fd = wavFile->wavHandle();
                 if(filePara.fd == -1) {
                                 return false;
                 } else {
-//      filePara.channels=1;
                 }
                 return true;
 }
 
 /// <<<<<<<<<<<<<<<<  PLAY >>>>>>>>>>>>>>>>>>>
 bool QtRec::doPlay() {
 
                 if( !paused) {
                                 total = 0;
                                 filePara.numberOfRecordedSeconds = 0;
                 } else {
                                 paused = false;
@@ -1216,31 +1212,24 @@ void QtRec::newSound() {
 }
 
 void QtRec::itClick(QListViewItem *item) {
                 currentFile = item->text(0);
                 setCaption("OpieRecord  "+currentFile);
 }
 
 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
-                                //      {
                 QString file = ListView1->currentItem()->text(0);
                 QString fileName;
                 fileName = cfg.readEntry( file, "");
                 QFile f( fileName);
                 if( f.exists())
                                 if( !f.remove())
                                                 QMessageBox::message( tr("Error"), tr("Could not remove file."));
 
                 int nFiles = cfg.readNumEntry( "NumberofFiles",0);
                 bool found = false;
                 for(int i=0;i<nFiles+1;i++) {
 
@@ -1392,27 +1381,25 @@ void QtRec::endRecording() {
                 toBeginningButton->setEnabled( true);
                 toEndButton->setEnabled( true);
 
                 killTimers();
 
                 if(autoMute)
                                 doMute( true);
 
                 soundDevice->closeDevice( true);
 
                 if( wavFile->track.isOpen()) {
                                 wavFile->adjustHeaders( filePara.fd, filePara.numberSamples);
-                                        //    soundDevice->sd=-1;
                                 filePara.numberSamples = 0;
-                                        //      filePara.sd=-1;
                                 wavFile->closeFile();
                                 filePara.fd=0;
 
                                 if( wavFile->isTempFile()) {
 // move tmp file to regular file
                                                 QString cmd;
                                                 cmd.sprintf("mv "+ wavFile->trackName() + " " + wavFile->currentFileName);
                                                 odebug << "moving tmp file to "+currentFileName << oendl;
                                                 system( cmd.latin1());
                                 }
 
                                 odebug << "Just moved " + wavFile->currentFileName << oendl;