author | jeremy <jeremy> | 2002-02-14 04:01:40 (UTC) |
---|---|---|
committer | jeremy <jeremy> | 2002-02-14 04:01:40 (UTC) |
commit | c47e1afcc185c05f4e1d9178566032df74981489 (patch) (side-by-side diff) | |
tree | 7e3a6d3660920de9d3f6b888fac87a4f8c8e92f1 /core/applets/vmemo | |
parent | 3d4486b3a89e45785f92d8d963b334ddd4ac095a (diff) | |
download | opie-c47e1afcc185c05f4e1d9178566032df74981489.zip opie-c47e1afcc185c05f4e1d9178566032df74981489.tar.gz opie-c47e1afcc185c05f4e1d9178566032df74981489.tar.bz2 |
Just eradicating bugs. Still not ready for public/general use.
----------------------------------------------------------------------
-rw-r--r-- | core/applets/vmemo/moc_vmemo.cpp | 2 | ||||
-rw-r--r-- | core/applets/vmemo/vmemo.cpp | 74 |
2 files changed, 34 insertions, 42 deletions
diff --git a/core/applets/vmemo/moc_vmemo.cpp b/core/applets/vmemo/moc_vmemo.cpp index 7e68ac1..fbe1f6b 100644 --- a/core/applets/vmemo/moc_vmemo.cpp +++ b/core/applets/vmemo/moc_vmemo.cpp @@ -3,3 +3,3 @@ ** -** Created: Wed Feb 13 17:52:12 2002 +** Created: Wed Feb 13 21:49:42 2002 ** by: The Qt MOC ($Id$) diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp index 6bd1622..73bd996 100644 --- a/core/applets/vmemo/vmemo.cpp +++ b/core/applets/vmemo/vmemo.cpp @@ -1,2 +1,2 @@ -/**************************************************************************************94x78** +/************************************************************************************ ** @@ -10,3 +10,3 @@ ** -*********************************************************************************************/ +************************************************************************************/ @@ -64,2 +64,3 @@ typedef struct _waveheader { #include <qfile.h> +#include <qmessagebox.h> @@ -140,9 +141,12 @@ VMemo::VMemo( QWidget *parent, const char *name ) - struct utsname name; //check for embedix kernel running on the zaurus, if lineo change string, this break - if (uname(&name) != -1) { + 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; - if(release.find("embedix",0,TRUE) !=-1) { + qWarning("System release: %s\n", name.release); + if(release.find("embedix",0,TRUE) !=-1) systemZaurus=TRUE; - printf("System release: %s\n", name.release); - } else + else systemZaurus=FALSE; @@ -164,2 +168,9 @@ void VMemo::mousePressEvent( QMouseEvent * ) { + // just to be safe + if (recording) + { + recording = FALSE; + return; + } + qWarning("VMemo::mousePress()"); @@ -172,3 +183,3 @@ void VMemo::mousePressEvent( QMouseEvent * ) // ### Display an error box - qWarning("VMemo::mousePress() -> DSP error"); + QMessageBox::critical(0, "VMemo", "Could not open dsp device.", "Abort"); recording = FALSE; @@ -224,3 +235,2 @@ void VMemo::mouseReleaseEvent( QMouseEvent * ) recording = FALSE; - QSound::play(Resource::findSound("vmemoe")); } @@ -250,4 +260,2 @@ int VMemo::openDSP() - qWarning("speed = %i", speed); - if(dsp == -1) @@ -258,3 +266,4 @@ int VMemo::openDSP() - if(ioctl(dsp, SNDCTL_DSP_SETFMT , &format)==-1) { + if(ioctl(dsp, SNDCTL_DSP_SETFMT , &format)==-1) + { perror("ioctl(\"SNDCTL_DSP_SETFMT\")"); @@ -262,3 +271,4 @@ int VMemo::openDSP() } - if(ioctl(dsp, SNDCTL_DSP_CHANNELS , &channels)==-1) { + if(ioctl(dsp, SNDCTL_DSP_CHANNELS , &channels)==-1) + { perror("ioctl(\"SNDCTL_DSP_CHANNELS\")"); @@ -266,3 +276,4 @@ int VMemo::openDSP() } - if(ioctl(dsp, SNDCTL_DSP_SPEED , &speed)==-1) { + if(ioctl(dsp, SNDCTL_DSP_SPEED , &speed)==-1) + { perror("ioctl(\"SNDCTL_DSP_SPEED\")"); @@ -270,3 +281,4 @@ int VMemo::openDSP() } - if(ioctl(dsp, SOUND_PCM_READ_RATE , &rate)==-1) { + if(ioctl(dsp, SOUND_PCM_READ_RATE , &rate)==-1) + { perror("ioctl(\"SOUND_PCM_READ_RATE\")"); @@ -274,3 +286,2 @@ int VMemo::openDSP() } - qWarning("speed = %i", speed); @@ -281,4 +292,2 @@ int VMemo::openWAV(const char *filename) { - char buffer[256]; - qDebug("Creating %s ",filename); @@ -294,18 +303,2 @@ int VMemo::openWAV(const char *filename) - /* - 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; - wh.byte_p_spl = ((resolution == 8) ? 1 : 2) * (channels ? 2 : 1); - wh.byte_p_sec = resolution; //speed * wh.modus * wh.byte_p_spl; - wh.bit_p_spl = resolution; - wh.data_chunk = DATA; - wh.data_length= 0; - */ - wh.main_chunk = RIFF; @@ -323,8 +316,2 @@ int VMemo::openWAV(const char *filename) - qWarning("channels = %i\n" - "samplesPerSecond = %i\n" - "avgBytesPerSecond = %i\n" - "blockAlign = %i\n" - "bitsPerSecond = %i\n", wh.modus, wh.sample_fq, wh.byte_p_sec, wh.byte_p_spl, wh.bit_p_spl); - wh.data_chunk = DATA; @@ -346,4 +333,6 @@ void VMemo::record(void) { - result = read(dsp, sound, 8192); + result = read(dsp, sound, 512); // 8192 + qApp->processEvents(); write(wav, sound, result); + qApp->processEvents(); length += result; @@ -366,3 +355,6 @@ void VMemo::record(void) + qWarning("VMemo::record() -> playing done recording sound"); + QSound::play(Resource::findSound("vmemoe")); qWarning("VMemo::record() -> terminating"); + QMessageBox::information(0, "VMemo", "Recording Done", 1); } |