| -rw-r--r-- | core/applets/vmemo/vmemo.cpp | 71 |
1 files changed, 25 insertions, 46 deletions
diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp index aa23ba7..48dd193 100644 --- a/core/applets/vmemo/vmemo.cpp +++ b/core/applets/vmemo/vmemo.cpp @@ -142,132 +142,135 @@ VMemo::VMemo( QWidget *parent, const char *name ) recording = FALSE; myChannel = new QCopChannel( "QPE/VMemo", this ); connect( myChannel, SIGNAL(received(const QCString&, const QByteArray&)), this, SLOT(receive(const QCString&, const QByteArray&)) ); struct utsname name; /* check for embedix kernel running on the zaurus, if lineo change string, this break */ if (uname(&name) != -1) { QString release=name.release; - qWarning("System release: %s\n", name.release); if(release.find("embedix",0,TRUE) !=-1) - systemZaurus=TRUE; + systemZaurus=TRUE; else { systemZaurus=FALSE; // Register the REC key press. QCopEnvelope e("QPE/Desktop", "keyRegister(int key, QString channel, QString message)"); e << 4096; e << QString("QPE/VMemo"); e << QString("toggleRecord()"); } } - qWarning("VMemo done init"); } VMemo::~VMemo() { } void VMemo::receive( const QCString &msg, const QByteArray &data ) { - QDataStream stream( data, IO_ReadOnly ); - qWarning("VMemo::receive: %s", (const char *)msg); - if (msg == "toggleRecord()") - { - if (recording) - mouseReleaseEvent(NULL); - else - mousePressEvent(NULL); - } + QDataStream stream( data, IO_ReadOnly ); + if (msg == "toggleRecord()") + { + if (recording) + mouseReleaseEvent(NULL); + else + mousePressEvent(NULL); + } } void VMemo::paintEvent( QPaintEvent* ) { QPainter p(this); p.drawPixmap( 0, 1,( const char** ) vmemo_xpm ); } -void VMemo::mousePressEvent( QMouseEvent * ) +void VMemo::mousePressEvent( QMouseEvent *me ) { // just to be safe if (recording) { recording = FALSE; return; } + + /* + No mousePress/mouseRelease recording on the iPAQ. The REC button on the iPAQ calls these functions + mousePressEvent and mouseReleaseEvent with a NULL parameter. + */ + if (!systemZaurus && me != NULL) + return; - qWarning("VMemo::mousePress()"); QSound::play(Resource::findSound("vmemob")); recording = TRUE; - qWarning("VMemo::mousePress() -> Starting to record"); if (openDSP() == -1) { - // ### Display an error box QMessageBox::critical(0, "VMemo", "Could not open dsp device.", "Abort"); recording = FALSE; return; } Config vmCfg("VMemo"); vmCfg.setGroup("Defaults"); QDateTime dt = QDateTime::currentDateTime(); QString fileName; + if(systemZaurus) fileName=vmCfg.readEntry("Dir", "/mnt/cf/"); // zaurus does not have /mnt/ramfs else fileName=vmCfg.readEntry("Dir", "/mnt/ramfs/"); fileName += "vm_"; fileName += dt.toString(); fileName += ".wav"; // No spaces in the filename fileName.replace(QRegExp("'"),""); fileName.replace(QRegExp(" "),"_"); fileName.replace(QRegExp(":"),"."); fileName.replace(QRegExp(","),""); if(openWAV(fileName.latin1()) == -1) { - // ### Display an error box - qWarning("VMemo::mousePress() -> WAV error"); + QString err("Could not open the output file: "); + err += fileName; + + QMessageBox::critical(0, "VMemo", err, "Abort"); close(dsp); return; } QArray<int> cats(1); cats[0] = vmCfg.readNumEntry("Category", 0); QString dlName("vm_"); dlName += dt.toString(); DocLnk l; l.setFile(fileName); l.setName(dlName); l.setType("audio/x-wav"); l.setCategories(cats); l.writeLink(); record(); } void VMemo::mouseReleaseEvent( QMouseEvent * ) { - qWarning("VMemo::mouseRelese() -> Done recording"); recording = FALSE; } int VMemo::openDSP() { Config cfg("Sound"); cfg.setGroup("Record"); speed = cfg.readNumEntry("SampleRate", 22050); channels = cfg.readNumEntry("Stereo", 1) ? 2 : 1; // 1 = stereo(2), 0 = mono(1) if (cfg.readNumEntry("SixteenBit", 1)==1) { @@ -311,31 +314,28 @@ int VMemo::openDSP() } if(ioctl(dsp, SOUND_PCM_READ_RATE , &rate)==-1) { perror("ioctl(\"SOUND_PCM_READ_RATE\")"); return -1; } return 1; } int VMemo::openWAV(const char *filename) { - qDebug("Creating %s ",filename); track.setName(filename); if(!track.open(IO_WriteOnly|IO_Truncate|IO_Raw)) - { - qDebug("Could not open file"); return -1; - } + wav=track.handle(); WaveHeader wh; wh.main_chunk = RIFF; wh.length=0; wh.chunk_type = WAVE; wh.sub_chunk = FMT; wh.sc_len = 16; wh.format = PCM_CODE; wh.modus = channels; wh.sample_fq = speed; @@ -344,60 +344,39 @@ int VMemo::openWAV(const char *filename) wh.bit_p_spl = resolution; wh.data_chunk = DATA; wh.data_length= 0; // qDebug("Write header channels %d, speed %d, b/s %d, blockalign %d, bitrate %d" // , wh.modus, wh.sample_fq, wh.byte_p_sec, wh.byte_p_spl, wh.bit_p_spl ); write (wav, &wh, sizeof(WaveHeader)); return 1; } void VMemo::record(void) { - int length=0, result, value; //, i; - char sound[512]; //, leftBuffer[256], rightBuffer[256]; - - qWarning("VMemo::record()"); + int length=0, result, value; + char sound[512]; while(recording) { result = read(dsp, sound, 512); // 8192 qApp->processEvents(); - /* attempt to write only one channel...didnt work. - for (i = 0; i < result; i++) { - leftBuffer[i] = sound[2*i]; - rightBuffer[i] = sound[2*i+1]; - } - */ - qApp->processEvents(); - - /* needed to only write one channel. comment out above "write/length" code. - write(wav, leftBuffer, result / 2); - length += result/2; - */ - write(wav, sound, result); length += result; qApp->processEvents(); } - qWarning("VMemo::record() -> Done recording"); - qWarning("VMemo::record() -> Closing dsp"); - value = length+36; lseek(wav, 4, SEEK_SET); write(wav, &value, 4); lseek(wav, 40, SEEK_SET); write(wav, &length, 4); track.close(); if( ioctl( dsp, SNDCTL_DSP_RESET,0) == -1) perror("ioctl(\"SNDCTL_DSP_RESET\")"); ::close(dsp); - qWarning("VMemo::record() -> playing done recording sound"); QSound::play(Resource::findSound("vmemoe")); - qWarning("VMemo::record() -> terminating"); - //QMessageBox::information(0, "VMemo", "Recording Done", 1); } |