| -rw-r--r-- | core/applets/vmemo/moc_vmemo.cpp | 2 | ||||
| -rw-r--r-- | core/applets/vmemo/vmemo.cpp | 222 |
2 files changed, 108 insertions, 116 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 @@ ** -*********************************************************************************************/ +************************************************************************************/ @@ -29,10 +29,10 @@ typedef struct _waveheader { - u_long main_chunk; /* 'RIFF' */ - u_long length; /* filelen */ - u_long chunk_type; /* 'WAVE' */ - - u_long sub_chunk; /* 'fmt ' */ - u_long sc_len; /* length of sub_chunk, =16 (chunckSize) */ - u_short format; /* should be 1 for PCM-code (formatTag) */ - u_short modus; /* 1 Mono, 2 Stereo (channels) */ + u_long main_chunk; /* 'RIFF' */ + u_long length; /* filelen */ + u_long chunk_type; /* 'WAVE' */ + + u_long sub_chunk; /* 'fmt ' */ + u_long sc_len; /* length of sub_chunk, =16 (chunckSize) */ + u_short format; /* should be 1 for PCM-code (formatTag) */ + u_short modus; /* 1 Mono, 2 Stereo (channels) */ u_long sample_fq; /* samples per second (samplesPerSecond) */ @@ -42,12 +42,12 @@ typedef struct _waveheader { - u_long data_chunk; /* 'data' */ - u_long data_length; /* samplecount */ + u_long data_chunk; /* 'data' */ + u_long data_length;/* samplecount */ } WaveHeader; -#define RIFF 0x46464952 -#define WAVE 0x45564157 -#define FMT 0x20746D66 -#define DATA 0x61746164 -#define PCM_CODE 1 -#define WAVE_MONO 1 +#define RIFF 0x46464952 +#define WAVE 0x45564157 +#define FMT 0x20746D66 +#define DATA 0x61746164 +#define PCM_CODE 1 +#define WAVE_MONO 1 #define WAVE_STEREO 2 @@ -64,2 +64,3 @@ typedef struct _waveheader { #include <qfile.h> +#include <qmessagebox.h> @@ -140,12 +141,15 @@ 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) { - QString release=name.release; - if(release.find("embedix",0,TRUE) !=-1) { - systemZaurus=TRUE; - printf("System release: %s\n", name.release); - } else - systemZaurus=FALSE; - } - + 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; + else + systemZaurus=FALSE; + } + } @@ -164,2 +168,9 @@ void VMemo::mousePressEvent( QMouseEvent * ) { + // just to be safe + if (recording) + { + recording = FALSE; + return; + } + qWarning("VMemo::mousePress()"); @@ -170,9 +181,9 @@ void VMemo::mousePressEvent( QMouseEvent * ) if (openDSP() == -1) - { - // ### Display an error box - qWarning("VMemo::mousePress() -> DSP error"); - recording = FALSE; - return; - } - + { + // ### Display an error box + QMessageBox::critical(0, "VMemo", "Could not open dsp device.", "Abort"); + recording = FALSE; + return; + } + Config vmCfg("VMemo"); @@ -183,5 +194,5 @@ void VMemo::mousePressEvent( QMouseEvent * ) if(systemZaurus) - fileName=vmCfg.readEntry("Dir", "/mnt/cf/"); // zaurus does not have /mnt/ramfs + fileName=vmCfg.readEntry("Dir", "/mnt/cf/"); // zaurus does not have /mnt/ramfs else - fileName=vmCfg.readEntry("Dir", "/mnt/ramfs/"); + fileName=vmCfg.readEntry("Dir", "/mnt/ramfs/"); @@ -198,9 +209,9 @@ void VMemo::mousePressEvent( QMouseEvent * ) if(openWAV(fileName.latin1()) == -1) - { - // ### Display an error box - qWarning("VMemo::mousePress() -> WAV error"); - close(dsp); - return; - } - + { + // ### Display an error box + qWarning("VMemo::mousePress() -> WAV error"); + close(dsp); + return; + } + QArray<int> cats(1); @@ -224,3 +235,2 @@ void VMemo::mouseReleaseEvent( QMouseEvent * ) recording = FALSE; - QSound::play(Resource::findSound("vmemoe")); } @@ -235,43 +245,44 @@ int VMemo::openDSP() if (cfg.readNumEntry("SixteenBit", 1)) - { - format = AFMT_S16_LE; - resolution = 16; - } + { + format = AFMT_S16_LE; + resolution = 16; + } else - { - format = AFMT_U8; - resolution = 8; - } + { + format = AFMT_U8; + resolution = 8; + } if(systemZaurus) - dsp = open("/dev/dsp1", O_RDWR); //Zaurus needs /dev/dsp1 + dsp = open("/dev/dsp1", O_RDWR); //Zaurus needs /dev/dsp1 else - dsp = open("/dev/dsp", O_RDWR); - - qWarning("speed = %i", speed); - + 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; - } - qWarning("speed = %i", speed); - + } + + 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; @@ -281,4 +292,2 @@ int VMemo::openWAV(const char *filename) { - char buffer[256]; - qDebug("Creating %s ",filename); @@ -286,6 +295,6 @@ int VMemo::openWAV(const char *filename) if(!track.open(IO_WriteOnly|IO_Truncate|IO_Raw)) - { - qDebug("Could not open file"); - return -1; - } + { + qDebug("Could not open file"); + return -1; + } wav=track.handle(); @@ -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; @@ -345,9 +332,11 @@ void VMemo::record(void) while(recording) - { - result = read(dsp, sound, 8192); - write(wav, sound, result); - length += result; - qApp->processEvents(); - } - + { + result = read(dsp, sound, 512); // 8192 + qApp->processEvents(); + write(wav, sound, result); + qApp->processEvents(); + length += result; + qApp->processEvents(); + } + qWarning("VMemo::record() -> Done recording"); @@ -363,6 +352,9 @@ void VMemo::record(void) if( ioctl( dsp, SNDCTL_DSP_RESET,0) == -1)// ); //tell driver to stop for a while - perror("ioctl(\"SNDCTL_DSP_RESET\")"); + 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); } |