summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opierec/qtrec.cpp35
-rw-r--r--noncore/multimedia/opierec/qtrec.h13
-rw-r--r--noncore/multimedia/opierec/wavFile.cpp36
3 files changed, 40 insertions, 44 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
@@ -722,4 +722,9 @@ void QtRec::initConnections() {
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()));
@@ -813,6 +818,9 @@ void QtRec::stop() {
- if( !recording)
+ if( !recording) {
+ emit stopPlaying();
endPlaying();
- else
+ } else {
+ emit stopRecording();
endRecording();
+ }
timeSlider->setValue(0);
@@ -866,11 +874,3 @@ bool QtRec::rec() { //record
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());
@@ -1050,4 +1050,3 @@ bool QtRec::setupAudio( bool b) {
}
-
- // if(soundDevice) delete soundDevice;
+
owarn << "<<<<<<<<<<<<<<<<<<<open dsp " << filePara.sampleRate << " " << filePara.channels << " " << sampleformat << "" << oendl;
@@ -1091,4 +1090,2 @@ 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 &)"",
@@ -1104,3 +1101,2 @@ bool QtRec::setUpFile() { //setup file for recording
} else {
-// filePara.channels=1;
}
@@ -1227,9 +1223,2 @@ void QtRec::deleteSound() {
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);
@@ -1403,5 +1392,3 @@ void QtRec::endRecording() {
wavFile->adjustHeaders( filePara.fd, filePara.numberSamples);
- // soundDevice->sd=-1;
filePara.numberSamples = 0;
- // filePara.sd=-1;
wavFile->closeFile();
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
@@ -62,3 +62,10 @@ public:
+signals:
+ void stopRecording();
+ void startRecording();
+ void stopPlaying();
+ void startPlaying();
+
public slots:
+
private:
@@ -99,2 +106,4 @@ private:
private slots:
+ void endPlaying();
+ void endRecording();
@@ -102,2 +111,3 @@ private slots:
void FastforwardReleased();
+
void changeDirCombo(int);
@@ -111,2 +121,3 @@ private slots:
void changesamplerateCombo(int);
+
void cleanUp();
@@ -172,4 +183,2 @@ protected:
bool setupAudio( bool b);
- void endPlaying();
- void endRecording();
void fileBeamFinished( Ir *ir);
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
@@ -154,3 +154,3 @@ bool WavFile::setWavHeader(int fd, wavhdr *hdr) {
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;
@@ -164,3 +164,3 @@ bool WavFile::adjustHeaders(int fd, int total) {
write( fd, &total, sizeof(total));
- owarn << "adjusting header " << total << "" << oendl;
+// owarn << "adjusting header " << total << "" << oendl;
return true;
@@ -169,3 +169,3 @@ bool WavFile::adjustHeaders(int fd, int total) {
int WavFile::parseWavHeader(int fd) {
- owarn << "Parsing wav header" << oendl;
+// owarn << "Parsing wav header" << oendl;
char string[4];
@@ -177,3 +177,3 @@ int WavFile::parseWavHeader(int fd) {
if (read(fd, string, 4) < 4) {
- owarn << " Could not read from sound file." << oendl;
+// owarn << " Could not read from sound file." << oendl;
return -1;
@@ -181,3 +181,3 @@ int WavFile::parseWavHeader(int fd) {
if (strncmp(string, "RIFF", 4)) {
- owarn << " not a valid WAV file." << oendl;
+// owarn << " not a valid WAV file." << oendl;
return -1;
@@ -186,3 +186,3 @@ int WavFile::parseWavHeader(int fd) {
if (read(fd, string, 4) < 4) {
- owarn << "Could not read from sound file." << oendl;
+// owarn << "Could not read from sound file." << oendl;
return -1;
@@ -190,3 +190,3 @@ int WavFile::parseWavHeader(int fd) {
if (strncmp(string, "WAVE", 4)) {
- owarn << "not a valid WAV file." << oendl;
+// owarn << "not a valid WAV file." << oendl;
return -1;
@@ -197,3 +197,3 @@ int WavFile::parseWavHeader(int fd) {
if (read(fd, string, 4) < 4) {
- owarn << "Could not read from sound file." << oendl;
+// owarn << "Could not read from sound file." << oendl;
return -1;
@@ -202,3 +202,3 @@ int WavFile::parseWavHeader(int fd) {
if (read(fd, &longdata, 4) < 4) {
- owarn << "Could not read from sound file." << oendl;
+// owarn << "Could not read from sound file." << oendl;
return -1;
@@ -209,3 +209,3 @@ int WavFile::parseWavHeader(int fd) {
if (read(fd, &fmt, 2) < 2) {
- owarn << "Could not read format chunk." << oendl;
+// owarn << "Could not read format chunk." << oendl;
return -1;
@@ -213,3 +213,3 @@ int WavFile::parseWavHeader(int fd) {
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;
@@ -218,5 +218,5 @@ int WavFile::parseWavHeader(int fd) {
// 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;
@@ -224,6 +224,6 @@ int WavFile::parseWavHeader(int fd) {
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;
@@ -232,3 +232,3 @@ int WavFile::parseWavHeader(int fd) {
// sampleRate = samplerrate;
- owarn << "File has samplerate of " << (int) samplerrate << "" << oendl;
+// owarn << "File has samplerate of " << (int) samplerrate << "" << oendl;
}
@@ -236,3 +236,3 @@ int WavFile::parseWavHeader(int fd) {
if (read(fd, &bitrate, 2) < 2) {
- owarn << "Could not read format chunk." << oendl;
+// owarn << "Could not read format chunk." << oendl;
return -1;
@@ -241,3 +241,3 @@ int WavFile::parseWavHeader(int fd) {
// resolution = bitrate;
- owarn << "File has bitrate of " << bitrate << "" << oendl;
+// owarn << "File has bitrate of " << bitrate << "" << oendl;
}