mirror of
https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git
synced 2024-11-25 13:01:07 +00:00
Adapt to removal of glib::Inhibit
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1270>
This commit is contained in:
parent
2abc72b606
commit
0fa2c861d6
2 changed files with 4 additions and 9 deletions
|
@ -6,13 +6,10 @@
|
||||||
//
|
//
|
||||||
// SPDX-License-Identifier: MPL-2.0
|
// SPDX-License-Identifier: MPL-2.0
|
||||||
|
|
||||||
use gio::prelude::*;
|
|
||||||
|
|
||||||
use gst::glib;
|
use gst::glib;
|
||||||
use gst::prelude::*;
|
use gst::prelude::*;
|
||||||
|
|
||||||
use gtk::prelude::*;
|
use gtk::prelude::*;
|
||||||
use gtk::Inhibit;
|
|
||||||
|
|
||||||
use std::cell::RefCell;
|
use std::cell::RefCell;
|
||||||
|
|
||||||
|
@ -145,11 +142,11 @@ fn create_ui(app: >k::Application) {
|
||||||
window.connect_close_request(move |_| {
|
window.connect_close_request(move |_| {
|
||||||
let app = match app_weak.upgrade() {
|
let app = match app_weak.upgrade() {
|
||||||
Some(app) => app,
|
Some(app) => app,
|
||||||
None => return Inhibit(false),
|
None => return glib::ControlFlow::Break,
|
||||||
};
|
};
|
||||||
|
|
||||||
app.quit();
|
app.quit();
|
||||||
Inhibit(false)
|
glib::ControlFlow::Break
|
||||||
});
|
});
|
||||||
|
|
||||||
let bus = pipeline.bus().unwrap();
|
let bus = pipeline.bus().unwrap();
|
||||||
|
|
|
@ -9,9 +9,7 @@
|
||||||
use gst::glib;
|
use gst::glib;
|
||||||
use gst::prelude::*;
|
use gst::prelude::*;
|
||||||
|
|
||||||
use gio::prelude::*;
|
|
||||||
use gtk::prelude::*;
|
use gtk::prelude::*;
|
||||||
use gtk::Inhibit;
|
|
||||||
use std::cell::RefCell;
|
use std::cell::RefCell;
|
||||||
|
|
||||||
fn create_pipeline() -> (
|
fn create_pipeline() -> (
|
||||||
|
@ -275,11 +273,11 @@ fn create_ui(app: >k::Application) {
|
||||||
window.connect_close_request(move |_| {
|
window.connect_close_request(move |_| {
|
||||||
let app = match app_weak.upgrade() {
|
let app = match app_weak.upgrade() {
|
||||||
Some(app) => app,
|
Some(app) => app,
|
||||||
None => return Inhibit(false),
|
None => return glib::ControlFlow::Break,
|
||||||
};
|
};
|
||||||
|
|
||||||
app.quit();
|
app.quit();
|
||||||
Inhibit(false)
|
glib::ControlFlow::Break
|
||||||
});
|
});
|
||||||
|
|
||||||
let bus = pipeline.bus().unwrap();
|
let bus = pipeline.bus().unwrap();
|
||||||
|
|
Loading…
Reference in a new issue