summaryrefslogtreecommitdiff
authorjeremy <jeremy>2002-02-14 04:01:40 (UTC)
committer jeremy <jeremy>2002-02-14 04:01:40 (UTC)
commitc47e1afcc185c05f4e1d9178566032df74981489 (patch) (side-by-side diff)
tree7e3a6d3660920de9d3f6b888fac87a4f8c8e92f1
parent3d4486b3a89e45785f92d8d963b334ddd4ac095a (diff)
downloadopie-c47e1afcc185c05f4e1d9178566032df74981489.zip
opie-c47e1afcc185c05f4e1d9178566032df74981489.tar.gz
opie-c47e1afcc185c05f4e1d9178566032df74981489.tar.bz2
Just eradicating bugs. Still not ready for public/general use.
----------------------------------------------------------------------
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/applets/vmemo/moc_vmemo.cpp2
-rw-r--r--core/applets/vmemo/vmemo.cpp74
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
@@ -1,7 +1,7 @@
/****************************************************************************
** VMemo meta object code from reading C++ file 'vmemo.h'
**
-** Created: Wed Feb 13 17:52:12 2002
+** Created: Wed Feb 13 21:49:42 2002
** by: The Qt MOC ($Id$)
**
** WARNING! All changes made in this file will be lost!
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,4 +1,4 @@
-/**************************************************************************************94x78**
+/************************************************************************************
**
** This file may be distributed and/or modified under the terms of the
** GNU General Public License version 2 as published by the Free Software
@@ -8,7 +8,7 @@
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
-*********************************************************************************************/
+************************************************************************************/
/*
* $Id$
@@ -62,6 +62,7 @@ typedef struct _waveheader {
#include <qdatetime.h>
#include <qsound.h>
#include <qfile.h>
+#include <qmessagebox.h>
int seq = 0;
@@ -138,13 +139,16 @@ VMemo::VMemo( QWidget *parent, const char *name )
recording = FALSE;
- 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;
}
@@ -162,6 +166,13 @@ void VMemo::paintEvent( QPaintEvent* )
void VMemo::mousePressEvent( QMouseEvent * )
{
+ // just to be safe
+ if (recording)
+ {
+ recording = FALSE;
+ return;
+ }
+
qWarning("VMemo::mousePress()");
QSound::play(Resource::findSound("vmemob"));
@@ -170,7 +181,7 @@ void VMemo::mousePressEvent( QMouseEvent * )
if (openDSP() == -1)
{
// ### Display an error box
- qWarning("VMemo::mousePress() -> DSP error");
+ QMessageBox::critical(0, "VMemo", "Could not open dsp device.", "Abort");
recording = FALSE;
return;
}
@@ -222,7 +233,6 @@ void VMemo::mouseReleaseEvent( QMouseEvent * )
{
qWarning("VMemo::mouseRelese() -> Done recording");
recording = FALSE;
- QSound::play(Resource::findSound("vmemoe"));
}
int VMemo::openDSP()
@@ -248,39 +258,38 @@ int VMemo::openDSP()
else
dsp = open("/dev/dsp", O_RDWR);
- qWarning("speed = %i", speed);
-
if(dsp == -1)
{
perror("open(\"/dev/dsp\")");
return -1;
}
- if(ioctl(dsp, SNDCTL_DSP_SETFMT , &format)==-1) {
+ if(ioctl(dsp, SNDCTL_DSP_SETFMT , &format)==-1)
+ {
perror("ioctl(\"SNDCTL_DSP_SETFMT\")");
return -1;
}
- if(ioctl(dsp, SNDCTL_DSP_CHANNELS , &channels)==-1) {
+ if(ioctl(dsp, SNDCTL_DSP_CHANNELS , &channels)==-1)
+ {
perror("ioctl(\"SNDCTL_DSP_CHANNELS\")");
return -1;
}
- if(ioctl(dsp, SNDCTL_DSP_SPEED , &speed)==-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) {
+ if(ioctl(dsp, SOUND_PCM_READ_RATE , &rate)==-1)
+ {
perror("ioctl(\"SOUND_PCM_READ_RATE\")");
return -1;
}
- qWarning("speed = %i", speed);
return 1;
}
int VMemo::openWAV(const char *filename)
{
- char buffer[256];
-
qDebug("Creating %s ",filename);
track.setName(filename);
if(!track.open(IO_WriteOnly|IO_Truncate|IO_Raw))
@@ -292,22 +301,6 @@ int VMemo::openWAV(const char *filename)
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;
- 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;
wh.length = 0;
wh.chunk_type = WAVE;
@@ -321,12 +314,6 @@ int VMemo::openWAV(const char *filename)
wh.byte_p_sec = wh.sample_fq * wh.bit_p_spl;
wh.byte_p_spl = channels * (wh.bit_p_spl % 8);
- 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;
wh.data_length= 0;
@@ -344,8 +331,10 @@ void VMemo::record(void)
while(recording)
{
- result = read(dsp, sound, 8192);
+ result = read(dsp, sound, 512); // 8192
+ qApp->processEvents();
write(wav, sound, result);
+ qApp->processEvents();
length += result;
qApp->processEvents();
}
@@ -364,5 +353,8 @@ void VMemo::record(void)
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);
}