summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/applets/vmemo/vmemo.cpp89
-rw-r--r--core/applets/vmemo/vmemo.h1
2 files changed, 29 insertions, 61 deletions
diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp
index 5ce6fa9..006e0ba 100644
--- a/core/applets/vmemo/vmemo.cpp
+++ b/core/applets/vmemo/vmemo.cpp
@@ -49,386 +49,355 @@ typedef struct _waveheader {
#define RIFF 0x46464952
#define WAVE 0x45564157
#define FMT 0x20746D66
#define DATA 0x61746164
#define PCM_CODE 1
#define WAVE_MONO 1
#define WAVE_STEREO 2
#include "vmemo.h"
#include <qpe/qpeapplication.h>
#include <qpe/resource.h>
#include <qpe/config.h>
#include <qpainter.h>
#include <qdatetime.h>
#include <qsound.h>
#include <qfile.h>
#include <qmessagebox.h>
int seq = 0;
/* XPM */
static char * vmemo_xpm[] = {
"14 14 47 1",
" c None",
". c #101010",
"+ c #0D0D0D",
"@ c #0B0B0B",
"# c #393939",
"$ c #6C6C6C",
"% c #5D5D5D",
"& c #4E4E4E",
"* c #1C1C1C",
"= c #131313",
"- c #7B7B7B",
"; c #303030",
"> c #383838",
", c #3F3F3F",
"' c #343434",
") c #060606",
"! c #444444",
"~ c #646464",
"{ c #505050",
"] c #717171",
"^ c #1B1B1B",
"/ c #585858",
"( c #4C4C4C",
"_ c #353535",
": c #0E0E0E",
"< c #080808",
"[ c #262626",
"} c #121212",
"| c #7F7F7F",
"1 c #464646",
"2 c #0C0C0C",
"3 c #727272",
"4 c #292929",
"5 c #656565",
"6 c #565656",
"7 c #434343",
"8 c #272727",
"9 c #0F0F0F",
"0 c #3A3A3A",
"a c #090909",
"b c #535353",
"c c #545454",
"d c #494949",
"e c #7A7A7A",
"f c #202020",
"g c #3D3D3D",
"h c #1F1F1F",
" .+@ ",
" #$%&* ",
" =-;>,')",
" .$;!~,)",
" ;#{]!)",
" ^~/(_)",
" ./:@<[)",
" }. .|]1;;2 ",
" #-$;^/3&;;4@ ",
".$;;#5:67;89 ",
":%;0%&ab;8. ",
"@cd%e!fg49 ",
" h0,!_;2@ ",
" ))))) "};
VMemo::VMemo( QWidget *parent, const char *name )
: QWidget( parent, name )
{
setFixedHeight( 18 );
setFixedWidth( 14 );
recording = FALSE;
myChannel = new QCopChannel( "QPE/VMemo", this );
- connect( myChannel, SIGNAL(sayHi()), this, SLOT(sayHi()) );
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;
else
{
- int fr;
systemZaurus=FALSE;
- if ((fr = fork()) == -1)
- {
- qWarning("Fork failed");
- }
- else if (fr == 0)
- {
- int key, max;
- fd_set fdr;
- char buffer[10];
-
- key = open("/dev/touchscreen/key", O_RDONLY);
- if (key == -1)
- {
- qWarning("Could not open key");
- exit(1);
- }
-
- while(1)
- {
- FD_ZERO(&fdr);
- FD_SET(key, &fdr);
- max = key;
-
- qWarning("while");
-
- read(key, buffer, 10);
- if(*buffer == (char)129)
- {
- qWarning("REC = stop");
- QCopEnvelope( "QPE/VMemo", "toggleRecord()");
- QCopEnvelope( "QPE/VMemo", "sayHi()");
- }
- else if(*buffer == (char)1)
- {
- qWarning("REC = start");
- QCopEnvelope( "QPE/VMemo", "toggleRecord()");
- QCopEnvelope( "QPE/VMemo", "sayHi()");
- }
- }
- }
- else if(fr)
- qWarning("parent: Fork = good");
+ // 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::sayHi()
-{
- qWarning("Hi");
-}
-
void VMemo::receive( const QCString &msg, const QByteArray &data )
{
QDataStream stream( data, IO_ReadOnly );
- qWarning(msg);
- if ( msg == "toggleRecord()" ) {
- qWarning("Hello");
+ qWarning("VMemo::receive: %s", (const char *)msg);
+ 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 * )
{
- QCopEnvelope( "QPE/VMemo", "sayHi()");
-
// 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", 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;
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_sec = speed * channels * resolution/8;
wh.byte_p_spl = channels * (resolution / 8);
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;
- char sound[8192];
+ int length=0, result, value; //, i;
+ char sound[512]; //, leftBuffer[256], rightBuffer[256];
qWarning("VMemo::record()");
while(recording)
{
result = read(dsp, sound, 512); // 8192
qApp->processEvents();
- write(wav, sound, result);
+
+ /* 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();
- // printf("%d\r",length);
- // fflush(stdout);
}
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);
- // qDebug("File length %d, samplecount %d", value, length);
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);
}
diff --git a/core/applets/vmemo/vmemo.h b/core/applets/vmemo/vmemo.h
index 824309e..d96cd94 100644
--- a/core/applets/vmemo/vmemo.h
+++ b/core/applets/vmemo/vmemo.h
@@ -1,55 +1,54 @@
/**************************************************************************************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
** Foundation and appearing in the file LICENSE.GPL included in the
** packaging of this file.
**
** 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$
*/
#ifndef __VMEMO_H__
#define __VMEMO_H__
#include <qwidget.h>
#include <qpixmap.h>
#include <qpe/applnk.h>
#include <qfile.h>
#include <qpe/qcopenvelope_qws.h>
class VMemo : public QWidget
{
Q_OBJECT
public:
VMemo( QWidget *parent, const char *name = NULL);
~VMemo();
QFile track;
public slots:
void record();
void mousePressEvent( QMouseEvent * );
void mouseReleaseEvent( QMouseEvent * );
void receive( const QCString &msg, const QByteArray &data );
- void sayHi();
private:
void paintEvent( QPaintEvent* );
int openDSP();
int openWAV(const char *filename);
QPixmap vmemoPixmap;
QCopChannel *myChannel;
bool systemZaurus;
int dsp, wav, rate, speed, channels, format, resolution;
bool recording;
};
#endif // __VMEMO_H__