mirrors/GstPipelineStudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dabrain34/GstPipelineStudio.git synced 2024-06-02 13:29:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

gps: use it as a whole module

Browse source 
Namespace the use of gps
This commit is contained in:
Stéphane Cerveau 2022-01-20 15:11:10 +01:00
parent a2503ce86b
commit 45d5f19c10
3 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/app.rs
View file

@ -33,7 +33,7 @@ use std::collections::HashMap;
use std::ops;
use std::rc::{Rc, Weak};
use crate::gps::{ElementInfo, PadInfo, Pipeline, PipelineState};
use crate::gps as GPS;
use crate::logger;
use crate::settings::Settings;
use crate::ui as GPSUI;
@ -47,7 +47,7 @@ pub struct GPSAppInner {
pub window: gtk::ApplicationWindow,
pub graphview: RefCell<GraphView>,
pub builder: Builder,
pub pipeline: RefCell<Pipeline>,
pub pipeline: RefCell<GPS::Pipeline>,
pub plugin_list_initialized: OnceCell<bool>,
pub menu_signal_handlers: RefCell<HashMap<String, SignalHandlerId>>,
}
@ -110,7 +110,7 @@ impl GPSApp {
if settings.app_maximized {
window.maximize();
}
let pipeline = Pipeline::new().expect("Unable to initialize GStreamer subsystem");
let pipeline = GPS::Pipeline::new().expect("Unable to initialize GStreamer subsystem");
let app = GPSApp(Rc::new(GPSAppInner {
window,
graphview: RefCell::new(GraphView::new()),
@ -428,7 +428,7 @@ impl GPSApp {
let _ = app
.pipeline
.borrow()
.start_pipeline(&graph_view, PipelineState::Playing);
.start_pipeline(&graph_view, GPS::PipelineState::Playing);
});
let app_weak = self.downgrade();
@ -438,14 +438,14 @@ impl GPSApp {
let _ = app
.pipeline
.borrow()
.start_pipeline(&graph_view, PipelineState::Paused);
.start_pipeline(&graph_view, GPS::PipelineState::Paused);
});
let app_weak = self.downgrade();
self.connect_button_action("button-stop", move |_| {
let app = upgrade_weak!(app_weak);
let pipeline = app.pipeline.borrow();
let _ = pipeline.set_state(PipelineState::Stopped);
let _ = pipeline.set_state(GPS::PipelineState::Stopped);
});
let app_weak = self.downgrade();
@ -463,7 +463,7 @@ impl GPSApp {
let node_id = values[2].get::<u32>().expect("node id in args[2]");
GPS_INFO!("Node added node id={} in graph id={}", node_id, graph_id);
if let Some(node) = app.graphview.borrow().node(node_id) {
let description = ElementInfo::element_description(&node.name()).ok();
let description = GPS::ElementInfo::element_description(&node.name()).ok();
node.set_tooltip_markup(description.as_deref());
}
None
@ -600,7 +600,7 @@ impl GPSApp {
}
);
if ElementInfo::element_supports_new_pad_request(&node.name(), PortDirection::Input) {
if GPS::ElementInfo::element_supports_new_pad_request(&node.name(), PortDirection::Input) {
let app_weak = app.downgrade();
app.connect_app_menu_action("node.request-pad-input",
move |_,_| {
@ -613,7 +613,7 @@ impl GPSApp {
} else {
app.disconnect_app_menu_action("node.request-pad-input");
}
if ElementInfo::element_supports_new_pad_request(&node.name(), PortDirection::Output) {
if GPS::ElementInfo::element_supports_new_pad_request(&node.name(), PortDirection::Output) {
let app_weak = app.downgrade();
app.connect_app_menu_action("node.request-pad-output",
move |_,_| {
@ -670,8 +670,8 @@ impl GPSApp {
pub fn add_new_element(&self, element_name: &str) {
let graph_view = self.graphview.borrow();
let node_id = graph_view.next_node_id();
let (inputs, outputs) = PadInfo::pads(element_name, false);
if ElementInfo::element_is_uri_src_handler(element_name) {
let (inputs, outputs) = GPS::PadInfo::pads(element_name, false);
if GPS::ElementInfo::element_is_uri_src_handler(element_name) {
GPSApp::get_file_from_dialog(self, false, move |app, filename| {
GPS_DEBUG!("Open file {}", filename);
let node = app.graphview.borrow().node(node_id).unwrap();
@ -683,7 +683,7 @@ impl GPSApp {
graph_view.create_node_with_port(
node_id,
element_name,
ElementInfo::element_type(element_name),
GPS::ElementInfo::element_type(element_name),
inputs.len() as u32,
outputs.len() as u32,
);

6
src/ui/elements.rs
View file

@ -18,7 +18,7 @@
// SPDX-License-Identifier: GPL-3.0-only
use crate::app::GPSApp;
use crate::gps::ElementInfo;
use crate::gps as GPS;
use crate::logger;
use crate::settings::Settings;
use crate::ui::treeview;
@ -109,7 +109,7 @@ pub fn add_to_favorite_list(app: &GPSApp, element_name: String) {
fn reset_elements_list(elements_list: &TreeView) {
let model = ListStore::new(&[String::static_type()]);
elements_list.set_model(Some(&model));
let elements = ElementInfo::elements_list().expect("Unable to obtain element's list");
let elements = GPS::ElementInfo::elements_list().expect("Unable to obtain element's list");
for element in elements {
model.insert_with_values(None, &[(0, &element.name)]);
}
@ -138,7 +138,7 @@ pub fn setup_elements_list(app: &GPSApp) {
let selection = tree_view.selection();
if let Some((model, iter)) = selection.selected() {
let element_name = model.get::<String>(&iter, 0);
let description = ElementInfo::element_description(&element_name)
let description = GPS::ElementInfo::element_description(&element_name)
.expect("Unable to get element description from GStreamer");
let box_property: Box = app
.builder

4
src/ui/properties.rs
View file

@ -17,7 +17,7 @@
//
// SPDX-License-Identifier: GPL-3.0-only
use crate::app::GPSApp;
use crate::gps::ElementInfo;
use crate::gps as GPS;
use crate::logger;
use crate::GPS_TRACE;
use gtk::glib;
@ -45,7 +45,7 @@ pub fn display_plugin_properties(app: &GPSApp, element_name: &str, node_id: u32)
.expect("Couldn't get box-plugin-properties");
let update_properties: Rc<RefCell<HashMap<String, String>>> =
Rc::new(RefCell::new(HashMap::new()));
let properties = ElementInfo::element_properties(element_name).unwrap();
let properties = GPS::ElementInfo::element_properties(element_name).unwrap();
for (name, value) in properties {
let entry_box = Box::new(gtk::Orientation::Horizontal, 6);
let label = Label::new(Some(&name));