author | llornkcor <llornkcor> | 2002-02-15 02:36:29 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-02-15 02:36:29 (UTC) |
commit | e5ac946b3ced52f4aba73dfc64398bb3d8245734 (patch) (side-by-side diff) | |
tree | 32f88c29a365816eb0b888244e299bd24a164d5d | |
parent | 77ea163d796ac330ad688210e049ab3763d9dd11 (diff) | |
download | opie-e5ac946b3ced52f4aba73dfc64398bb3d8245734.zip opie-e5ac946b3ced52f4aba73dfc64398bb3d8245734.tar.gz opie-e5ac946b3ced52f4aba73dfc64398bb3d8245734.tar.bz2 |
changed default format
-rw-r--r-- | core/applets/vmemo/vmemo.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp index 83f19f5..25ee476 100644 --- a/core/applets/vmemo/vmemo.cpp +++ b/core/applets/vmemo/vmemo.cpp @@ -149,193 +149,193 @@ VMemo::VMemo( QWidget *parent, const char *name ) QString release=name.release; qWarning("System release: %s\n", name.release); if(release.find("embedix",0,TRUE) !=-1) systemZaurus=TRUE; else systemZaurus=FALSE; } } VMemo::~VMemo() { } void VMemo::paintEvent( QPaintEvent* ) { QPainter p(this); p.drawPixmap( 0, 1,( const char** ) vmemo_xpm ); } void VMemo::mousePressEvent( QMouseEvent * ) { // just to be safe if (recording) { recording = FALSE; 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"); 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", 11025); + speed = cfg.readNumEntry("SampleRate", 22050); channels = cfg.readNumEntry("Stereo", 1) ? 2 : 1; // 1 = stereo(2), 0 = mono(1) if (cfg.readNumEntry("SixteenBit", 1)==1) { format = AFMT_S16_LE; resolution = 16; } else { format = AFMT_U8; resolution = 8; } if(systemZaurus) { dsp = open("/dev/dsp1", O_RDWR); //Zaurus needs /dev/dsp1 channels=1; //zaurus has one input channel } else dsp = open("/dev/dsp", O_RDWR); if(dsp == -1) { perror("open(\"/dev/dsp\")"); return -1; } if(ioctl(dsp, SNDCTL_DSP_SETFMT , &format)==-1) { perror("ioctl(\"SNDCTL_DSP_SETFMT\")"); return -1; } if(ioctl(dsp, SNDCTL_DSP_CHANNELS , &channels)==-1) { perror("ioctl(\"SNDCTL_DSP_CHANNELS\")"); return -1; } if(ioctl(dsp, SNDCTL_DSP_SPEED , &speed)==-1) { perror("ioctl(\"SNDCTL_DSP_SPEED\")"); return -1; } 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;// RIFF wh.chunk_type = WAVE;//WAVE wh.sub_chunk = FMT;// fmt wh.sc_len = 16;// format length = 16 wh.format = PCM_CODE;// PCM wh.modus = channels;// channels wh.sample_fq = speed;//samplerate wh.byte_p_sec = speed * channels * resolution/8;// av bytes per second wh.byte_p_spl = channels * (resolution / 8); //block align wh.bit_p_spl = resolution;//bits per sample 8, or 16 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; char sound[8192]; qWarning("VMemo::record()"); while(recording) { result = read(dsp, sound, 512); // 8192 qApp->processEvents(); write(wav, sound, result); qApp->processEvents(); length += result; |