4 files changed, 43 insertions, 35 deletions

diff --git a/noncore/multimedia/opierec/device.cpp b/noncore/multimedia/opierec/device.cpp
index e7e0f4b..a76665e 100644
--- a/noncore/multimedia/opierec/device.cpp
+++ b/noncore/multimedia/opierec/device.cpp
@@ -60,6 +60,7 @@ Device::Device( QObject * parent, bool record )
     if( !record){ //playing
-        owarn << "setting up DSP for playing" << oendl;
-        flags = O_WRONLY;
+        owarn << "New Sound device DSP for playing" << oendl;
+        flags = O_RDWR;
+//        flags = O_WRONLY;
     } else { //recording
-        owarn << "setting up DSP for recording" << oendl;
+        owarn << "New Sound device DSP for recording" << oendl;
         flags = O_RDWR;
@@ -71,2 +72,3 @@ Device::Device( QObject * parent, bool record )
 bool Device::openDsp() {
+                qWarning("Device::openDsp()");
     if( openDevice( flags) == -1) {
@@ -79,6 +81,6 @@ bool Device::openDsp() {
 int Device::openDevice( int flags) {
-                owarn << "Opening"<< dspstr;
+                owarn << "Opening sound device:"<< DSPSTROUT << oendl;
 
-                if (( sd = ::open( DSPSTROUT, flags)) == -1) {
-                                perror("open(\"/dev/dsp\")");
+                if (( sd = ::open( DSPSTROUT, O_RDWR)) == -1) {
+                                perror("open(\"/dev/dsp\")\n");
                                 QString errorMsg="Could not open audio device\n /dev/dsp\n"
@@ -92,2 +94,3 @@ int Device::openDevice( int flags) {
                 }
+                qWarning("opened!");
     return sd;
@@ -152,2 +155,3 @@ bool Device::selectMicInput() {
 bool Device::closeDevice( bool) {
+                if(sd)
     ::close( sd); //close sound device
diff --git a/noncore/multimedia/opierec/opierec.pro b/noncore/multimedia/opierec/opierec.pro
index 6a5838a..6008bf7 100644
--- a/noncore/multimedia/opierec/opierec.pro
+++ b/noncore/multimedia/opierec/opierec.pro
@@ -33,2 +33,3 @@ contains(CONFIG, pdaudio) {
   LIBS            += -lqpe -lopiecore2 -lpthread
+  DEFINES += THREADED
   TARGET    = opierec
diff --git a/noncore/multimedia/opierec/qtrec.cpp b/noncore/multimedia/opierec/qtrec.cpp
index e827083..9b761aa 100644
--- a/noncore/multimedia/opierec/qtrec.cpp
+++ b/noncore/multimedia/opierec/qtrec.cpp
@@ -158,3 +158,3 @@ void quickRec()
 
-                                                                bytesWritten = ::write( filePara.fd , (short *)abuf, number/4);
+                                                                bytesWritten = ::write( filePara.fd , abuf, number/4);
 
@@ -169,3 +169,3 @@ void quickRec()
 
-                                         filePara.numberOfRecordedSeconds = (float)total / (float)filePara.sampleRate * (float)2/ filePara.channels;
+                                                                        filePara.numberOfRecordedSeconds = (float)total / (float)filePara.sampleRate * (float)2;/// filePara.channels;
 
@@ -303,4 +303,6 @@ void playIt()
 //                 }
-                                                                bytesWritten = write ( filePara.sd, sbuf, number * 4);
-                                                                waveform->newSamples( (const short *)sbuf, number *4);
+                                                                bytesWritten = write ( soundDevice->sd , sbuf, number * 4);
+
+                                                                waveform->newSamples( sbuf, number );
+
                                                                         //          if(filePara.channels==1)
@@ -344,3 +346,3 @@ void playIt()
 //                 }
-                                                                bytesWritten = ::write( filePara.sd, inbuffer, number);
+                                                                bytesWritten = ::write( soundDevice->sd, inbuffer, number);
                                                                 waveform->newSamples( inbuffer, number);
@@ -790,4 +792,4 @@ void QtRec::initConfig() {
                 if( compressionCheckBox->isChecked()) {
+                                bitRateComboBox->setCurrentItem(1);
                                 bitRateComboBox->setEnabled(false);
-                                bitRateComboBox->setCurrentItem(0);
                                 filePara.resolution=16;
@@ -1050,3 +1052,3 @@ bool QtRec::setupAudio( bool b) {
                         // if(soundDevice) delete soundDevice;
-                odebug << "<<<<<<<<<<<<<<<<<<<open dsp " << filePara.sampleRate << " " << filePara.channels << " " << sampleformat << "" << oendl;
+                owarn << "<<<<<<<<<<<<<<<<<<<open dsp " << filePara.sampleRate << " " << filePara.channels << " " << sampleformat << "" << oendl;
         //      owarn << "change waveform settings" << oendl;
@@ -1485,3 +1487,3 @@ void QtRec::endPlaying() {
 bool QtRec::openPlayFile() {
-
+                qWarning("opening file");
                 qApp->processEvents();
@@ -1728,4 +1730,5 @@ void QtRec::compressionSelected(bool b) {
                 if(b) {
-                                bitRateComboBox->setEnabled( false);
+                                qWarning("set adpcm");
                                 bitRateComboBox->setCurrentItem( 1);
+                                bitRateComboBox->setEnabled( false);
                                 filePara.resolution = 16;
diff --git a/noncore/multimedia/opierec/wavFile.cpp b/noncore/multimedia/opierec/wavFile.cpp
index 80453e1..b53c416 100644
--- a/noncore/multimedia/opierec/wavFile.cpp
+++ b/noncore/multimedia/opierec/wavFile.cpp
@@ -29,3 +29,3 @@ WavFile::WavFile( QObject * parent,const QString &fileName, bool makeNwFile, int
 {
-//odebug << "new wave file" << oendl;
+                owarn << "new wave file: " << fileName << oendl;
     bool b =  makeNwFile;
@@ -111,3 +111,3 @@ void WavFile::closeFile() {
 int WavFile::openFile(const QString &currentFileName) {
-//    odebug << "open play file "+currentFileName << oendl;
+                qWarning("open play file "+currentFileName);;
     closeFile();
@@ -154,3 +154,3 @@ bool WavFile::setWavHeader(int fd, wavhdr *hdr) {
   write( fd,hdr, sizeof(*hdr));
-   odebug << "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));
-  odebug << "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) {
-  odebug << "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) {
-    odebug << " 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)) {
-    odebug << " 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) {
-    odebug << "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)) {
-    odebug << "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) {
-      odebug << "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) {
-        odebug << "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) {
-        odebug << "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) {
-        odebug << "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;
-      odebug << "compressionFormat is " << fmt << "" << oendl;
+      owarn << "compressionFormat is " << fmt << "" << oendl;
       if (read(fd, &ch, 2) < 2) {
-        odebug << "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;
-        odebug << "File has " << ch << " channels" << oendl;
+        owarn << "File has " << ch << " channels" << oendl;
       }
       if (read(fd, &samplerrate, 4) < 4) {
-        odebug << "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;
-        odebug << "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) {
-        odebug << "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;
-        odebug << "File has bitrate of " << bitrate << "" << oendl;
+        owarn << "File has bitrate of " << bitrate << "" << oendl;
       }