Merge lp:~ter0/snap-elementary/fix-956653 into lp:snap-elementary

Proposed by Chris Johns
Status: Merged
Approved by: Corentin Noël
Approved revision: 215
Merged at revision: 214
Proposed branch: lp:~ter0/snap-elementary/fix-956653
Merge into: lp:snap-elementary
Diff against target: 31 lines (+7/-2)
1 file modified
src/Widgets/Camera.vala (+7/-2)
To merge this branch: bzr merge lp:~ter0/snap-elementary/fix-956653
Reviewer Review Type Date Requested Status
Corentin Noël Approve
Review via email: mp+204095@code.launchpad.net

Commit message

Fix bug #956653 by enabling the mirror preview

To post a comment you must log in.
lp:~ter0/snap-elementary/fix-956653 updated
215. By Chris Johns

Consistency in referencing class members

Revision history for this message
Corentin Noël (tintou) wrote :

Everything looks as espected here.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Widgets/Camera.vala'
2--- src/Widgets/Camera.vala 2014-01-25 21:29:24 +0000
3+++ src/Widgets/Camera.vala 2014-01-30 20:55:22 +0000
4@@ -35,14 +35,19 @@
5 private bool capturing = false;
6
7 private Gst.Element? camerabin = null;
8+ private Gst.Element? videoflip = null;
9
10 public signal void capture_start ();
11 public signal void capture_end ();
12
13 public class Camera () {
14 this.set_size_request (WIDTH, HEIGHT); // FIXME
15-
16+
17+ this.videoflip = Gst.ElementFactory.make ("videoflip", "videoflip");
18+ this.videoflip.set_property("method", 4);
19+
20 this.camerabin = Gst.ElementFactory.make ("camerabin","camera");
21+ this.camerabin.set_property("viewfinder-filter", videoflip);
22 this.camerabin.bus.add_watch (0,(bus,message) => {
23 if (Gst.Video.is_video_overlay_prepare_window_handle_message (message))
24 (message.src as Gst.Video.Overlay).set_window_handle ((uint*) Gdk.X11Window.get_xid (this.get_window()));
25@@ -131,4 +136,4 @@
26 }
27
28 }
29-}
30\ No newline at end of file
31+}

Subscribers

People subscribed via source and target branches