Skip to content

Commit

Permalink
Merge branch 'master' of http://github.com/pupil-labs/pupil
Browse files Browse the repository at this point in the history
  • Loading branch information
mkassner committed Mar 31, 2014
2 parents 8508fac + 0c43fda commit 539ec60
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions pupil_src/shared_modules/uvc_capture/mac_video/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,7 @@ def create_atb_bar(self,pos):
cameras_enum = atb.enum("Capture",dict([(c.name,c.src_id) for c in Camera_List()]) )

self.bar.add_var("Capture",vtype=cameras_enum,getter=lambda:self.src_id, setter=self.re_init_cam_by_src_id)
self.bar.add_var('hardware timestamps',vtype=atb.TW_TYPE_BOOL8,getter=lambda:False)
for control in sorted_controls:
name = control.atb_name
if control.type=="bool":
Expand Down

0 comments on commit 539ec60

Please sign in to comment.