Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 22:15:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #25218 - asajeffrey:gstplugin-name-unclash, r=jdm

Browse source 
Rename the ServoSrc type to ServoGstSrc to avoid a name clash

<!-- Please describe your changes on the following line: -->

There's a name clash with the type name `ServoSrc`.

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #25051
- [x] These changes do not require tests because

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
This commit is contained in:
bors-servo 2019-12-10 04:26:57 -05:00 • committed by GitHub
commit 8a7de32d5b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ports/gstplugin/lib.rs
View file

@ -4,7 +4,7 @@
use glib::subclass::types::ObjectSubclass; use glib::subclass::types::ObjectSubclass;
use gstreamer::gst_plugin_define; use gstreamer::gst_plugin_define;
use servosrc::ServoSrc; use servosrc::ServoGstSrc;
mod logging; mod logging;
mod resources; mod resources;
@ -35,6 +35,6 @@ fn plugin_init(plugin: &gstreamer::Plugin) -> Result<(), glib::BoolError> {
Some(plugin), Some(plugin),
"servosrc", "servosrc",
gstreamer::Rank::None, gstreamer::Rank::None,
ServoSrc::get_type(), ServoGstSrc::get_type(),
) )
} }

12
ports/gstplugin/servosrc.rs
View file

@ -92,7 +92,7 @@ use std::rc::Rc;
use std::sync::Mutex; use std::sync::Mutex;
use std::thread; use std::thread;
pub struct ServoSrc { pub struct ServoGstSrc {
sender: Sender<ServoSrcMsg>, sender: Sender<ServoSrcMsg>,
swap_chain: SwapChain, swap_chain: SwapChain,
url: Mutex<Option<String>>, url: Mutex<Option<String>>,
@ -420,8 +420,8 @@ const CAPS: &str = "video/x-raw(memory:GLMemory),
height=[1,2147483647], height=[1,2147483647],
framerate=[0/1,2147483647/1]"; framerate=[0/1,2147483647/1]";
impl ObjectSubclass for ServoSrc { impl ObjectSubclass for ServoGstSrc {
const NAME: &'static str = "ServoSrc"; const NAME: &'static str = "ServoGstSrc";
// gstreamer-gl doesn't have support for GLBaseSrc yet // gstreamer-gl doesn't have support for GLBaseSrc yet
// https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/issues/219 // https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/issues/219
type ParentType = BaseSrc; type ParentType = BaseSrc;
@ -464,7 +464,7 @@ impl ObjectSubclass for ServoSrc {
glib_object_subclass!(); glib_object_subclass!();
} }
impl ObjectImpl for ServoSrc { impl ObjectImpl for ServoGstSrc {
glib_object_impl!(); glib_object_impl!();
fn constructed(&self, obj: &glib::Object) { fn constructed(&self, obj: &glib::Object) {
@ -499,12 +499,12 @@ impl ObjectImpl for ServoSrc {
} }
} }
impl ElementImpl for ServoSrc {} impl ElementImpl for ServoGstSrc {}
thread_local! { thread_local! {
static GL: RefCell<Option<Rc<Gl>>> = RefCell::new(None); static GL: RefCell<Option<Rc<Gl>>> = RefCell::new(None);
} }
impl BaseSrcImpl for ServoSrc { impl BaseSrcImpl for ServoGstSrc {
fn set_caps(&self, src: &BaseSrc, outcaps: &Caps) -> Result<(), LoggableError> { fn set_caps(&self, src: &BaseSrc, outcaps: &Caps) -> Result<(), LoggableError> {
// Save the video info for later use // Save the video info for later use
let info = VideoInfo::from_caps(outcaps) let info = VideoInfo::from_caps(outcaps)