summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2004-09-27 09:46:44 (UTC)
committer llornkcor <llornkcor>2004-09-27 09:46:44 (UTC)
commit28c514ec19215b6db5e98ba64d5f716c0b5ba391 (patch) (unidiff)
treec39132999d045d127848d8a5b8513e079d90203f
parent3381ae96e9f386e96feb4121425912f9ddb3a53f (diff)
downloadopie-28c514ec19215b6db5e98ba64d5f716c0b5ba391.zip
opie-28c514ec19215b6db5e98ba64d5f716c0b5ba391.tar.gz
opie-28c514ec19215b6db5e98ba64d5f716c0b5ba391.tar.bz2
fix vmemo
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/vmemo/vmemo.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp
index 07ef15c..d5808b7 100644
--- a/core/applets/vmemo/vmemo.cpp
+++ b/core/applets/vmemo/vmemo.cpp
@@ -213,28 +213,31 @@ VMemo::VMemo( QWidget *parent, const char *_name )
213 213
214 odebug << "toggleKey " << toggleKey << "" << oendl; 214 odebug << "toggleKey " << toggleKey << "" << oendl;
215 215
216// if ( QFile::exists ( "/dev/sharp_buz" ) || QFile::exists ( "/dev/sharp_led" )) 216// if ( QFile::exists ( "/dev/sharp_buz" ) || QFile::exists ( "/dev/sharp_led" ))
217// systemZaurus=TRUE; 217// systemZaurus=TRUE;
218// else 218// else
219 systemZaurus = FALSE; 219 systemZaurus = FALSE;
220 220
221// myChannel = new QCopChannel( "QPE/VMemo", this );
221 myChannel = new QCopChannel( "QPE/VMemo", this ); 222 myChannel = new QCopChannel( "QPE/VMemo", this );
223
222 connect( myChannel, SIGNAL(received(const QCString&,const QByteArray&)), 224 connect( myChannel, SIGNAL(received(const QCString&,const QByteArray&)),
223 this, SLOT(receive(const QCString&,const QByteArray&)) ); 225 this, SLOT(receive(const QCString&,const QByteArray&)) );
224 226
227
225 if( toggleKey != -1 ) { 228 if( toggleKey != -1 ) {
226 odebug << "Register key " << toggleKey << "" << oendl; 229 odebug << "Register key " << toggleKey << "" << oendl;
227 QCopEnvelope e("QPE/Launcher", "keyRegister(int,QCString,QCString)"); 230 QCopEnvelope e("QPE/Launcher", "keyRegister(int,QCString,QCString)");
228 // e << 4096; // Key_Escape 231 // e << 4096; // Key_Escape
229 // e << Key_F5; //4148 232 // e << Key_F5; //4148
230 e << toggleKey; 233 e << toggleKey;
231 e << QString("QPE/VMemo"); 234 e << QCString("QPE/VMemo");
232 e << QString("toggleRecord()"); 235 e << QCString("toggleRecord()");
233 } 236 }
234 if(toggleKey == 1) 237 if(toggleKey == 1)
235 usingIcon = TRUE; 238 usingIcon = TRUE;
236 else 239 else
237 usingIcon = FALSE; 240 usingIcon = FALSE;
238// if( vmCfg.readNumEntry("hideIcon",0) == 1) 241// if( vmCfg.readNumEntry("hideIcon",0) == 1)
239 if (!usingIcon) 242 if (!usingIcon)
240 hide(); 243 hide();
@@ -246,17 +249,16 @@ VMemo::~VMemo() {
246} 249}
247 250
248int VMemo::position() 251int VMemo::position()
249{ 252{
250 return 6; 253 return 6;
251} 254}
252 255
253void VMemo::receive( const QCString &msg, const QByteArray &data ) { 256void VMemo::receive( const QCString &msg, const QByteArray &data ) {
254 odebug << "Vmemo receive" << oendl;
255 QDataStream stream( data, IO_ReadOnly ); 257 QDataStream stream( data, IO_ReadOnly );
256 258
257 if (msg == "toggleRecord()") { 259 if (msg == "toggleRecord()") {
258 if (recording) { 260 if (recording) {
259 fromToggle = TRUE; 261 fromToggle = TRUE;
260 stopRecording(); 262 stopRecording();
261 } else { 263 } else {
262 fromToggle = TRUE; 264 fromToggle = TRUE;
@@ -515,17 +517,17 @@ bool VMemo::record() {
515 517
516 int bufsize = config.readNumEntry("BufferSize",1024); 518 int bufsize = config.readNumEntry("BufferSize",1024);
517 unsigned short sound[bufsize]; //, monoBuffer[bufsize]; 519 unsigned short sound[bufsize]; //, monoBuffer[bufsize];
518 char abuf[bufsize / 2]; 520 char abuf[bufsize / 2];
519 short sbuf[bufsize]; 521 short sbuf[bufsize];
520 odebug << "ready to record"<< oendl; 522 odebug << "ready to record"<< oendl;
521 if(useADPCM) { 523 if(useADPCM) {
522 odebug << "usr ADPCM" << oendl; 524 odebug << "usr ADPCM" << oendl;
523 525
524 while(recording) { 526 while(recording) {
525 result = ::read(dsp, sbuf, bufsize); // adpcm read 527 result = ::read(dsp, sbuf, bufsize); // adpcm read
526 if( result <= 0) { 528 if( result <= 0) {
527 perror("recording error "); 529 perror("recording error ");
528 QMessageBox::message(tr("Note"),tr("error recording")); 530 QMessageBox::message(tr("Note"),tr("error recording"));
529 recording = FALSE; 531 recording = FALSE;
530 break; 532 break;
531 return FALSE; 533 return FALSE;
@@ -660,10 +662,10 @@ int VMemo::setToggleButton(int tog) {
660 662
661void VMemo::timerBreak() { 663void VMemo::timerBreak() {
662 //stop 664 //stop
663 stopRecording(); 665 stopRecording();
664 QMessageBox::message("Vmemo","Vmemo recording has ended"); 666 QMessageBox::message("Vmemo","Vmemo recording has ended");
665} 667}
666 668
667 669
668EXPORT_OPIE_APPLET_v1( VMemo ) 670//EXPORT_OPIE_APPLET_v1( VMemo )
669 671