diff options
| author | Lionel Landwerlin <llandwerlin@gmail.com> | 2015-01-25 17:11:45 +0000 |
|---|---|---|
| committer | David King <amigadave@amigadave.com> | 2015-08-17 17:02:51 +0100 |
| commit | 9df993253d58c2442ab92df613f5754ead5b5e20 (patch) | |
| tree | 77fa6699aeb926f6df3f75dab62bdcd53227d6bd /src | |
| parent | 4b7837e17ee9203851a03b29bfb10165fa948198 (diff) | |
| download | cheese-9df993253d58c2442ab92df613f5754ead5b5e20.tar.gz | |
libcheese: port to clutter-gst 3.0
https://bugzilla.gnome.org/show_bug.cgi?id=743496
Diffstat (limited to 'src')
| -rw-r--r-- | src/cheese-window.vala | 7 | ||||
| -rw-r--r-- | src/vapi/cheese-common.vapi | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/cheese-window.vala b/src/cheese-window.vala index 4c9dff32..24a876f4 100644 --- a/src/cheese-window.vala +++ b/src/cheese-window.vala @@ -77,7 +77,7 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow private Clutter.Stage viewport; private Clutter.Actor viewport_layout; - private Clutter.Texture video_preview; + private Clutter.Actor video_preview; private Clutter.BinLayout viewport_layout_manager; private Clutter.Text countdown_layer; private Clutter.Actor background_layer; @@ -1236,7 +1236,7 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow viewport = viewport_widget.get_stage () as Clutter.Stage; - video_preview = clutter_builder.get_object ("video_preview") as Clutter.Texture; + video_preview = clutter_builder.get_object ("video_preview") as Clutter.Actor; viewport_layout = clutter_builder.get_object ("viewport_layout") as Clutter.Actor; viewport_layout_manager = clutter_builder.get_object ("viewport_layout_manager") as Clutter.BinLayout; countdown_layer = clutter_builder.get_object ("countdown_layer") as Clutter.Text; @@ -1244,7 +1244,6 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow error_layer = clutter_builder.get_object ("error_layer") as Clutter.Text; timeout_layer = clutter_builder.get_object ("timeout_layer") as Clutter.Text; - video_preview.keep_aspect_ratio = true; video_preview.request_mode = Clutter.RequestMode.HEIGHT_FOR_WIDTH; viewport.add_child (background_layer); viewport_layout.set_layout_manager (viewport_layout_manager); @@ -1287,7 +1286,7 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow this.key_release_event.connect (on_key_release); } - public Clutter.Texture get_video_preview () + public Clutter.Actor get_video_preview () { return video_preview; } diff --git a/src/vapi/cheese-common.vapi b/src/vapi/cheese-common.vapi index 702d7012..a4c07a96 100644 --- a/src/vapi/cheese-common.vapi +++ b/src/vapi/cheese-common.vapi @@ -33,7 +33,7 @@ namespace Cheese public class Camera : GLib.Object { [CCode (has_construct_function = false)] - public Camera (Clutter.Texture video_texture, string camera_device_node, int x_resolution, int y_resolution); + public Camera (Clutter.Actor video_texture, string camera_device_node, int x_resolution, int y_resolution); public bool get_balance_property_range (string property, double min, double max, double def); public unowned GLib.PtrArray get_camera_devices (); public unowned Cheese.VideoFormat get_current_video_format (); @@ -46,7 +46,7 @@ namespace Cheese public void set_device (Cheese.CameraDevice device); public void set_effect (Cheese.Effect effect); public void toggle_effects_pipeline (bool active); - public void connect_effect_texture (Cheese.Effect effect, Clutter.Texture texture); + public void connect_effect_texture (Cheese.Effect effect, Clutter.Actor texture); public void set_video_format (Cheese.VideoFormat format); public void setup (string udi) throws GLib.Error; public void start_video_recording (string filename); |