Commit 2240ef10 authored by Sebastian Dröge's avatar Sebastian Dröge 🍵

Regenerate with latest GIR and update for the glib::Quark changes

parent 33a6aab6
Generated by gir (https://github.com/gtk-rs/gir @ 9eab494)
Generated by gir (https://github.com/gtk-rs/gir @ bec7561)
from gir-files (https://github.com/gtk-rs/gir-files @ ???)
Generated by gir (https://github.com/gtk-rs/gir @ 9eab494)
Generated by gir (https://github.com/gtk-rs/gir @ bec7561)
from gir-files (https://github.com/gtk-rs/gir-files @ ???)
Generated by gir (https://github.com/gtk-rs/gir @ 9eab494)
Generated by gir (https://github.com/gtk-rs/gir @ bec7561)
from gir-files (https://github.com/gtk-rs/gir-files @ ???)
Generated by gir (https://github.com/gtk-rs/gir @ 9eab494)
Generated by gir (https://github.com/gtk-rs/gir @ bec7561)
from gir-files (https://github.com/gtk-rs/gir-files @ ???)
Generated by gir (https://github.com/gtk-rs/gir @ 9eab494)
Generated by gir (https://github.com/gtk-rs/gir @ bec7561)
from gir-files (https://github.com/gtk-rs/gir-files @ ???)
......@@ -3,6 +3,7 @@
// DO NOT EDIT
use ffi;
use glib::Quark;
use glib::StaticType;
use glib::Type;
use glib::error::ErrorDomain;
......@@ -11,7 +12,6 @@ use glib::value::FromValue;
use glib::value::FromValueOptional;
use glib::value::SetValue;
use glib::value::Value;
use glib_ffi;
use gobject_ffi;
#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
......@@ -108,9 +108,9 @@ impl FromGlib<ffi::GstPlayerError> for PlayerError {
}
impl ErrorDomain for PlayerError {
fn domain() -> glib_ffi::GQuark {
fn domain() -> Quark {
skip_assert_initialized!();
unsafe { ffi::gst_player_error_quark() }
unsafe { from_glib(ffi::gst_player_error_quark()) }
}
fn code(self) -> i32 {
......
Generated by gir (https://github.com/gtk-rs/gir @ 9eab494)
Generated by gir (https://github.com/gtk-rs/gir @ bec7561)
from gir-files (https://github.com/gtk-rs/gir-files @ ???)
Generated by gir (https://github.com/gtk-rs/gir @ 9eab494)
Generated by gir (https://github.com/gtk-rs/gir @ bec7561)
from gir-files (https://github.com/gtk-rs/gir-files @ ???)
Generated by gir (https://github.com/gtk-rs/gir @ 9eab494)
Generated by gir (https://github.com/gtk-rs/gir @ bec7561)
from gir-files (https://github.com/gtk-rs/gir-files @ ???)
Generated by gir (https://github.com/gtk-rs/gir @ 9eab494)
Generated by gir (https://github.com/gtk-rs/gir @ bec7561)
from gir-files (https://github.com/gtk-rs/gir-files @ ???)
Generated by gir (https://github.com/gtk-rs/gir @ 9eab494)
Generated by gir (https://github.com/gtk-rs/gir @ bec7561)
from gir-files (https://github.com/gtk-rs/gir-files @ ???)
Generated by gir (https://github.com/gtk-rs/gir @ 9eab494)
Generated by gir (https://github.com/gtk-rs/gir @ bec7561)
from gir-files (https://github.com/gtk-rs/gir-files @ ???)
......@@ -3,6 +3,7 @@
// DO NOT EDIT
use ffi;
use glib::Quark;
use glib::StaticType;
use glib::Type;
use glib::error::ErrorDomain;
......@@ -11,7 +12,6 @@ use glib::value::FromValue;
use glib::value::FromValueOptional;
use glib::value::SetValue;
use glib::value::Value;
use glib_ffi;
use gobject_ffi;
#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
......@@ -403,9 +403,9 @@ impl FromGlib<ffi::GstCoreError> for CoreError {
}
impl ErrorDomain for CoreError {
fn domain() -> glib_ffi::GQuark {
fn domain() -> Quark {
skip_assert_initialized!();
unsafe { ffi::gst_core_error_quark() }
unsafe { from_glib(ffi::gst_core_error_quark()) }
}
fn code(self) -> i32 {
......@@ -890,9 +890,9 @@ impl FromGlib<ffi::GstLibraryError> for LibraryError {
}
impl ErrorDomain for LibraryError {
fn domain() -> glib_ffi::GQuark {
fn domain() -> Quark {
skip_assert_initialized!();
unsafe { ffi::gst_library_error_quark() }
unsafe { from_glib(ffi::gst_library_error_quark()) }
}
fn code(self) -> i32 {
......@@ -1309,9 +1309,9 @@ impl FromGlib<ffi::GstParseError> for ParseError {
}
impl ErrorDomain for ParseError {
fn domain() -> glib_ffi::GQuark {
fn domain() -> Quark {
skip_assert_initialized!();
unsafe { ffi::gst_parse_error_quark() }
unsafe { from_glib(ffi::gst_parse_error_quark()) }
}
fn code(self) -> i32 {
......@@ -1395,9 +1395,9 @@ impl FromGlib<ffi::GstPluginError> for PluginError {
}
impl ErrorDomain for PluginError {
fn domain() -> glib_ffi::GQuark {
fn domain() -> Quark {
skip_assert_initialized!();
unsafe { ffi::gst_plugin_error_quark() }
unsafe { from_glib(ffi::gst_plugin_error_quark()) }
}
fn code(self) -> i32 {
......@@ -1774,9 +1774,9 @@ impl FromGlib<ffi::GstResourceError> for ResourceError {
}
impl ErrorDomain for ResourceError {
fn domain() -> glib_ffi::GQuark {
fn domain() -> Quark {
skip_assert_initialized!();
unsafe { ffi::gst_resource_error_quark() }
unsafe { from_glib(ffi::gst_resource_error_quark()) }
}
fn code(self) -> i32 {
......@@ -2172,9 +2172,9 @@ impl FromGlib<ffi::GstStreamError> for StreamError {
}
impl ErrorDomain for StreamError {
fn domain() -> glib_ffi::GQuark {
fn domain() -> Quark {
skip_assert_initialized!();
unsafe { ffi::gst_stream_error_quark() }
unsafe { from_glib(ffi::gst_stream_error_quark()) }
}
fn code(self) -> i32 {
......@@ -2792,9 +2792,9 @@ impl FromGlib<ffi::GstURIError> for URIError {
}
impl ErrorDomain for URIError {
fn domain() -> glib_ffi::GQuark {
fn domain() -> Quark {
skip_assert_initialized!();
unsafe { ffi::gst_uri_error_quark() }
unsafe { from_glib(ffi::gst_uri_error_quark()) }
}
fn code(self) -> i32 {
......
Generated by gir (https://github.com/gtk-rs/gir @ 9eab494)
Generated by gir (https://github.com/gtk-rs/gir @ bec7561)
from gir-files (https://github.com/gtk-rs/gir-files @ ???)
......@@ -268,7 +268,7 @@ impl<O: IsA<Element>> ElementExtManual for O {
ffi::gst_element_message_full(
self.to_glib_none().0,
type_,
T::domain(),
T::domain().to_glib(),
code.code(),
message.to_glib_full(),
debug.to_glib_full(),
......@@ -301,7 +301,7 @@ impl<O: IsA<Element>> ElementExtManual for O {
ffi::gst_element_message_full_with_details(
self.to_glib_none().0,
type_,
T::domain(),
T::domain().to_glib(),
code.code(),
message.to_glib_full(),
debug.to_glib_full(),
......@@ -328,7 +328,7 @@ impl<O: IsA<Element>> ElementExtManual for O {
ffi::gst_element_message_full(
self.to_glib_none().0,
ffi::GST_MESSAGE_ERROR,
error_domain,
error_domain.to_glib(),
error_code,
message.to_glib_full(),
debug.to_glib_full(),
......
......@@ -9,7 +9,7 @@
use std::error::Error;
use std::fmt;
use glib_ffi;
use glib;
#[macro_export]
macro_rules! gst_error_msg(
......@@ -51,7 +51,7 @@ macro_rules! gst_error_msg(
#[derive(Clone, Debug, PartialEq, Eq)]
pub struct ErrorMessage {
pub(crate) error_domain: glib_ffi::GQuark,
pub(crate) error_domain: glib::Quark,
pub(crate) error_code: i32,
pub(crate) message: Option<String>,
pub(crate) debug: Option<String>,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment