| -rw-r--r-- | core/applets/vmemo/vmemo.cpp | 118 |
1 files changed, 59 insertions, 59 deletions
diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp index 9d69130..fea673c 100644 --- a/core/applets/vmemo/vmemo.cpp +++ b/core/applets/vmemo/vmemo.cpp @@ -148,15 +148,15 @@ VMemo::VMemo( QWidget *parent, const char *name ) systemZaurus=TRUE; else { systemZaurus=FALSE; -// myChannel = new QCopChannel( "QPE/VMemo", this ); -// connect( myChannel, SIGNAL(received(const QCString&, const QByteArray&)), -// this, SLOT(receive(const QCString&, const QByteArray&)) ); + myChannel = new QCopChannel( "QPE/VMemo", this ); + connect( myChannel, SIGNAL(received(const QCString&, const QByteArray&)), + this, SLOT(receive(const QCString&, const QByteArray&)) ); // // Register the REC key press, for ipaq only -// QCopEnvelope e("QPE/Desktop", "keyRegister(int key, QString channel, QString message)"); -// e << 4096; -// e << QString("QPE/VMemo"); -// e << QString("toggleRecord()"); + QCopEnvelope e("QPE/Desktop", "keyRegister(int key, QString channel, QString message)"); + e << 4096; + e << QString("QPE/VMemo"); + e << QString("toggleRecord()"); } } } @@ -271,10 +271,10 @@ int VMemo::openDSP() format = AFMT_S16_LE; resolution = 16; } -// else { -// format = AFMT_U8; -// resolution = 8; -// } + else { + format = AFMT_S8; + resolution = 8; + } if(systemZaurus) { dsp = open("/dev/dsp1", O_RDWR); //Zaurus needs /dev/dsp1 @@ -343,8 +343,10 @@ void VMemo::record(void) int length=0, result, value; qDebug("Recording"); - if(format==AFMT_S16_LE) { + if(systemZaurus) { signed short sound[512], monoBuffer[512]; + + if(format==AFMT_S16_LE) { while(recording) { result = read(dsp, sound, 512); // 8192 qApp->processEvents(); @@ -367,55 +369,53 @@ void VMemo::record(void) fflush(stdout); } } - // else { //AFMT_U8 // don't try this yet.. as player doesn't understand -// 8bit unsigned - // unsigned short sound[512], monoBuffer[512]; -// while(recording) -// { -// result = read(dsp, sound, 512); // 8192 -// qApp->processEvents(); -// int j=0; -// if(systemZaurus) -// { -// for (int i = 0; i < result; i++) { //since Z is mono do normally -// monoBuffer[i] = sound[i]; -// } -// qApp->processEvents(); -// length+=write(wav, monoBuffer, result); -// } else { //ipaq /stereo inputs -// for (int i = 0; i < result; i+=2) { -// monoBuffer[j] = (sound[i]+sound[i+1])/2; -// j++; -// } -// qApp->processEvents(); -// length+=write(wav, monoBuffer, result/2); -// } -// // length += result; -// printf("%d\r",length); -// fflush(stdout); - -// qApp->processEvents(); -// } -// } - - - -// char sound[512]; //char is 8 bit - -// while(recording) -// { -// result = read(dsp, sound, 512); // 8192 -// qApp->processEvents(); - -// write(wav, sound, result); -// length += result; - -// qApp->processEvents(); -// } + else { //AFMT_S8 // don't try this yet.. as player doesn't understand 8bit unsigned + while(recording) + { + result = read(dsp, sound, 512); // 8192 + qApp->processEvents(); + int j=0; + if(systemZaurus) + { + for (int i = 0; i < result; i++) { //since Z is mono do normally + monoBuffer[i] = sound[i]; + } + qApp->processEvents(); + length+=write(wav, monoBuffer, result); + } else { //ipaq /stereo inputs + for (int i = 0; i < result; i+=2) { + monoBuffer[j] = (sound[i]+sound[i+1])/2; + j++; + } + qApp->processEvents(); + length+=write(wav, monoBuffer, result/2); + } + length += result; + printf("%d\r",length); + fflush(stdout); + + qApp->processEvents(); + } +} + +} else { + + char sound[512]; //char is 8 bit + + while(recording) +{ + result = read(dsp, sound, 512); // 8192 + qApp->processEvents(); + + write(wav, sound, result); + length += result; + + qApp->processEvents(); +} // qDebug("file has length of %d lasting %d seconds", // length, (( length / speed) / channels) / 2 ); // medialplayer states wrong length in secs - +} value = length+36; lseek(wav, 4, SEEK_SET); @@ -427,7 +427,7 @@ void VMemo::record(void) if( ioctl( dsp, SNDCTL_DSP_RESET,0) == -1) perror("ioctl(\"SNDCTL_DSP_RESET\")"); ::close(dsp); -// if(systemZaurus) + if(systemZaurus) QMessageBox::message("Vmemo"," Done recording"); QSound::play(Resource::findSound("vmemoe")); |