mirrors/gstreamer-rs
mirrors/gstreamer-rs
1
1
Fork 1
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer-rs.git synced 2024-11-29 21:11:14 +00:00
Code Issues Projects Releases Wiki Activity

Require SendValue for value::Array and value::List

Browse source
This commit is contained in:
Sebastian Dröge 2017-12-17 14:06:22 +02:00
parent 2035bba437
commit 4b2fd0e593
1 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
gstreamer/src/value.rs
View file

@ -13,7 +13,7 @@ use std::borrow::{Borrow, Cow};
use std::slice; use std::slice;
use glib; use glib;
use glib::value::{FromValue, FromValueOptional, SetValue, ToValue, Value}; use glib::value::{FromValue, FromValueOptional, SetValue, ToSendValue, Value};
use glib::translate::{from_glib, from_glib_full, FromGlib, ToGlib, ToGlibPtr, ToGlibPtrMut, use glib::translate::{from_glib, from_glib_full, FromGlib, ToGlib, ToGlibPtr, ToGlibPtrMut,
Uninitialized}; Uninitialized};
@ -522,36 +522,36 @@ impl SetValue for Bitmask {
} }
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub struct Array<'a>(Cow<'a, [glib::Value]>); pub struct Array<'a>(Cow<'a, [glib::SendValue]>);
unsafe impl<'a> Send for Array<'a> {} unsafe impl<'a> Send for Array<'a> {}
impl<'a> Array<'a> { impl<'a> Array<'a> {
pub fn new(values: &[&ToValue]) -> Self { pub fn new(values: &[&ToSendValue]) -> Self {
assert_initialized_main_thread!(); assert_initialized_main_thread!();
Array(values.iter().map(|v| v.to_value()).collect()) Array(values.iter().map(|v| v.to_send_value()).collect())
} }
pub fn into_owned(self) -> Array<'static> { pub fn into_owned(self) -> Array<'static> {
Array(self.0.into_owned().into()) Array(self.0.into_owned().into())
} }
pub fn as_slice(&self) -> &[glib::Value] { pub fn as_slice(&self) -> &[glib::SendValue] {
self.0.borrow() self.0.borrow()
} }
} }
impl<'a> From<&'a [&'a ToValue]> for Array<'a> { impl<'a> From<&'a [&'a ToSendValue]> for Array<'a> {
fn from(values: &'a [&'a ToValue]) -> Self { fn from(values: &'a [&'a ToSendValue]) -> Self {
skip_assert_initialized!(); skip_assert_initialized!();
Self::new(values) Self::new(values)
} }
} }
impl<'a> From<&'a [glib::Value]> for Array<'a> { impl<'a> From<&'a [glib::SendValue]> for Array<'a> {
fn from(values: &'a [glib::Value]) -> Self { fn from(values: &'a [glib::SendValue]) -> Self {
assert_initialized_main_thread!(); assert_initialized_main_thread!();
Array(Cow::Borrowed(values)) Array(Cow::Borrowed(values))
@ -565,7 +565,7 @@ impl<'a> FromValue<'a> for Array<'a> {
Array(Cow::Borrowed(&[])) Array(Cow::Borrowed(&[]))
} else { } else {
Array(Cow::Borrowed(slice::from_raw_parts( Array(Cow::Borrowed(slice::from_raw_parts(
(*arr).data as *const glib::Value, (*arr).data as *const glib::SendValue,
(*arr).len as usize, (*arr).len as usize,
))) )))
} }
@ -593,36 +593,36 @@ impl<'a> glib::types::StaticType for Array<'a> {
} }
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub struct List<'a>(Cow<'a, [glib::Value]>); pub struct List<'a>(Cow<'a, [glib::SendValue]>);
unsafe impl<'a> Send for List<'a> {} unsafe impl<'a> Send for List<'a> {}
impl<'a> List<'a> { impl<'a> List<'a> {
pub fn new(values: &[&ToValue]) -> Self { pub fn new(values: &[&ToSendValue]) -> Self {
assert_initialized_main_thread!(); assert_initialized_main_thread!();
List(values.iter().map(|v| v.to_value()).collect()) List(values.iter().map(|v| v.to_send_value()).collect())
} }
pub fn into_owned(self) -> List<'static> { pub fn into_owned(self) -> List<'static> {
List(self.0.into_owned().into()) List(self.0.into_owned().into())
} }
pub fn as_slice(&self) -> &[glib::Value] { pub fn as_slice(&self) -> &[glib::SendValue] {
self.0.borrow() self.0.borrow()
} }
} }
impl<'a> From<&'a [&'a ToValue]> for List<'a> { impl<'a> From<&'a [&'a ToSendValue]> for List<'a> {
fn from(values: &'a [&'a ToValue]) -> Self { fn from(values: &'a [&'a ToSendValue]) -> Self {
skip_assert_initialized!(); skip_assert_initialized!();
Self::new(values) Self::new(values)
} }
} }
impl<'a> From<&'a [glib::Value]> for List<'a> { impl<'a> From<&'a [glib::SendValue]> for List<'a> {
fn from(values: &'a [glib::Value]) -> Self { fn from(values: &'a [glib::SendValue]) -> Self {
assert_initialized_main_thread!(); assert_initialized_main_thread!();
List(Cow::Borrowed(values)) List(Cow::Borrowed(values))
@ -636,7 +636,7 @@ impl<'a> FromValue<'a> for List<'a> {
List(Cow::Borrowed(&[])) List(Cow::Borrowed(&[]))
} else { } else {
List(Cow::Borrowed(slice::from_raw_parts( List(Cow::Borrowed(slice::from_raw_parts(
(*arr).data as *const glib::Value, (*arr).data as *const glib::SendValue,
(*arr).len as usize, (*arr).len as usize,
))) )))
} }