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

gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/video/cdg
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian@centricular.com>2020-12-20 21:43:45 +0300
committerSebastian Dröge <sebastian@centricular.com>2020-12-20 21:43:45 +0300
commit3d617371af1d1b779cf10d3fec40b17f29a7baf3 (patch)
treeff5ae62c07716648d8e62c4db34c6b731fbbd2fe /video/cdg
parentea6c05e16ccf0875652e2370eef4839ae819bc34 (diff)
Update for macro renames
Diffstat (limited to 'video/cdg')
-rw-r--r--video/cdg/src/cdgdec/imp.rs8
-rw-r--r--video/cdg/src/cdgparse/imp.rs6
-rw-r--r--video/cdg/src/lib.rs2
3 files changed, 8 insertions, 8 deletions
diff --git a/video/cdg/src/cdgdec/imp.rs b/video/cdg/src/cdgdec/imp.rs
index 9bc70e3bb..64cbbbf5e 100644
--- a/video/cdg/src/cdgdec/imp.rs
+++ b/video/cdg/src/cdgdec/imp.rs
@@ -8,8 +8,8 @@
use glib::subclass;
use glib::subclass::prelude::*;
+use gst::gst_debug;
use gst::subclass::prelude::*;
-use gst::{gst_debug, gst_element_error};
use gst_video::prelude::VideoDecoderExtManual;
use gst_video::prelude::*;
use gst_video::subclass::prelude::*;
@@ -127,7 +127,7 @@ impl VideoDecoderImpl for CdgDec {
let cmd = {
let input = frame.get_input_buffer().unwrap();
let map = input.map_readable().map_err(|_| {
- gst_element_error!(
+ gst::element_error!(
element,
gst::CoreError::Failed,
["Failed to map input buffer readable"]
@@ -159,7 +159,7 @@ impl VideoDecoderImpl for CdgDec {
let mut out_frame =
gst_video::VideoFrameRef::from_buffer_ref_writable(output, info.as_ref().unwrap())
.map_err(|_| {
- gst_element_error!(
+ gst::element_error!(
element,
gst::CoreError::Failed,
["Failed to map output buffer writable"]
@@ -208,7 +208,7 @@ impl VideoDecoderImpl for CdgDec {
let mut config = pool.get_config();
config.add_option(&gst_video::BUFFER_POOL_OPTION_VIDEO_META);
pool.set_config(config).map_err(|e| {
- gst::gst_error_msg!(gst::CoreError::Negotiation, [&e.message])
+ gst::error_msg!(gst::CoreError::Negotiation, [&e.message])
})?;
}
}
diff --git a/video/cdg/src/cdgparse/imp.rs b/video/cdg/src/cdgparse/imp.rs
index d5ee0f444..697575b59 100644
--- a/video/cdg/src/cdgparse/imp.rs
+++ b/video/cdg/src/cdgparse/imp.rs
@@ -9,9 +9,9 @@
use glib::subclass;
use glib::subclass::prelude::*;
use gst::format::Bytes;
+use gst::gst_debug;
use gst::subclass::prelude::*;
use gst::SECOND_VAL;
-use gst::{gst_debug, gst_element_error};
use gst_base::prelude::*;
use gst_base::subclass::prelude::*;
use once_cell::sync::Lazy;
@@ -151,7 +151,7 @@ impl BaseParseImpl for CdgParse {
let input = frame.get_buffer().unwrap();
let skip = {
let map = input.map_readable().map_err(|_| {
- gst_element_error!(
+ gst::element_error!(
element,
gst::CoreError::Failed,
["Failed to map input buffer readable"]
@@ -175,7 +175,7 @@ impl BaseParseImpl for CdgParse {
let (keyframe, header) = {
let map = input.map_readable().map_err(|_| {
- gst_element_error!(
+ gst::element_error!(
element,
gst::CoreError::Failed,
["Failed to map input buffer readable"]
diff --git a/video/cdg/src/lib.rs b/video/cdg/src/lib.rs
index 59b2a5106..e6a4ffb2c 100644
--- a/video/cdg/src/lib.rs
+++ b/video/cdg/src/lib.rs
@@ -18,7 +18,7 @@ fn plugin_init(plugin: &gst::Plugin) -> Result<(), glib::BoolError> {
Ok(())
}
-gst::gst_plugin_define!(
+gst::plugin_define!(
cdg,
env!("CARGO_PKG_DESCRIPTION"),
plugin_init,