NekoCWD/EyeNeko
NekoCWD/EyeNeko
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

GST: Fix gstreamer double-initialisation

Browse source 
Signed-off-by: Vasiliy Doylov <nekocwd@mainlining.org>
This commit is contained in:
Vasiliy Doylov 2025-06-21 01:51:39 +03:00
parent b3decb8cc5
commit 5b980c0d37
Signed by: NekoCWD
GPG key ID: B7BE22D44474A582
3 changed files with 12 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/gst.vala
View file

@ -8,14 +8,6 @@ public class EyeNeko.Gstreamer : Object {
public bool ready { get; set; default = false; }
public CameraBinMode camerabin_mode { get; set; default = CameraBinMode.PHOTO; }
public Gdk.Paintable viewfinder_paintable {
owned get {
Gdk.Paintable paintable;
viewfinder.get ("paintable", out paintable);
return paintable;
}
}
// Private elements
private Gst.Bin camerabin = (Gst.Bin) Gst.ElementFactory.make ("camerabin", "camerabin");
@ -31,6 +23,7 @@ public class EyeNeko.Gstreamer : Object {
public int downscale_photo_to = int.parse (Env.get_variable_or ("DOWNSCALE_PHOTO", "0"));
public delegate int SelectStreamCB (Gst.Element decodebin, Gst.StreamCollection collection, Gst.Stream stream, void* userdata);
public Gdk.Paintable viewfinder_paintable { get; set; }
Gst.Caps get_best_caps (Gst.Device device) {
int max_w = 0;
@ -149,8 +142,7 @@ public class EyeNeko.Gstreamer : Object {
camerabin.set_property ("video-profile", cp);
}
public void init (ref weak string[] args) {
Gst.init (ref args);
public void init () {
camerabin.set_property ("camera-source", camerasrc_wrapper);
camerabin.set_property ("viewfinder-sink", viewfinder);
color_correction_matrix.red_in_red = 1f;
@ -191,6 +183,8 @@ public class EyeNeko.Gstreamer : Object {
start_stream_from (current_camera);
});
viewfinder.bind_property ("paintable", this, "viewfinder-paintable", GLib.BindingFlags.SYNC_CREATE);
camerabin.bus.add_watch (0, bus_callback);
}
@ -218,6 +212,7 @@ public class EyeNeko.Gstreamer : Object {
Gst.State pending;
message.parse_state_changed (out oldstate, out newstate,
out pending);
/*
GLib.message ("state changed: %s->%s:%s\n",
oldstate.to_string (), newstate.to_string (),
@ -245,8 +240,11 @@ public class EyeNeko.Gstreamer : Object {
}
}
static string[] gst_args = {};
static construct {
unowned string[] ? gst_args = null;
Gst.init (ref gst_args);
unowned var a = gst_args;
Gst.init (ref a);
instance.init ();
}
}

2
src/main.vala
View file

@ -23,7 +23,7 @@ int main (string[] args) {
Intl.bind_textdomain_codeset (Config.GETTEXT_PACKAGE, "UTF-8");
Intl.textdomain (Config.GETTEXT_PACKAGE);
EyeNeko.Gstreamer.instance.init (ref args);
var app = new EyeNeko.Application ();
EyeNeko.Gstreamer.instance.init ();
return app.run (args);
}

4
src/window.vala
View file

@ -76,9 +76,7 @@ public class EyeNeko.Window : Adw.ApplicationWindow {
Object (application: app);
overlay.add_overlay (toolbar);
viewfinder.set_paintable (Gstreamer.instance.viewfinder_paintable);
Gstreamer.instance.bind_property ("viewfinder-paintable", viewfinder, "paintable", BindingFlags.SYNC_CREATE);
capture_btn.clicked.connect (() => {
if (Gstreamer.instance.camerabin_mode == Gstreamer.CameraBinMode.VIDEO && !Gstreamer.instance.ready) {
Gstreamer.instance.stop_capture ();