Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/sdroege/gst-plugin-rs.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian@centricular.com>2022-10-17 20:02:02 +0300
committerSebastian Dröge <sebastian@centricular.com>2022-10-17 20:02:02 +0300
commite17688a2daf06322eea226e2f2cc19ddbb525d6a (patch)
tree840175792d077e08a092f18b93c673ccf476d65b
parent676b061af3ffc1bd8e78ff4cc6bddaeeb247f2d9 (diff)
Update for pango API changes
-rw-r--r--net/onvif/src/onvifmetadataoverlay/imp.rs15
-rw-r--r--video/closedcaption/src/cea608overlay/imp.rs14
2 files changed, 4 insertions, 25 deletions
diff --git a/net/onvif/src/onvifmetadataoverlay/imp.rs b/net/onvif/src/onvifmetadataoverlay/imp.rs
index 66333ce0..eece9d06 100644
--- a/net/onvif/src/onvifmetadataoverlay/imp.rs
+++ b/net/onvif/src/onvifmetadataoverlay/imp.rs
@@ -294,19 +294,8 @@ impl OnvifMetadataOverlay {
if state.layout.is_none() {
let fontmap = pangocairo::FontMap::new();
- let context = match fontmap.create_context() {
- Some(context) => Ok(context),
- None => {
- gst::element_imp_error!(
- self,
- gst::LibraryError::Failed,
- ["Failed to create font map context"]
- );
- Err(gst::FlowError::Error)
- }
- }
- .unwrap();
- context.set_language(&pango::Language::from_string("en_US"));
+ let context = fontmap.create_context();
+ context.set_language(Some(&pango::Language::from_string("en_US")));
context.set_base_dir(pango::Direction::Ltr);
let layout = pango::Layout::new(&context);
layout.set_alignment(pango::Alignment::Left);
diff --git a/video/closedcaption/src/cea608overlay/imp.rs b/video/closedcaption/src/cea608overlay/imp.rs
index aeaeed44..b4b56cc8 100644
--- a/video/closedcaption/src/cea608overlay/imp.rs
+++ b/video/closedcaption/src/cea608overlay/imp.rs
@@ -99,18 +99,8 @@ impl Cea608Overlay {
fn recalculate_layout(&self, state: &mut State) -> Result<gst::FlowSuccess, gst::FlowError> {
let video_info = state.video_info.as_ref().unwrap();
let fontmap = pangocairo::FontMap::new();
- let context = match fontmap.create_context() {
- Some(context) => Ok(context),
- None => {
- gst::element_imp_error!(
- self,
- gst::LibraryError::Failed,
- ["Failed to create font map context"]
- );
- Err(gst::FlowError::Error)
- }
- }?;
- context.set_language(&pango::Language::from_string("en_US"));
+ let context = fontmap.create_context();
+ context.set_language(Some(&pango::Language::from_string("en_US")));
context.set_base_dir(pango::Direction::Ltr);
let layout = pango::Layout::new(&context);
layout.set_alignment(pango::Alignment::Left);