Checkbox

Merge lp:~brendan-donegan/checkbox/bug956885_external_webcam into lp:checkbox

  1. bug956885_external_webcam
  2. Merge into trunk
Proposed by Brendan Donegan
Status: Merged
Merged at revision: 1336
Proposed branch: lp:~brendan-donegan/checkbox/bug956885_external_webcam
Merge into: lp:checkbox
Diff against target: 47 lines (+5/-3)
3 files modified
debian/changelog (+2/-0)
jobs/graphics.txt.in (+2/-2)
jobs/suspend.txt.in (+1/-1)
To merge this branch: bzr merge lp:~brendan-donegan/checkbox/bug956885_external_webcam
Reviewer Review Type Date Requested Status
Jeff Lane  Approve
Review via email: mp+98411@code.launchpad.net

Description of the change

A merge request in checkbox-satellite allows a device ID for the external webcam device to be passed through and linked to /dev/external_webcam. This merge request updates the screenshot jobs in graphics.txt.in and suspend.txt.in to use the --device option of the camera_test script to always use that device.

To post a comment you must log in.
Revision history for this message
Jeff Lane  (bladernr) wrote :

Looks good. Daniel merged the corresponding satellite code and I'm merging the checkbox code into trunk.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-03-20 09:22:16 +0000
3+++ debian/changelog 2012-03-20 13:49:18 +0000
4@@ -47,6 +47,8 @@
5 [Brendan Donegan]
6 * jobs/suspend.txt.in: Fixed dependencies on wireless and suspend_advanced
7 jobs.
8+ * Changed screenshot jobs to use /dev/external_webcam which will be set by
9+ a udev rule (LP: #956885)
10
11 -- Jeff Lane <jeff@ubuntu.com> Fri, 16 Mar 2012 19:14:09 -0400
12
13
14=== modified file 'jobs/graphics.txt.in'
15--- jobs/graphics.txt.in 2012-03-08 23:21:35 +0000
16+++ jobs/graphics.txt.in 2012-03-20 13:49:18 +0000
17@@ -170,7 +170,7 @@
18 plugin: shell
19 name: graphics/screenshot
20 requires: package.name == 'fswebcam'
21-command: camera_test still --highest-device -f ${CHECKBOX_DATA}/screenshot.jpg -q 2>&1 | ansi_parser
22+command: camera_test still --device=/dev/external_webcam -f ${CHECKBOX_DATA}/screenshot.jpg -q 2>&1 | ansi_parser
23 _description:
24 PURPOSE:
25 Take a screengrab of the current screen (logged on Unity desktop)
26@@ -190,7 +190,7 @@
27 requires: package.name == 'fswebcam'
28 command:
29 gst_pipeline_test -t 20 -f "playbin2 uri=file://${CHECKBOX_SHARE}/data/video/Ogg_Theora_Video.ogv" &
30- sleep 15 && camera_test still --highest-device -f ${CHECKBOX_DATA}/screenshot_fullscreen_video.jpg -q 2>&1 | ansi_parser
31+ sleep 15 && camera_test still --device=/dev/external_webcam -f ${CHECKBOX_DATA}/screenshot_fullscreen_video.jpg -q 2>&1 | ansi_parser
32 _description:
33 PURPOSE:
34 Take a screengrab of the current screen during fullscreen video playback
35
36=== modified file 'jobs/suspend.txt.in'
37--- jobs/suspend.txt.in 2012-03-20 09:22:16 +0000
38+++ jobs/suspend.txt.in 2012-03-20 13:49:18 +0000
39@@ -300,7 +300,7 @@
40 name: suspend/screenshot_after_suspend
41 depends: suspend/suspend_advanced_auto
42 requires: package.name == 'fswebcam'
43-command: camera_test still --highest-device -f ${CHECKBOX_DATA}/screenshot_after_suspend.jpg -q 2>&1 | ansi_parser
44+command: camera_test still --device=/dev/external_webcam -f ${CHECKBOX_DATA}/screenshot_after_suspend.jpg -q 2>&1 | ansi_parser
45 _description:
46 PURPOSE:
47 Take a screengrab of the current screen after suspend (logged on Unity desktop)

Subscribers

People subscribed via source and target branches