author | zecke <zecke> | 2004-09-10 11:47:55 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-09-10 11:47:55 (UTC) |
commit | 501c17ed2bb97f2062cb11daddeb698a6a9f2828 (patch) (unidiff) | |
tree | 84e5659af9e1b0a0b4a99badae77124e02087344 /noncore/multimedia | |
parent | e2fa8fdfff6bb0460350d5f1017ead99deea7a0b (diff) | |
download | opie-501c17ed2bb97f2062cb11daddeb698a6a9f2828.zip opie-501c17ed2bb97f2062cb11daddeb698a6a9f2828.tar.gz opie-501c17ed2bb97f2062cb11daddeb698a6a9f2828.tar.bz2 |
Fix various warning
-rw-r--r-- | noncore/multimedia/camera/cmd/capture.cpp | 3 | ||||
-rw-r--r-- | noncore/multimedia/camera/gui/mainwindow.cpp | 2 | ||||
-rw-r--r-- | noncore/multimedia/camera/lib/avi.c | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/noncore/multimedia/camera/cmd/capture.cpp b/noncore/multimedia/camera/cmd/capture.cpp index 688622b..6b8c63c 100644 --- a/noncore/multimedia/camera/cmd/capture.cpp +++ b/noncore/multimedia/camera/cmd/capture.cpp | |||
@@ -166,27 +166,30 @@ int main( int argc, char** argv ) | |||
166 | switch ( argv[i-1][1] ) | 166 | switch ( argv[i-1][1] ) |
167 | { | 167 | { |
168 | case 'x': c->width = QString( argv[i] ).toInt(); break; | 168 | case 'x': c->width = QString( argv[i] ).toInt(); break; |
169 | case 'y': c->height = QString( argv[i] ).toInt(); break; | 169 | case 'y': c->height = QString( argv[i] ).toInt(); break; |
170 | case 'z': c->zoom = QString( argv[i] ).toInt(); break; | 170 | case 'z': c->zoom = QString( argv[i] ).toInt(); break; |
171 | case 'o': c->format = QString( argv[i] ); break; | 171 | case 'o': c->format = QString( argv[i] ); break; |
172 | case 'q': c->quality = QString( argv[i] ).toInt(); break; | 172 | case 'q': c->quality = QString( argv[i] ).toInt(); break; |
173 | case 'f': c->flip = QString( argv[i] )[0]; break; | 173 | case 'f': c->flip = QString( argv[i] )[0]; break; |
174 | default: usage(); return -1; | 174 | default: usage(); return -1; |
175 | } | 175 | } |
176 | i++; | 176 | i++; |
177 | } | 177 | } |
178 | 178 | ||
179 | #undef I_HATE_WRITING_HARDCODED_PARSES | 179 | #undef I_HATE_WRITING_HARDCODED_PARSES |
180 | } | 180 | } |
181 | 181 | ||
182 | if ( !ZCameraIO::instance()->isOpen() ) | 182 | if ( !ZCameraIO::instance()->isOpen() ) |
183 | { | 183 | { |
184 | printf( "Error: Can't detect your camera. Exiting.\n" ); | 184 | printf( "Error: Can't detect your camera. Exiting.\n" ); |
185 | return -1; | 185 | return -1; |
186 | } | 186 | } |
187 | 187 | ||
188 | c->checkSettings(); | 188 | c->checkSettings(); |
189 | c->capture(); | 189 | c->capture(); |
190 | |||
191 | delete c; | ||
192 | delete a; | ||
190 | return 0; | 193 | return 0; |
191 | } | 194 | } |
192 | 195 | ||
diff --git a/noncore/multimedia/camera/gui/mainwindow.cpp b/noncore/multimedia/camera/gui/mainwindow.cpp index 7f2a9bd..bde448d 100644 --- a/noncore/multimedia/camera/gui/mainwindow.cpp +++ b/noncore/multimedia/camera/gui/mainwindow.cpp | |||
@@ -525,49 +525,49 @@ void CameraMainWindow::timerEvent( QTimerEvent* ) | |||
525 | if ( !_capturing ) | 525 | if ( !_capturing ) |
526 | { | 526 | { |
527 | odebug << "timer event in CameraMainWindow without capturing video ?" << oendl; | 527 | odebug << "timer event in CameraMainWindow without capturing video ?" << oendl; |
528 | return; | 528 | return; |
529 | } | 529 | } |
530 | 530 | ||
531 | odebug << "timer event during video - now capturing frame #" << _videopics+1 << oendl; | 531 | odebug << "timer event during video - now capturing frame #" << _videopics+1 << oendl; |
532 | 532 | ||
533 | ZCameraIO::instance()->captureFrame( captureX, captureY, zoom, _capturebuf ); | 533 | ZCameraIO::instance()->captureFrame( captureX, captureY, zoom, _capturebuf ); |
534 | _videopics++; | 534 | _videopics++; |
535 | ::write( _capturefd, _capturebuf, captureX*captureY*2 ); | 535 | ::write( _capturefd, _capturebuf, captureX*captureY*2 ); |
536 | setCaption( QString().sprintf( "Capturing %dx%d @ %.2f fps %d", | 536 | setCaption( QString().sprintf( "Capturing %dx%d @ %.2f fps %d", |
537 | captureX, captureY, 1000.0 / (_time.elapsed()/_videopics), _videopics ) ); | 537 | captureX, captureY, 1000.0 / (_time.elapsed()/_videopics), _videopics ) ); |
538 | } | 538 | } |
539 | 539 | ||
540 | 540 | ||
541 | void CameraMainWindow::stopVideoCapture() | 541 | void CameraMainWindow::stopVideoCapture() |
542 | { | 542 | { |
543 | killTimers(); | 543 | killTimers(); |
544 | ODevice::inst()->playTouchSound(); | 544 | ODevice::inst()->playTouchSound(); |
545 | ODevice::inst()->setLedState( Led_Mail, Led_Off ); | 545 | ODevice::inst()->setLedState( Led_Mail, Led_Off ); |
546 | _capturing = false; | 546 | _capturing = false; |
547 | updateCaption(); | 547 | updateCaption(); |
548 | ::close( _capturefd ); | 548 | ::close( _capturefd ); |
549 | _framerate = 1000.0 / (_time.elapsed()/_videopics); | 549 | _framerate = static_cast<int>( 1000.0 / (_time.elapsed()/_videopics) ); |
550 | 550 | ||
551 | QString name; | 551 | QString name; |
552 | if ( outputTo == "Documents Folder" ) | 552 | if ( outputTo == "Documents Folder" ) |
553 | { | 553 | { |
554 | name.sprintf( "%s/Documents/video/%s/", (const char*) QDir::homeDirPath(), (const char*) captureFormat.lower() ); | 554 | name.sprintf( "%s/Documents/video/%s/", (const char*) QDir::homeDirPath(), (const char*) captureFormat.lower() ); |
555 | if ( !QDir( name ).exists() ) | 555 | if ( !QDir( name ).exists() ) |
556 | { | 556 | { |
557 | odebug << "creating directory " << name << oendl; | 557 | odebug << "creating directory " << name << oendl; |
558 | QString msg = "mkdir -p " + name; | 558 | QString msg = "mkdir -p " + name; |
559 | system( msg.latin1() ); | 559 | system( msg.latin1() ); |
560 | } | 560 | } |
561 | } | 561 | } |
562 | else | 562 | else |
563 | name = outputTo; | 563 | name = outputTo; |
564 | 564 | ||
565 | name.append( "/" ); // sure is sure and safe is safe ;-) | 565 | name.append( "/" ); // sure is sure and safe is safe ;-) |
566 | name.append( prefix ); | 566 | name.append( prefix ); |
567 | if ( appendSettings ) | 567 | if ( appendSettings ) |
568 | name.append( QString().sprintf( "_%d_%d_q%d_%dfps", captureX, captureY, quality, _framerate ) ); | 568 | name.append( QString().sprintf( "_%d_%d_q%d_%dfps", captureX, captureY, quality, _framerate ) ); |
569 | name.append( QString().sprintf( "-%d.%s", _videos++, (const char*) captureFormat.lower() ) ); | 569 | name.append( QString().sprintf( "-%d.%s", _videos++, (const char*) captureFormat.lower() ) ); |
570 | postProcessVideo( CAPTUREFILE, name ); | 570 | postProcessVideo( CAPTUREFILE, name ); |
571 | 571 | ||
572 | #ifndef QT_NO_DEBUG | 572 | #ifndef QT_NO_DEBUG |
573 | preview->setRefreshingRate( 1500 ); | 573 | preview->setRefreshingRate( 1500 ); |
diff --git a/noncore/multimedia/camera/lib/avi.c b/noncore/multimedia/camera/lib/avi.c index 77aba33..d99c016 100644 --- a/noncore/multimedia/camera/lib/avi.c +++ b/noncore/multimedia/camera/lib/avi.c | |||
@@ -1,44 +1,45 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2003 Michael 'Mickey' Lauer. All rights reserved. | 2 | ** Copyright (C) 2003 Michael 'Mickey' Lauer. All rights reserved. |
3 | ** Based on work from Andrew Tridgell and the jpegtoavi project | 3 | ** Based on work from Andrew Tridgell and the jpegtoavi project |
4 | ** | 4 | ** |
5 | ** This file is part of Opie Environment. | 5 | ** This file is part of Opie Environment. |
6 | ** | 6 | ** |
7 | ** This file may be distributed and/or modified under the terms of the | 7 | ** This file may be distributed and/or modified under the terms of the |
8 | ** GNU General Public License version 2 as published by the Free Software | 8 | ** GNU General Public License version 2 as published by the Free Software |
9 | ** Foundation and appearing in the file LICENSE.GPL included in the | 9 | ** Foundation and appearing in the file LICENSE.GPL included in the |
10 | ** packaging of this file. | 10 | ** packaging of this file. |
11 | ** | 11 | ** |
12 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 12 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
13 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 13 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
14 | ** | 14 | ** |
15 | **********************************************************************/ | 15 | **********************************************************************/ |
16 | 16 | ||
17 | #include "avi.h" | 17 | #include "avi.h" |
18 | 18 | ||
19 | #include <string.h> | 19 | #include <string.h> |
20 | #include <stdio.h> | 20 | #include <stdio.h> |
21 | #include <stdlib.h> | ||
21 | 22 | ||
22 | int nframes; | 23 | int nframes; |
23 | int totalsize; | 24 | int totalsize; |
24 | unsigned int* sizes; | 25 | unsigned int* sizes; |
25 | 26 | ||
26 | void fprint_quartet(int fd, unsigned int i) | 27 | void fprint_quartet(int fd, unsigned int i) |
27 | { | 28 | { |
28 | char data[4]; | 29 | char data[4]; |
29 | 30 | ||
30 | data[0] = (char) i%0x100; | 31 | data[0] = (char) i%0x100; |
31 | i /= 0x100; | 32 | i /= 0x100; |
32 | data[1] = (char) i%0x100; | 33 | data[1] = (char) i%0x100; |
33 | i /= 0x100; | 34 | i /= 0x100; |
34 | data[2] = (char) i%0x100; | 35 | data[2] = (char) i%0x100; |
35 | i /= 0x100; | 36 | i /= 0x100; |
36 | data[3] = (char) i%0x100; | 37 | data[3] = (char) i%0x100; |
37 | 38 | ||
38 | write( fd, &data, 4 ); | 39 | write( fd, &data, 4 ); |
39 | } | 40 | } |
40 | 41 | ||
41 | // start writing an AVI file | 42 | // start writing an AVI file |
42 | 43 | ||
43 | void avi_start(int fd, int frames) | 44 | void avi_start(int fd, int frames) |
44 | { | 45 | { |