commit 705dafce9a8b541c830e4da1d878c61b48a68c30
parent 28324374d282ffcfe02a1c4f6dc6258245784b36
Author: rbckman <robinbackman@gmail.com>
Date: Mon, 20 Feb 2017 09:02:03 +0000
USB audio fix
Diffstat:
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
<img src="https://raw.githubusercontent.com/rbckman/tarina/master/tarina-proto3.png" width="30%">
# Tarina #
### DIY camera for filmmakers, vloggers, travellers & hackers ###
-You film, Tarina puts the pieces together and, voilá!, you have a movie! Shoot your films as takes, shots and scenes, and see your film come together on the go. Once you get it there’s no need for editing later. Tarina is designed to be taken apart & easily modded with all body parts 3d printable. It's built using the Raspberry Pi, running on a Gnu/Linux Raspbian distribution and with an easy python coded interface.
+Shoot your films as takes, shots and scenes, and see your film come together in-camera. Once you get it there’s no need for editing later. Tarina is designed to be taken apart & is easily modded with all body parts 3d printable. It's built using the Raspberry Pi, running on a Gnu/Linux Raspbian distribution and with an easy python coded interface.
## Hardware ##
[Raspberry Pi 3](https://www.raspberrypi.org/products/raspberry-pi-3-model-b/)<br>
@@ -11,8 +11,7 @@ You film, Tarina puts the pieces together and, voilá!, you have a movie! Shoot
[9000mAh li-ion Battery](https://www.aliexpress.com/item/3-7v-9000mAh-capacity-18650-Rechargeable-lithium-battery-pack-18650-jump-starter/32619902319.html?spm=2114.13010608.0.0.XcKleV) (10 hours filming)<br>
[USB Mobile Power Charger Board Module 3.7V to 5V 1A/2A Booster Converter](http://www.ebay.com/itm/321977677010?_trksid=p2057872.m2749.l2649&ssPageName=STRK%3AMEBIDX%3AIT)<br>
[ATXRaspi by lowpowerlab](https://lowpowerlab.com/shop/product/91)
-
-Currently you control Tarina with a USB or bluetooth keyboard, we're working on [buttons](http://www.ebay.com/itm/151723036469?_trksid=p2057872.m2749.l2649&ssPageName=STRK%3AMEBIDX%3AIT) connected to a [MCP23017-E/SP DIP-28 16 Bit I / O Expander I2C](http://www.ebay.com/sch/sis.html?_nkw=5Pcs+MCP23017+E+SP+DIP+28+16+Bit+I+O+Expander+I2C+TOP+GM&_trksid=p2047675.m4100)
+[Buttons](http://www.ebay.com/itm/151723036469?_trksid=p2057872.m2749.l2649&ssPageName=STRK%3AMEBIDX%3AIT) connected to a [MCP23017-E/SP DIP-28 16 Bit I / O Expander I2C](http://www.ebay.com/sch/sis.html?_nkw=5Pcs+MCP23017+E+SP+DIP+28+16+Bit+I+O+Expander+I2C+TOP+GM&_trksid=p2047675.m4100)
It should also work with Raspberry pi 2 and the pi camera module v1.3 and any other Raspberry Pi compatible screens.
diff --git a/tarina.py b/tarina.py
@@ -782,7 +782,7 @@ def playthis(filename, camera):
player = OMXPlayer(filename + '.mp4', args=['--fps', '25', '--layer', '3', '--win', '0,70,800,410', '--no-osd', '--no-keys'])
#os.system('omxplayer --layer 3 ' + filename + '.mp4 &')
time.sleep(1)
- os.system('aplay ' + filename + '.wav &')
+ os.system('aplay -D plughw:0 ' + filename + '.wav &')
player.play()
menu = 'BACK', 'PLAY FROM START'
settings = '', ''
