From aa7039012cc79c02304e36db16e6f5ff82e19867 Mon Sep 17 00:00:00 2001 From: llornkcor Date: Sat, 12 Mar 2005 02:23:02 +0000 Subject: remove ouput --- 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 @@ -720,8 +720,13 @@ void QtRec::initConnections() { 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*))); @@ -811,10 +816,13 @@ void QtRec::stop() { // owarn << "STOP" << oendl; setRecordButton(false); - if( !recording) + if( !recording) { + emit stopPlaying(); endPlaying(); - else + } else { + emit stopRecording(); endRecording(); + } timeSlider->setValue(0); } @@ -864,15 +872,7 @@ bool QtRec::rec() { //record int fileSize = 0; Config cfg("OpieRec"); cfg.setGroup("Settings"); -// odebug << "<<<<<<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) { @@ -1048,8 +1048,7 @@ bool QtRec::setupAudio( bool b) { // flags= O_RDONLY; recording = true; } - - // if(soundDevice) delete soundDevice; + owarn << "<<<<<<<<<<<<<<<<<<changeSettings( filePara.sampleRate, filePara.channels ); @@ -1089,8 +1088,6 @@ bool QtRec::setupAudio( bool b) { 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, @@ -1102,7 +1099,6 @@ bool QtRec::setUpFile() { //setup file for recording if(filePara.fd == -1) { return false; } else { -// filePara.channels=1; } return true; } @@ -1225,13 +1221,6 @@ void QtRec::deleteSound() { cfg.setGroup("Sounds"); if( ListView1->currentItem() == NULL) return; -// #ifndef DEV_VERSION -// switch ( QMessageBox::warning(this,tr("Delete"), -// tr("Do you really want to DELETE\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, ""); @@ -1401,9 +1390,7 @@ void QtRec::endRecording() { if( wavFile->track.isOpen()) { wavFile->adjustHeaders( filePara.fd, filePara.numberSamples); - // soundDevice->sd=-1; filePara.numberSamples = 0; - // filePara.sd=-1; wavFile->closeFile(); filePara.fd=0; diff --git a/noncore/multimedia/opierec/qtrec.h b/noncore/multimedia/opierec/qtrec.h index 642048a..6e81af6 100644 --- a/noncore/multimedia/opierec/qtrec.h +++ b/noncore/multimedia/opierec/qtrec.h @@ -60,7 +60,14 @@ public: ~QtRec(); QSlider *OutputSlider,*InputSlider; +signals: + void stopRecording(); + void startRecording(); + void stopPlaying(); + void startPlaying(); + public slots: + private: // int fragment; int fd1; @@ -97,9 +104,12 @@ private: void timerEvent( QTimerEvent *e ); private slots: + void endPlaying(); + void endRecording(); void FastforwardPressed(); void FastforwardReleased(); + void changeDirCombo(int); void changeSizeLimitCombo(int); void changeTimeSlider(int); @@ -109,6 +119,7 @@ private slots: void changedInVolume(); void changedOutVolume(); void changesamplerateCombo(int); + void cleanUp(); void compressionSelected(bool); void deleteSound(); @@ -170,8 +181,6 @@ protected: bool openPlayFile(); bool setUpFile(); bool setupAudio( bool b); - void endPlaying(); - void endRecording(); void fileBeamFinished( Ir *ir); void keyPressEvent( QKeyEvent *e); void keyReleaseEvent( QKeyEvent *e); diff --git a/noncore/multimedia/opierec/wavFile.cpp b/noncore/multimedia/opierec/wavFile.cpp index b53c416..a0423f0 100644 --- a/noncore/multimedia/opierec/wavFile.cpp +++ b/noncore/multimedia/opierec/wavFile.cpp @@ -152,7 +152,7 @@ bool WavFile::setWavHeader(int fd, wavhdr *hdr) { strncpy((*hdr).dataID, "data", 4); write( fd,hdr, sizeof(*hdr)); - owarn << "writing header: bitrate " << wavResolution << ", samplerate " << wavSampleRate << ", channels " << wavChannels << oendl; +// owarn << "writing header: bitrate " << wavResolution << ", samplerate " << wavSampleRate << ", channels " << wavChannels << oendl; return true; } @@ -162,12 +162,12 @@ bool WavFile::adjustHeaders(int fd, int total) { write( fd, &i, sizeof(i)); lseek( fd, 40, SEEK_SET); write( fd, &total, sizeof(total)); - owarn << "adjusting header " << total << "" << oendl; +// owarn << "adjusting header " << total << "" << oendl; return true; } int WavFile::parseWavHeader(int fd) { - owarn << "Parsing wav header" << oendl; +// owarn << "Parsing wav header" << oendl; char string[4]; int found; short fmt; @@ -175,71 +175,71 @@ int WavFile::parseWavHeader(int fd) { unsigned long samplerrate, longdata; if (read(fd, string, 4) < 4) { - owarn << " Could not read from sound file." << oendl; +// owarn << " Could not read from sound file." << oendl; return -1; } if (strncmp(string, "RIFF", 4)) { - owarn << " not a valid WAV file." << oendl; +// owarn << " not a valid WAV file." << oendl; return -1; } lseek(fd, 4, SEEK_CUR); if (read(fd, string, 4) < 4) { - owarn << "Could not read from sound file." << oendl; +// owarn << "Could not read from sound file." << oendl; return -1; } if (strncmp(string, "WAVE", 4)) { - owarn << "not a valid WAV file." << oendl; +// owarn << "not a valid WAV file." << oendl; return -1; } found = 0; while (!found) { if (read(fd, string, 4) < 4) { - owarn << "Could not read from sound file." << oendl; +// owarn << "Could not read from sound file." << oendl; return -1; } if (strncmp(string, "fmt ", 4)) { if (read(fd, &longdata, 4) < 4) { - owarn << "Could not read from sound file." << oendl; +// owarn << "Could not read from sound file." << oendl; return -1; } lseek(fd, longdata, SEEK_CUR); } else { lseek(fd, 4, SEEK_CUR); if (read(fd, &fmt, 2) < 2) { - owarn << "Could not read format chunk." << oendl; +// owarn << "Could not read format chunk." << oendl; return -1; } if (fmt != WAVE_FORMAT_PCM && fmt != WAVE_FORMAT_DVI_ADPCM) { - owarn << "Wave file contains unknown format. Unable to continue." << oendl; +// owarn << "Wave file contains unknown format. Unable to continue." << oendl; return -1; } wavFormat = fmt; // compressionFormat=fmt; - owarn << "compressionFormat is " << fmt << "" << oendl; +// owarn << "compressionFormat is " << fmt << "" << oendl; if (read(fd, &ch, 2) < 2) { - owarn << "Could not read format chunk." << oendl; +// owarn << "Could not read format chunk." << oendl; return -1; } else { wavChannels = ch; - owarn << "File has " << ch << " channels" << oendl; +// owarn << "File has " << ch << " channels" << oendl; } if (read(fd, &samplerrate, 4) < 4) { - owarn << "Could not read from format chunk." << oendl; +// owarn << "Could not read from format chunk." << oendl; return -1; } else { wavSampleRate = samplerrate; // sampleRate = samplerrate; - owarn << "File has samplerate of " << (int) samplerrate << "" << oendl; +// owarn << "File has samplerate of " << (int) samplerrate << "" << oendl; } lseek(fd, 6, SEEK_CUR); if (read(fd, &bitrate, 2) < 2) { - owarn << "Could not read format chunk." << oendl; +// owarn << "Could not read format chunk." << oendl; return -1; } else { wavResolution=bitrate; // resolution = bitrate; - owarn << "File has bitrate of " << bitrate << "" << oendl; +// owarn << "File has bitrate of " << bitrate << "" << oendl; } found++; } -- cgit v0.9.0.2