-rw-r--r-- | core/applets/cardmon/cardmon.cpp | 6 | ||||
-rw-r--r-- | core/applets/vmemo/vmemo.cpp | 9 |
2 files changed, 6 insertions, 9 deletions
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp index 3a6ad27..3af3d03 100644 --- a/core/applets/cardmon/cardmon.cpp +++ b/core/applets/cardmon/cardmon.cpp | |||
@@ -150,14 +150,13 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) | |||
150 | if ( opt == 1 ) | 150 | if ( opt == 1 ) |
151 | { | 151 | { |
152 | cmd = "/sbin/cardctl eject 0"; | 152 | cmd = "/sbin/cardctl eject 0"; |
153 | err = system( ( const char * ) cmd ); | 153 | err = system( ( const char * ) cmd ); |
154 | if ( err != 0 ) | 154 | if ( err != 0 ) |
155 | { | 155 | { |
156 | qDebug( "Could not execute `/sbin/cardctl eject 0'! err=%d", | 156 | odebug << "Could not execute `/sbin/cardctl eject 0'! err=" << err << oendl; |
157 | err ); | ||
158 | popUp( tr( "CF/PCMCIA card eject failed!" ) ); | 157 | popUp( tr( "CF/PCMCIA card eject failed!" ) ); |
159 | } | 158 | } |
160 | } | 159 | } |
161 | else if ( opt == 0 ) | 160 | else if ( opt == 0 ) |
162 | { | 161 | { |
163 | if ( ODevice::inst() ->system() == System_Familiar ) | 162 | if ( ODevice::inst() ->system() == System_Familiar ) |
@@ -177,14 +176,13 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) | |||
177 | else if ( opt == 2 ) | 176 | else if ( opt == 2 ) |
178 | { | 177 | { |
179 | cmd = "/sbin/cardctl eject 1"; | 178 | cmd = "/sbin/cardctl eject 1"; |
180 | err = system( ( const char * ) cmd ); | 179 | err = system( ( const char * ) cmd ); |
181 | if ( err != 0 ) | 180 | if ( err != 0 ) |
182 | { | 181 | { |
183 | qDebug( "Could not execute `/sbin/cardctl eject 1'! err=%d", | 182 | odebug << "Could not execute `/sbin/cardctl eject 1'! err=" << err << oendl; |
184 | err ); | ||
185 | popUp( tr( "CF/PCMCIA card eject failed!" ) ); | 183 | popUp( tr( "CF/PCMCIA card eject failed!" ) ); |
186 | } | 184 | } |
187 | } | 185 | } |
188 | delete menu; | 186 | delete menu; |
189 | } | 187 | } |
190 | 188 | ||
diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp index 835f63a..f088bef 100644 --- a/core/applets/vmemo/vmemo.cpp +++ b/core/applets/vmemo/vmemo.cpp | |||
@@ -220,13 +220,13 @@ VMemo::VMemo( QWidget *parent, const char *_name ) | |||
220 | 220 | ||
221 | myChannel = new QCopChannel( "QPE/VMemo", this ); | 221 | myChannel = new QCopChannel( "QPE/VMemo", this ); |
222 | connect( myChannel, SIGNAL(received(const QCString&,const QByteArray&)), | 222 | connect( myChannel, SIGNAL(received(const QCString&,const QByteArray&)), |
223 | this, SLOT(receive(const QCString&,const QByteArray&)) ); | 223 | this, SLOT(receive(const QCString&,const QByteArray&)) ); |
224 | 224 | ||
225 | if( toggleKey != -1 ) { | 225 | if( toggleKey != -1 ) { |
226 | qDebug("Register key %d", toggleKey); | 226 | odebug << "Register key " << toggleKey << "" << oendl; |
227 | QCopEnvelope e("QPE/Launcher", "keyRegister(int,QCString,QCString)"); | 227 | QCopEnvelope e("QPE/Launcher", "keyRegister(int,QCString,QCString)"); |
228 | // e << 4096; // Key_Escape | 228 | // e << 4096; // Key_Escape |
229 | // e << Key_F5; //4148 | 229 | // e << Key_F5; //4148 |
230 | e << toggleKey; | 230 | e << toggleKey; |
231 | e << QString("QPE/VMemo"); | 231 | e << QString("QPE/VMemo"); |
232 | e << QString("toggleRecord()"); | 232 | e << QString("toggleRecord()"); |
@@ -473,14 +473,14 @@ int VMemo::openWAV(const char *filename) { | |||
473 | wh.sample_fq = speed; | 473 | wh.sample_fq = speed; |
474 | wh.byte_p_sec = speed * channels * resolution/8; | 474 | wh.byte_p_sec = speed * channels * resolution/8; |
475 | wh.byte_p_spl = channels * (resolution / 8); | 475 | wh.byte_p_spl = channels * (resolution / 8); |
476 | wh.bit_p_spl = resolution; | 476 | wh.bit_p_spl = resolution; |
477 | wh.data_chunk = DATA; | 477 | wh.data_chunk = DATA; |
478 | wh.data_length= 0; | 478 | wh.data_length= 0; |
479 | // qDebug("Write header channels %d, speed %d, b/s %d, blockalign %d, bitrate %d" | 479 | // odebug << "Write header channels " << wh.modus << ", speed " << wh.sample_fq << ", b/s " |
480 | // , wh.modus, wh.sample_fq, wh.byte_p_sec, wh.byte_p_spl, wh.bit_p_spl ); | 480 | // << wh.byte_p_sec << ", blockalign " << wh.byte_p_spl << ", bitrate " << wh.bit_p_spl << oendl; |
481 | write (wav, &wh, sizeof(WaveHeader)); | 481 | write (wav, &wh, sizeof(WaveHeader)); |
482 | 482 | ||
483 | return 1; | 483 | return 1; |
484 | } | 484 | } |
485 | 485 | ||
486 | bool VMemo::record() { | 486 | bool VMemo::record() { |
@@ -556,14 +556,13 @@ bool VMemo::record() { | |||
556 | // printf("%d\r", length); | 556 | // printf("%d\r", length); |
557 | // fflush(stdout); | 557 | // fflush(stdout); |
558 | qApp->processEvents(); | 558 | qApp->processEvents(); |
559 | } | 559 | } |
560 | } | 560 | } |
561 | } | 561 | } |
562 | // qDebug("file has length of %d lasting %d seconds", | 562 | // odebug << "file has length of " << length << " lasting " << (( length / speed) / channels) / 2 ) << " seconds" << oendl; |
563 | // length, (( length / speed) / channels) / 2 ); | ||
564 | 563 | ||
565 | value = length + 36; | 564 | value = length + 36; |
566 | 565 | ||
567 | lseek(wav, 4, SEEK_SET); | 566 | lseek(wav, 4, SEEK_SET); |
568 | write(wav, &value, 4); | 567 | write(wav, &value, 4); |
569 | lseek(wav, 40, SEEK_SET); | 568 | lseek(wav, 40, SEEK_SET); |