1 files changed, 77 insertions, 23 deletions

diff --git a/noncore/multimedia/camera/zcameraio.cpp b/noncore/multimedia/camera/zcameraio.cpp
index 9af0c25..1c449e7 100644
--- a/noncore/multimedia/camera/zcameraio.cpp
+++ b/noncore/multimedia/camera/zcameraio.cpp
@@ -41,13 +41,15 @@ ZCameraIO* ZCameraIO::instance()
     }
     return ZCameraIO::_instance;
 }
 
 
 ZCameraIO::ZCameraIO()
-          :_height( 0 ), _width( 0 ), _zoom( 0 ), _rot( 0 ), _readlen( 0 )
+          : _pressed( false ), _height( 0 ), _width( 0 ), _zoom( 0 ),
+           _flip( -1 ), _rot( 0 ), _readlen( 0 )
+
 {
     _driver = ::open( SHARPZDC, O_RDWR );
     if ( _driver == -1 )
         oerr << "Can't open camera driver: " << strerror(errno) << oendl;
     else
         init();
@@ -81,24 +83,30 @@ bool ZCameraIO::isOpen() const
     return _driver != -1;
 }
 
 
 bool ZCameraIO::isShutterPressed()
 {
-    if ( _timer->elapsed() < 1000 ) //TODO: make this customizable?
-    {
-        clearShutterLatch();
-        return false;
-    }
     if ( _status[0] == 'S' )
     {
-        _timer->restart();
-        clearShutterLatch();
-        return true;
+        if ( !_pressed )    // wasn't pressed before, but is now!
+        {
+            _pressed = true;
+            _timer->start();
+            return true;
+        }
+
+        if ( _timer->elapsed() > 2000 ) // the press is pretty old now
+        {
+            clearShutterLatch();
+            _status[0] = 's';
+            _pressed = false;
+        }
     }
-    else return false;
+
+    return false;
 }
 
 
 bool ZCameraIO::isFinderReversed() const
 {
     return _status[1] == 'M';
@@ -146,17 +154,26 @@ void ZCameraIO::setReadMode( int mode )
     char b[10];
     sprintf( b, "M=%d", mode );
     write( b, mode <= 9 ? 3 : 4 );
     if ( mode & STATUS ) // STATUS bit is set
     {
         read( _status, 4 );
-        if ( isShutterPressed() ) emit shutterClicked();
+        if ( isShutterPressed() )
+        {
+            emit shutterClicked();
+        }
     }
 }
 
 
+void ZCameraIO::setFlip( int flip )
+{
+    _flip = flip;
+}
+
+
 void ZCameraIO::clearShutterLatch()
 {
     write( "B", 1 );
 }
 
 
@@ -195,21 +212,31 @@ bool ZCameraIO::snapshot( QImage* image )
 {
     setReadMode( STATUS );
 
     odebug << "finder reversed = " << isFinderReversed() << oendl;
     odebug << "rotation = " << _rot << oendl;
 
-    if ( _rot ) // Portrait
+    int readmode;
+    if ( _flip == -1 ) // AUTO
     {
-        setReadMode( IMAGE | isFinderReversed() ? XFLIP | YFLIP : 0 );
+        if ( _rot ) // Portrait
+        {
+            readmode = IMAGE | isFinderReversed() ? XFLIP | YFLIP : 0;
+        }
+        else // Landscape
+        {
+            readmode = IMAGE | XFLIP | YFLIP;
+        }
     }
-    else // Landscape
+    else // OVERRIDE
     {
-        setReadMode( IMAGE | XFLIP | YFLIP ); //isFinderReversed() ? 0 : XFLIP );
+        readmode = IMAGE | _flip;
     }
 
+    setReadMode( readmode );
+
     char buf[_readlen];
     char* bp = buf;
     unsigned char* p;
 
     read( bp, _readlen );
 
@@ -231,24 +258,37 @@ bool ZCameraIO::snapshot( QImage* image )
     return true;
 }
 
 
 bool ZCameraIO::snapshot( unsigned char* buf )
 {
-    setReadMode( IMAGE | XFLIP | YFLIP );
+    setReadMode( STATUS );
 
-    read( (char*) buf, _readlen );
+    odebug << "finder reversed = " << isFinderReversed() << oendl;
+    odebug << "rotation = " << _rot << oendl;
 
-    /* //TESTCODE
-    int fd = open( "/tmp/cam", O_RDONLY );
-    if ( ::read( fd, (char*) buf, 76800 ) != 76800 )
-        owarn << "Couldn't read image from /dev/sharp_zdc" << oendl;
-    // TESTCODE */
+    int readmode;
+    if ( _flip == -1 ) // AUTO
+    {
+        if ( _rot ) // Portrait
+        {
+            readmode = IMAGE | isFinderReversed() ? XFLIP | YFLIP : 0;
+        }
+        else // Landscape
+        {
+            readmode = IMAGE | XFLIP | YFLIP;
+        }
+    }
+    else // OVERRIDE
+    {
+        readmode = IMAGE | _flip;
+    }
 
+    setReadMode( readmode );
+    read( (char*) buf, _readlen );
 
-    return true;
 }
 
 
 void ZCameraIO::captureFrame( int w, int h, int zoom, QImage* image )
 {
     int pw = _width;
@@ -259,6 +299,20 @@ void ZCameraIO::captureFrame( int w, int h, int zoom, QImage* image )
         setCaptureFrame( w, h, zoom*256, false );
     snapshot( image );
     setCaptureFrame( pw, ph, _zoom, _rot );
 }
 
 
+void ZCameraIO::captureFrame( int w, int h, int zoom, unsigned char* buf )
+{
+    //FIXME: this is too slow
+    int pw = _width;
+    int ph = _height;
+    if ( _rot )
+        setCaptureFrame( h, w, zoom*256, true );
+    else
+        setCaptureFrame( w, h, zoom*256, false );
+
+    snapshot( buf );
+    setCaptureFrame( pw, ph, _zoom, _rot );
+}
+