[libcvd-members] libcvd cvd/Linux/dvbuffer3.h cvd_src/Linux/dvbu...

[Gerhard Reitmayr]

CVSROOT:        /cvsroot/libcvd
Module name:    libcvd
Changes by:     Gerhard Reitmayr <gerhard>      09/05/06 18:12:05

Modified files:
        cvd/Linux      : dvbuffer3.h 
        cvd_src/Linux  : dvbuffer3_dc1394v1.cc dvbuffer3_dc1394v2.cc 

Log message:
        added power on/off interface to DVBuffer3

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd/Linux/dvbuffer3.h?cvsroot=libcvd&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd_src/Linux/dvbuffer3_dc1394v1.cc?cvsroot=libcvd&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd_src/Linux/dvbuffer3_dc1394v2.cc?cvsroot=libcvd&r1=1.6&r2=1.7

Patches:
Index: cvd/Linux/dvbuffer3.h
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd/Linux/dvbuffer3.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- cvd/Linux/dvbuffer3.h       11 Mar 2009 21:35:12 -0000      1.4
+++ cvd/Linux/dvbuffer3.h       6 May 2009 18:12:04 -0000       1.5
@@ -135,6 +135,7 @@
       unsigned int get_feature_value(DV3Feature nFeature);
       std::pair<unsigned int, unsigned int> get_feature_min_max(DV3Feature 
nFeature);
       void auto_on_off(DV3Feature nFeature, bool bValue);
+      void power_on_off(DV3Feature nFeature, bool bValue);
       
     private:
       ImageRef mirSize;

Index: cvd_src/Linux/dvbuffer3_dc1394v1.cc
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd_src/Linux/dvbuffer3_dc1394v1.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- cvd_src/Linux/dvbuffer3_dc1394v1.cc 9 Mar 2009 20:57:13 -0000       1.3
+++ cvd_src/Linux/dvbuffer3_dc1394v1.cc 6 May 2009 18:12:05 -0000       1.4
@@ -148,6 +148,11 @@
       mpLDCP->pRawDCV->auto_on_off(DC_from_DV3_Feature(nFeature), bValue);
     }
    
+    void RawDVBuffer3::power_on_off(DV3Feature nFeature, bool bValue)
+    {
+        // not implemented
+        std::cout << "! Warning: DVBuffer3/libdc1394v1 power_on_off is only 
implemented for V2!" << std::endl;
+    }
   }
   
 }

Index: cvd_src/Linux/dvbuffer3_dc1394v2.cc
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd_src/Linux/dvbuffer3_dc1394v2.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- cvd_src/Linux/dvbuffer3_dc1394v2.cc 11 Mar 2009 21:35:13 -0000      1.6
+++ cvd_src/Linux/dvbuffer3_dc1394v2.cc 6 May 2009 18:12:05 -0000       1.7
@@ -426,6 +426,13 @@
                              bValue? DC1394_FEATURE_MODE_AUTO : 
DC1394_FEATURE_MODE_MANUAL);
     }
     
+    void RawDVBuffer3::power_on_off(DV3Feature nFeature, bool bValue)
+    {
+      if(!mpLDCP || !mpLDCP->pCamera)
+        return;
+      dc1394_feature_set_power(mpLDCP->pCamera, DC_from_DV3_Feature(nFeature), 
+                                  bValue? DC1394_ON : DC1394_OFF);
+    }
   }
 
 }