|
 |
1b634c |
From c8c75796ff3e723d77bd68dec3fe91a072b36fc4 Mon Sep 17 00:00:00 2001
|
|
|
1b634c |
From: Benjamin Berg <bberg@redhat.com>
|
|
|
1b634c |
Date: Fri, 21 Apr 2017 11:59:39 +0200
|
|
|
1b634c |
Subject: [PATCH 01/27] Correctly select the given camera device
|
|
|
1b634c |
|
|
|
1b634c |
Due to a bug in the VAPI file the code would pass a string to the camera
|
|
|
1b634c |
setup routine instead of a CameraDevice object. As the setup routine
|
|
|
1b634c |
already has code to automatically select an appropriate device based on
|
|
|
1b634c |
the name passing an argument is not even required.
|
|
|
1b634c |
|
|
|
1b634c |
Note that the --device parameter might be somewhat confusing as it
|
|
|
1b634c |
refers to the devices name and not to the /dev/videoX device file.
|
|
|
1b634c |
|
|
|
1b634c |
https://bugzilla.gnome.org/show_bug.cgi?id=777047
|
|
|
1b634c |
---
|
|
|
1b634c |
src/cheese-application.vala | 2 +-
|
|
|
1b634c |
src/vapi/cheese-common.vapi | 2 +-
|
|
|
1b634c |
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
1b634c |
|
|
|
1b634c |
diff --git a/src/cheese-application.vala b/src/cheese-application.vala
|
|
|
1b634c |
index 633a25eb..ee107395 100644
|
|
|
1b634c |
--- a/src/cheese-application.vala
|
|
|
1b634c |
+++ b/src/cheese-application.vala
|
|
|
1b634c |
@@ -203,7 +203,7 @@ public class Cheese.Application : Gtk.Application
|
|
|
1b634c |
|
|
|
1b634c |
try
|
|
|
1b634c |
{
|
|
|
1b634c |
- camera.setup (device);
|
|
|
1b634c |
+ camera.setup ();
|
|
|
1b634c |
}
|
|
|
1b634c |
catch (Error err)
|
|
|
1b634c |
{
|
|
|
1b634c |
diff --git a/src/vapi/cheese-common.vapi b/src/vapi/cheese-common.vapi
|
|
|
1b634c |
index a4c07a96..2ee13f18 100644
|
|
|
1b634c |
--- a/src/vapi/cheese-common.vapi
|
|
|
1b634c |
+++ b/src/vapi/cheese-common.vapi
|
|
|
1b634c |
@@ -48,7 +48,7 @@ namespace Cheese
|
|
|
1b634c |
public void toggle_effects_pipeline (bool active);
|
|
|
1b634c |
public void connect_effect_texture (Cheese.Effect effect, Clutter.Actor texture);
|
|
|
1b634c |
public void set_video_format (Cheese.VideoFormat format);
|
|
|
1b634c |
- public void setup (string udi) throws GLib.Error;
|
|
|
1b634c |
+ public void setup (Cheese.CameraDevice? device = null) throws GLib.Error;
|
|
|
1b634c |
public void start_video_recording (string filename);
|
|
|
1b634c |
public void stop ();
|
|
|
1b634c |
public void stop_video_recording ();
|
|
|
1b634c |
--
|
|
|
1b634c |
2.13.6
|
|
|
1b634c |
|