Skip to content
This repository was archived by the owner on Aug 27, 2022. It is now read-only.

Commit

Permalink
manual: update for latest preview changes
Browse files Browse the repository at this point in the history
Change-Id: I50d082673f7e85a794a73d0c148acf8e238ddfc9
  • Loading branch information
andi34 committed Nov 14, 2020
1 parent 8084c97 commit 95613bf
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 10 deletions.
10 changes: 5 additions & 5 deletions faq/faq.md
Original file line number Diff line number Diff line change
Expand Up @@ -204,18 +204,18 @@ You can follow the instructions [here](https://www.geeks3d.com/hacklab/20160108/
There's different ways depending on your needs and personal setup:

1. If you access Photobooth on your Raspberry Pi you could use a Raspberry Pi Camera. Raspberry Pi Camera will be detected as "device cam".
- Admin panel config "See preview by device cam": `true`
- Admin panel config "Preview mode": `from device cam`

**Note:**
- Preview by "device cam" will always use the camera of the device where Photobooth get opened in a Browser (e.g. on a tablet it will always show the tablet camera while on a smartphone it will always show the smartphone camera instead)!
- Preview `"from device cam"` will always use the camera of the device where Photobooth get opened in a Browser (e.g. on a tablet it will always show the tablet camera while on a smartphone it will always show the smartphone camera instead)!
- Secure origin or exception required!
- [Prefer Secure Origins For Powerful New Features](https://medium.com/@Carmichaelize/enabling-the-microphone-camera-in-chrome-for-local-unsecure-origins-9c90c3149339)
- [Enabling the Microphone/Camera in Chrome for (Local) Unsecure Origins](https://www.chromium.org/Home/chromium-security/prefer-secure-origins-for-powerful-new-features)
- Admin panel config *"Device cam takes picture"* can be used to take a picture from this preview instead using gphoto / digicamcontrol / raspistill.

2. If you like to have the same preview independent of the device you access Photobooth from:
- Make sure to have a stream available you can use (e.g. from your Webcam, Smartphone Camera or Raspberry Pi Camera)
- Admin panel config *"Preview from URL"*: `true`
2. If you like to have the same preview independent of the device you access Photobooth from:
Make sure to have a stream available you can use (e.g. from your Webcam, Smartphone Camera or Raspberry Pi Camera)
- Admin panel config *"Preview mode"*: `from URL`
- Admin panel config *"Preview-URL"* example (add needed IP address instead): `url(http://127.0.0.1:8081)`

**Note**
Expand Down
9 changes: 4 additions & 5 deletions manual/faq.html
Original file line number Diff line number Diff line change
Expand Up @@ -249,19 +249,18 @@ <h3>How to use a live stream as background at countdown?</h3>
<ol>
<li><p>If you access Photobooth on your Raspberry Pi you could use a Raspberry Pi Camera. Raspberry Pi Camera will be detected as "device cam".</p>

<ul><li>Admin panel config "See preview by device cam": <code>true</code></li></ul>
<ul><li>Admin panel config "Preview mode": <code>from device cam</code></li></ul>

<p><strong>Note:</strong></p>

<ul><li>Preview by "device cam" will always use the camera of the device where Photobooth get opened in a Browser (e.g. on a tablet it will always show the tablet camera while on a smartphone it will always show the smartphone camera instead)!</li>
<ul><li>Preview <code>"from device cam"</code> will always use the camera of the device where Photobooth get opened in a Browser (e.g. on a tablet it will always show the tablet camera while on a smartphone it will always show the smartphone camera instead)!</li>
<li>Secure origin or exception required!
<ul><li><a href="https://medium.com/@Carmichaelize/enabling-the-microphone-camera-in-chrome-for-local-unsecure-origins-9c90c3149339">Prefer Secure Origins For Powerful New Features</a></li>
<li><a href="https://www.chromium.org/Home/chromium-security/prefer-secure-origins-for-powerful-new-features">Enabling the Microphone/Camera in Chrome for (Local) Unsecure Origins</a></li></ul></li>
<li>Admin panel config <em>"Device cam takes picture"</em> can be used to take a picture from this preview instead using gphoto / digicamcontrol / raspistill.</li></ul></li>
<li><p>If you like to have the same preview independent of the device you access Photobooth from:</p>
<li><p>If you like to have the same preview independent of the device you access Photobooth from: <br /><br />Make sure to have a stream available you can use (e.g. from your Webcam, Smartphone Camera or Raspberry Pi Camera)</p>

<ul><li>Make sure to have a stream available you can use (e.g. from your Webcam, Smartphone Camera or Raspberry Pi Camera)</li>
<li>Admin panel config <em>"Preview from URL"</em>: <code>true</code></li>
<ul><li>Admin panel config <em>"Preview mode"</em>: <code>from URL</code></li>
<li>Admin panel config <em>"Preview-URL"</em> example (add needed IP address instead): <code>url(<a href='http://127.0.0.1:8081'>http://127.0.0.1:8081</a>)</code></li></ul>

<p><strong>Note</strong></p>
Expand Down

0 comments on commit 95613bf

Please sign in to comment.