summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/vmemo/vmemo.cpp97
-rw-r--r--core/applets/vmemo/vmemo.h1
2 files changed, 33 insertions, 65 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
@@ -138,14 +138,13 @@ VMemo::VMemo( QWidget *parent, const char *name )
138{ 138{
139 setFixedHeight( 18 ); 139 setFixedHeight( 18 );
140 setFixedWidth( 14 ); 140 setFixedWidth( 14 );
141 141
142 recording = FALSE; 142 recording = FALSE;
143 143
144 myChannel = new QCopChannel( "QPE/VMemo", this ); 144 myChannel = new QCopChannel( "QPE/VMemo", this );
145 connect( myChannel, SIGNAL(sayHi()), this, SLOT(sayHi()) );
146 connect( myChannel, SIGNAL(received(const QCString&, const QByteArray&)), 145 connect( myChannel, SIGNAL(received(const QCString&, const QByteArray&)),
147 this, SLOT(receive(const QCString&, const QByteArray&)) ); 146 this, SLOT(receive(const QCString&, const QByteArray&)) );
148 147
149 struct utsname name; /* check for embedix kernel running on the zaurus, if 148 struct utsname name; /* check for embedix kernel running on the zaurus, if
150 lineo change string, this break 149 lineo change string, this break
151 */ 150 */
@@ -157,51 +156,13 @@ VMemo::VMemo( QWidget *parent, const char *name )
157 systemZaurus=TRUE; 156 systemZaurus=TRUE;
158 else 157 else
159 { 158 {
160 int fr;
161 systemZaurus=FALSE; 159 systemZaurus=FALSE;
162 160
163 if ((fr = fork()) == -1) 161 // Register the REC key press.
164 { 162 QCopEnvelope e("QPE/Desktop", "keyRegister(int key, QString channel, QString message)");
165 qWarning("Fork failed"); 163 e << 4096;
166 } 164 e << QString("QPE/VMemo");
167 else if (fr == 0) 165 e << QString("toggleRecord()");
168 {
169 int key, max;
170 fd_set fdr;
171 char buffer[10];
172
173 key = open("/dev/touchscreen/key", O_RDONLY);
174 if (key == -1)
175 {
176 qWarning("Could not open key");
177 exit(1);
178 }
179
180 while(1)
181 {
182 FD_ZERO(&fdr);
183 FD_SET(key, &fdr);
184 max = key;
185
186 qWarning("while");
187
188 read(key, buffer, 10);
189 if(*buffer == (char)129)
190 {
191 qWarning("REC = stop");
192 QCopEnvelope( "QPE/VMemo", "toggleRecord()");
193 QCopEnvelope( "QPE/VMemo", "sayHi()");
194 }
195 else if(*buffer == (char)1)
196 {
197 qWarning("REC = start");
198 QCopEnvelope( "QPE/VMemo", "toggleRecord()");
199 QCopEnvelope( "QPE/VMemo", "sayHi()");
200 }
201 }
202 }
203 else if(fr)
204 qWarning("parent: Fork = good");
205 } 166 }
206 } 167 }
207 qWarning("VMemo done init"); 168 qWarning("VMemo done init");
@@ -211,18 +172,17 @@ VMemo::~VMemo()
211{ 172{
212} 173}
213 174
214void VMemo::sayHi()
215{
216 qWarning("Hi");
217}
218
219void VMemo::receive( const QCString &msg, const QByteArray &data ) 175void VMemo::receive( const QCString &msg, const QByteArray &data )
220{ 176{
221 QDataStream stream( data, IO_ReadOnly ); 177 QDataStream stream( data, IO_ReadOnly );
222 qWarning(msg); 178 qWarning("VMemo::receive: %s", (const char *)msg);
223 if ( msg == "toggleRecord()" ) { 179 if (msg == "toggleRecord()")
224 qWarning("Hello"); 180 {
225 } 181 if (recording)
182 mouseReleaseEvent(NULL);
183 else
184 mousePressEvent(NULL);
185 }
226} 186}
227 187
228void VMemo::paintEvent( QPaintEvent* ) 188void VMemo::paintEvent( QPaintEvent* )
@@ -233,8 +193,6 @@ void VMemo::paintEvent( QPaintEvent* )
233 193
234void VMemo::mousePressEvent( QMouseEvent * ) 194void VMemo::mousePressEvent( QMouseEvent * )
235{ 195{
236 QCopEnvelope( "QPE/VMemo", "sayHi()");
237
238 // just to be safe 196 // just to be safe
239 if (recording) 197 if (recording)
240 { 198 {
@@ -395,8 +353,8 @@ int VMemo::openWAV(const char *filename)
395 353
396void VMemo::record(void) 354void VMemo::record(void)
397{ 355{
398 int length=0, result, value; 356 int length=0, result, value; //, i;
399 char sound[8192]; 357 char sound[512]; //, leftBuffer[256], rightBuffer[256];
400 358
401 qWarning("VMemo::record()"); 359 qWarning("VMemo::record()");
402 360
@@ -404,12 +362,24 @@ void VMemo::record(void)
404 { 362 {
405 result = read(dsp, sound, 512); // 8192 363 result = read(dsp, sound, 512); // 8192
406 qApp->processEvents(); 364 qApp->processEvents();
407 write(wav, sound, result); 365
366 /* attempt to write only one channel...didnt work.
367 for (i = 0; i < result; i++) {
368 leftBuffer[i] = sound[2*i];
369 rightBuffer[i] = sound[2*i+1];
370 }
371 */
408 qApp->processEvents(); 372 qApp->processEvents();
373
374 /* needed to only write one channel. comment out above "write/length" code.
375 write(wav, leftBuffer, result / 2);
376 length += result/2;
377 */
378
379 write(wav, sound, result);
409 length += result; 380 length += result;
381
410 qApp->processEvents(); 382 qApp->processEvents();
411 // printf("%d\r",length);
412 // fflush(stdout);
413 } 383 }
414 384
415 qWarning("VMemo::record() -> Done recording"); 385 qWarning("VMemo::record() -> Done recording");
@@ -420,7 +390,6 @@ void VMemo::record(void)
420 write(wav, &value, 4); 390 write(wav, &value, 4);
421 lseek(wav, 40, SEEK_SET); 391 lseek(wav, 40, SEEK_SET);
422 write(wav, &length, 4); 392 write(wav, &length, 4);
423 // qDebug("File length %d, samplecount %d", value, length);
424 track.close(); 393 track.close();
425 394
426 if( ioctl( dsp, SNDCTL_DSP_RESET,0) == -1) 395 if( ioctl( dsp, SNDCTL_DSP_RESET,0) == -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
@@ -36,7 +36,6 @@ public slots:
36 void mousePressEvent( QMouseEvent * ); 36 void mousePressEvent( QMouseEvent * );
37 void mouseReleaseEvent( QMouseEvent * ); 37 void mouseReleaseEvent( QMouseEvent * );
38 void receive( const QCString &msg, const QByteArray &data ); 38 void receive( const QCString &msg, const QByteArray &data );
39 void sayHi();
40 39
41private: 40private:
42 void paintEvent( QPaintEvent* ); 41 void paintEvent( QPaintEvent* );