diff options
author | Sebastian Dröge <sebastian@centricular.com> | 2020-12-18 01:44:49 +0300 |
---|---|---|
committer | Sebastian Dröge <sebastian@centricular.com> | 2020-12-18 01:44:49 +0300 |
commit | ea6c05e16ccf0875652e2370eef4839ae819bc34 (patch) | |
tree | 4b61e9ffa44e639304dbbff638512d715c6dbad6 /tutorial | |
parent | 708c6aa57e1dabe35e8304dd878e130501282a7d (diff) |
Update everything for glib macro renamings
Diffstat (limited to 'tutorial')
-rw-r--r-- | tutorial/src/identity/imp.rs | 2 | ||||
-rw-r--r-- | tutorial/src/identity/mod.rs | 2 | ||||
-rw-r--r-- | tutorial/src/progressbin/imp.rs | 2 | ||||
-rw-r--r-- | tutorial/src/progressbin/mod.rs | 2 | ||||
-rw-r--r-- | tutorial/src/rgb2gray/imp.rs | 2 | ||||
-rw-r--r-- | tutorial/src/rgb2gray/mod.rs | 2 | ||||
-rw-r--r-- | tutorial/src/sinesrc/imp.rs | 2 | ||||
-rw-r--r-- | tutorial/src/sinesrc/mod.rs | 2 | ||||
-rw-r--r-- | tutorial/tutorial-1.md | 8 | ||||
-rw-r--r-- | tutorial/tutorial-2.md | 4 |
10 files changed, 14 insertions, 14 deletions
diff --git a/tutorial/src/identity/imp.rs b/tutorial/src/identity/imp.rs index 8bd8c65e..d94ec448 100644 --- a/tutorial/src/identity/imp.rs +++ b/tutorial/src/identity/imp.rs @@ -122,7 +122,7 @@ impl ObjectSubclass for Identity { type Class = subclass::simple::ClassStruct<Self>; // This macro provides some boilerplate. - glib::glib_object_subclass!(); + glib::object_subclass!(); // Called when a new instance is to be created. We need to return an instance // of our struct here and also get the class struct passed in case it's needed diff --git a/tutorial/src/identity/mod.rs b/tutorial/src/identity/mod.rs index c9b4c18d..d7d45183 100644 --- a/tutorial/src/identity/mod.rs +++ b/tutorial/src/identity/mod.rs @@ -11,7 +11,7 @@ use glib::prelude::*; mod imp; // The public Rust wrapper type for our element -glib::glib_wrapper! { +glib::wrapper! { pub struct Identity(ObjectSubclass<imp::Identity>) @extends gst::Element, gst::Object; } diff --git a/tutorial/src/progressbin/imp.rs b/tutorial/src/progressbin/imp.rs index 4488458c..9a1e5c7c 100644 --- a/tutorial/src/progressbin/imp.rs +++ b/tutorial/src/progressbin/imp.rs @@ -64,7 +64,7 @@ impl ObjectSubclass for ProgressBin { type Class = subclass::simple::ClassStruct<Self>; // This macro provides some boilerplate. - glib::glib_object_subclass!(); + glib::object_subclass!(); // Called when a new instance is to be created. We need to return an instance // of our struct here and also get the class struct passed in case it's needed diff --git a/tutorial/src/progressbin/mod.rs b/tutorial/src/progressbin/mod.rs index 51551b64..d4f940f7 100644 --- a/tutorial/src/progressbin/mod.rs +++ b/tutorial/src/progressbin/mod.rs @@ -30,7 +30,7 @@ pub enum ProgressBinOutput { } // The public Rust wrapper type for our element -glib::glib_wrapper! { +glib::wrapper! { pub struct ProgressBin(ObjectSubclass<imp::ProgressBin>) @extends gst::Bin, gst::Element, gst::Object; } diff --git a/tutorial/src/rgb2gray/imp.rs b/tutorial/src/rgb2gray/imp.rs index 17f2a61e..03e07b3b 100644 --- a/tutorial/src/rgb2gray/imp.rs +++ b/tutorial/src/rgb2gray/imp.rs @@ -122,7 +122,7 @@ impl ObjectSubclass for Rgb2Gray { type Class = subclass::simple::ClassStruct<Self>; // This macro provides some boilerplate - glib::glib_object_subclass!(); + glib::object_subclass!(); // Called when a new instance is to be created. We need to return an instance // of our struct here. diff --git a/tutorial/src/rgb2gray/mod.rs b/tutorial/src/rgb2gray/mod.rs index 0500f7d6..988904d7 100644 --- a/tutorial/src/rgb2gray/mod.rs +++ b/tutorial/src/rgb2gray/mod.rs @@ -11,7 +11,7 @@ use glib::prelude::*; mod imp; // The public Rust wrapper type for our element -glib::glib_wrapper! { +glib::wrapper! { pub struct Rgb2Gray(ObjectSubclass<imp::Rgb2Gray>) @extends gst_base::BaseTransform, gst::Element, gst::Object; } diff --git a/tutorial/src/sinesrc/imp.rs b/tutorial/src/sinesrc/imp.rs index 3a6f79d7..fcfcb4b9 100644 --- a/tutorial/src/sinesrc/imp.rs +++ b/tutorial/src/sinesrc/imp.rs @@ -207,7 +207,7 @@ impl ObjectSubclass for SineSrc { type Class = subclass::simple::ClassStruct<Self>; // This macro provides some boilerplate. - glib::glib_object_subclass!(); + glib::object_subclass!(); // Called when a new instance is to be created. We need to return an instance // of our struct here. diff --git a/tutorial/src/sinesrc/mod.rs b/tutorial/src/sinesrc/mod.rs index 4d9af02c..8e396499 100644 --- a/tutorial/src/sinesrc/mod.rs +++ b/tutorial/src/sinesrc/mod.rs @@ -11,7 +11,7 @@ use glib::prelude::*; mod imp; // The public Rust wrapper type for our element -glib::glib_wrapper! { +glib::wrapper! { pub struct SineSrc(ObjectSubclass<imp::SineSrc>) @extends gst_base::BaseSrc, gst::Element, gst::Object; } diff --git a/tutorial/tutorial-1.md b/tutorial/tutorial-1.md index 91dd11da..efbc33e9 100644 --- a/tutorial/tutorial-1.md +++ b/tutorial/tutorial-1.md @@ -175,7 +175,7 @@ impl ObjectSubclass for Rgb2Gray { type Class = subclass::simple::ClassStruct<Self>; // This macro provides some boilerplate - glib::glib_object_subclass!(); + glib::object_subclass!(); fn new() -> Self { Self {} @@ -198,7 +198,7 @@ use glib::prelude::*; mod imp; // The public Rust wrapper type for our element -glib::glib_wrapper! { +glib::wrapper! { pub struct Rgb2Gray(ObjectSubclass<imp::Rgb2Gray>) @extends gst_base::BaseTransform, gst::Element, gst::Object; } @@ -290,7 +290,7 @@ impl ObjectSubclass for Rgb2Gray { type Instance = gst::subclass::ElementInstanceStruct<Self>; type Class = subclass::simple::ClassStruct<Self>; - glib::glib_object_subclass!(); + glib::object_subclass!(); } impl ObjectImpl for Rgb2Gray {} @@ -305,7 +305,7 @@ use glib::prelude::*; mod imp; -glib::glib_wrapper! { +glib::wrapper! { pub struct Rgb2Gray(ObjectSubclass<imp::Rgb2Gray>) @extends gst_base::BaseTransform, gst::Element, gst::Object; } diff --git a/tutorial/tutorial-2.md b/tutorial/tutorial-2.md index 8bc1a548..4e8a20b8 100644 --- a/tutorial/tutorial-2.md +++ b/tutorial/tutorial-2.md @@ -154,7 +154,7 @@ impl ObjectSubclass for SineSrc { type Class = subclass::simple::ClassStruct<Self>; // This macro provides some boilerplate. - glib::glib_object_subclass!(); + glib::object_subclass!(); // Called when a new instance is to be created. We need to return an instance // of our struct here. @@ -380,7 +380,7 @@ use glib::prelude::*; mod imp; // The public Rust wrapper type for our element -glib::glib_wrapper! { +glib::wrapper! { pub struct SineSrc(ObjectSubclass<imp::SineSrc>) @extends gst_base::BaseSrc, gst::Element, gst::Object; } |