This is the completion of the fork.

* complete the transition to camera2
* remove old camera.py parts and ballast
* remove old qx/qt ui parts
* remove old broken examples and tests
* update documentation
* cleanup __all__, recommend direct import from pydc1394

Author: jordens

.gitignore

@@ -1,3 +1,4 @@
-*.pyc
-.bzr-repo
-.bzr
+/*.egg-info
+/build
+/dist
+/doc/build

AUTHORS

@@ -1,19 +1,5 @@
-The library has seen contributions by the following persons:
-
-   Holger Rapp (KIT Karlsruhe, Germany)
-      [email protected]
-      user: sirver
-      Project starter, maintainer
-
-   Olvier Roulet (SINTEF, Norway)
-      user: olivier-roulet
-      Support for white balancing and color cameras
-
-   Tamas Haraszti (University of Heidelberg and
-         Max-Planck Institute for Metals Research,  Germany)
-      user: tomio2009
-      Support for triggers. More type safe wrapping of c-calls.
-
-   Robert Jordens 
-      user: jordens
-      Design and most of the implementation of Mode classes and Format 7 handling.
+Robert Jordens <[email protected]>
+Holger Rapp <[email protected]>
+Olvier Roulet (SINTEF, Norway)
+Tamas Haraszti (University of Heidelberg and
+    Max-Planck Institute for Metals Research,  Germany)

README

@@ -0,0 +1,2 @@
+This is a pythonic wrapper around the libdc1394 Version 2 for FireWire Cameras.
+(http://damien.douxchamps.net/ieee1394/libdc1394/) 

README.rst

@@ -4,14 +4,7 @@ API Documentation
 The :mod:`pydc1394._dc1394core` Module
 --------------------------------------
 
-.. automodule:: pydc1394._dc1394core
-   :members:
-
-
-The :mod:`pydc1394.camera` Module
----------------------------------
-
-.. automodule:: pydc1394.camera
+.. automodule:: pydc1394.dc1394
    :members:
 
 
@@ -27,38 +20,3 @@ The :mod:`pydc1394.frame` Module
 
 .. automodule:: pydc1394.frame
    :members:
-
-
-The :mod:`pydc1394.cmdline` Module
-----------------------------------
-
-.. automodule:: pydc1394.cmdline
-   :members:
-
-
-The :mod:`pydc1394.capture` Module
-----------------------------------
-
-.. automodule:: pydc1394.capture
-   :members:
-
-
-The :mod:`pydc1394.ui.qt.display` Module
-----------------------------------------
-
-.. automodule:: pydc1394.ui.qt.display
-   :members:
-
-
-The :mod:`pydc1394.ui.wx.LiveImageDisplay` Module
--------------------------------------------------
-
-.. automodule:: pydc1394.ui.wx.LiveImageDisplay
-   :members:
-
-
-The :mod:`pydc1394.ui.wx.LiveCameraDisplay` Module
---------------------------------------------------
-
-.. automodule:: pydc1394.ui.wx.LiveCameraDisplay
-   :members:

RecentChanges.txt

@@ -1,8 +1,13 @@
 #!/usr/bin/python
 
-from pydc1394.camera2 import Camera
+from __future__ import (print_function, unicode_literals, division,
+        absolute_import)
+
+
+from pydc1394 import Camera
 import time
 
+
 def setup(cam, mode, gain, bright, shutter):
     cam.mode = cam.modes[mode]
     #cam.mode = cam.modes[-1]
@@ -34,7 +39,7 @@ def capture(cam, n):
     t = time.time()
     for i in range(n):
         im = cam.dequeue()
-        print i, (time.time()-t)/(i+1), im.frames_behind, im.frame_id
+        print(i, (time.time()-t)/(i+1), im.frames_behind, im.frame_id)
         im.enqueue()
     cam.stop_multi_shot()
     cam.stop_capture()