Sergey77
/
OSG_Mugshot_fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

First API breakage, make the camera not crash

This commit is contained in:
Sean Davis 2016-02-13 07:53:59 -05:00
parent 6118b62685
commit 75613fd673
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mugshot/CameraMugshotDialog.py
View File

@ -72,8 +72,11 @@ class CameraBox(GtkClutter.Embed):
self.state = Gst.State.PLAYING
def added(signal, data):
if ("get_device_node" in dir(data)):
node = data.get_device_node()
self.camera.set_device_by_device_node(node)
else:
self.camera.set_device(data)
self.camera.switch_camera_device()
device_monitor = Cheese.CameraDeviceMonitor.new()

4
po/mugshot.pot
View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-09-06 16:45-0400\n"
"POT-Creation-Date: 2016-02-13 07:53-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -103,7 +103,7 @@ msgstr ""
#. Set the record button to retry, and disable it until the capture
#. finishes.
#: ../mugshot/CameraMugshotDialog.py:236
#: ../mugshot/CameraMugshotDialog.py:239
msgid "Retry"
msgstr ""