Update for gstreamer-rs API changes

gst-plugin-audiofx/src/audioecho.rs

@@ -137,7 +137,7 @@ impl ObjectSubclass for AudioEcho {
             cat: gst::DebugCategory::new(
                 "rsaudioecho",
                 gst::DebugColorFlags::empty(),
-                "Rust audioecho effect",
+                Some("Rust audioecho effect"),
             ),
             settings: Mutex::new(Default::default()),
             state: Mutex::new(None),

gst-plugin-cdg/src/cdgdec.rs

@@ -47,7 +47,11 @@ impl ObjectSubclass for CdgDec {
 
     fn new() -> Self {
         Self {
-            cat: gst::DebugCategory::new("cdgdec", gst::DebugColorFlags::empty(), "CDG decoder"),
+            cat: gst::DebugCategory::new(
+                "cdgdec",
+                gst::DebugColorFlags::empty(),
+                Some("CDG decoder"),
+            ),
             cdg_inter: Mutex::new(cdg_renderer::CdgInterpreter::new()),
             output_info: Mutex::new(None),
         }

gst-plugin-closedcaption/src/mcc_enc.rs

@@ -440,7 +440,7 @@ impl MccEnc {
                     .build();
                 self.srcpad.push_event(gst::Event::new_caps(&caps).build())
             }
-            _ => pad.event_default(element, event),
+            _ => pad.event_default(Some(element), event),
         }
     }
 
@@ -453,7 +453,7 @@ impl MccEnc {
                 gst_log!(self.cat, obj: pad, "Dropping seek event");
                 false
             }
-            _ => pad.event_default(element, event),
+            _ => pad.event_default(Some(element), event),
         }
     }
 
@@ -473,7 +473,7 @@ impl MccEnc {
                 );
                 true
             }
-            _ => pad.query_default(element, query),
+            _ => pad.query_default(Some(element), query),
         }
     }
 }
@@ -498,7 +498,7 @@ impl ObjectSubclass for MccEnc {
             cat: gst::DebugCategory::new(
                 "mccenc",
                 gst::DebugColorFlags::empty(),
-                "Mcc Encoder Element",
+                Some("Mcc Encoder Element"),
             ),
             srcpad,
             sinkpad,

gst-plugin-closedcaption/src/mcc_parse.rs

@@ -35,7 +35,7 @@ lazy_static! {
         gst::DebugCategory::new(
             "mccparse",
             gst::DebugColorFlags::empty(),
-            "Mcc Parser Element",
+            Some("Mcc Parser Element"),
         )
     };
 }
@@ -1002,14 +1002,14 @@ impl MccParse {
 
                 let _ = self.flush(state);
 
-                pad.event_default(element, event)
+                pad.event_default(Some(element), event)
             }
             EventView::Eos(_) => {
                 gst_log!(CAT, obj: pad, "Draining");
                 if let Err(err) = self.handle_buffer(element, None, false) {
                     gst_error!(CAT, obj: pad, "Failed to drain parser: {:?}", err);
                 }
-                pad.event_default(element, event)
+                pad.event_default(Some(element), event)
             }
             _ => {
                 if event.is_sticky()
@@ -1021,7 +1021,7 @@ impl MccParse {
                     state.pending_events.push(event);
                     true
                 } else {
-                    pad.event_default(element, event)
+                    pad.event_default(Some(element), event)
                 }
             }
         }
@@ -1125,7 +1125,7 @@ impl MccParse {
         gst_log!(CAT, obj: pad, "Handling event {:?}", event);
         match event.view() {
             EventView::Seek(e) => self.perform_seek(&e, element),
-            _ => pad.event_default(element, event),
+            _ => pad.event_default(Some(element), event),
         }
     }
 
@@ -1183,7 +1183,7 @@ impl MccParse {
                     self.sinkpad.peer_query(query)
                 }
             }
-            _ => pad.query_default(element, query),
+            _ => pad.query_default(Some(element), query),
         }
     }
 }

gst-plugin-closedcaption/src/scc_enc.rs

@@ -33,7 +33,7 @@ lazy_static! {
         gst::DebugCategory::new(
             "sccenc",
             gst::DebugColorFlags::empty(),
-            "Scc Encoder Element",
+            Some("Scc Encoder Element"),
         )
     };
 }
@@ -318,9 +318,9 @@ impl SccEnc {
                     gst_error!(CAT, obj: pad, "Failed to write a line after EOS: {:?}", err);
                     return false;
                 }
-                pad.event_default(element, event)
+                pad.event_default(Some(element), event)
             }
-            _ => pad.event_default(element, event),
+            _ => pad.event_default(Some(element), event),
         }
     }
 
@@ -333,7 +333,7 @@ impl SccEnc {
                 gst_log!(CAT, obj: pad, "Dropping seek event");
                 false
             }
-            _ => pad.event_default(element, event),
+            _ => pad.event_default(Some(element), event),
         }
     }
 
@@ -353,7 +353,7 @@ impl SccEnc {
                 );
                 true
             }
-            _ => pad.query_default(element, query),
+            _ => pad.query_default(Some(element), query),
         }
     }
 }

gst-plugin-closedcaption/src/scc_parse.rs

@@ -35,7 +35,7 @@ lazy_static! {
         gst::DebugCategory::new(
             "sccparse",
             gst::DebugColorFlags::empty(),
-            "Scc Parser Element",
+            Some("Scc Parser Element"),
         )
     };
 }
@@ -401,14 +401,14 @@ impl SccParse {
                 state.last_position = gst::ClockTime::from_seconds(0);
                 state.last_timecode = None;
 
-                pad.event_default(element, event)
+                pad.event_default(Some(element), event)
             }
             EventView::Eos(_) => {
                 gst_log!(CAT, obj: pad, "Draining");
                 if let Err(err) = self.handle_buffer(element, None) {
                     gst_error!(CAT, obj: pad, "Failed to drain parser: {:?}", err);
                 }
-                pad.event_default(element, event)
+                pad.event_default(Some(element), event)
             }
             _ => {
                 if event.is_sticky()
@@ -420,7 +420,7 @@ impl SccParse {
                     state.pending_events.push(event);
                     true
                 } else {
-                    pad.event_default(element, event)
+                    pad.event_default(Some(element), event)
                 }
             }
         }
@@ -435,7 +435,7 @@ impl SccParse {
                 gst_log!(CAT, obj: pad, "Dropping seek event");
                 false
             }
-            _ => pad.event_default(element, event),
+            _ => pad.event_default(Some(element), event),
         }
     }
 
@@ -465,7 +465,7 @@ impl SccParse {
                     self.sinkpad.peer_query(query)
                 }
             }
-            _ => pad.query_default(element, query),
+            _ => pad.query_default(Some(element), query),
         }
     }
 }

gst-plugin-file/src/filesink.rs

@@ -120,7 +120,11 @@ impl ObjectSubclass for FileSink {
 
     fn new() -> Self {
         Self {
-            cat: gst::DebugCategory::new("rsfilesink", gst::DebugColorFlags::empty(), "File Sink"),
+            cat: gst::DebugCategory::new(
+                "rsfilesink",
+                gst::DebugColorFlags::empty(),
+                Some("File Sink"),
+            ),
             settings: Mutex::new(Default::default()),
             state: Mutex::new(Default::default()),
         }
@@ -252,7 +256,7 @@ impl BaseSinkImpl for FileSink {
     fn render(
         &self,
         element: &gst_base::BaseSink,
-        buffer: &gst::BufferRef,
+        buffer: &gst::Buffer,
     ) -> Result<gst::FlowSuccess, gst::FlowError> {
         let mut state = self.state.lock().unwrap();
         let (file, position) = match *state {

gst-plugin-file/src/filesrc.rs

@@ -134,7 +134,11 @@ impl ObjectSubclass for FileSrc {
 
     fn new() -> Self {
         Self {
-            cat: gst::DebugCategory::new("rsfilesrc", gst::DebugColorFlags::empty(), "File Source"),
+            cat: gst::DebugCategory::new(
+                "rsfilesrc",
+                gst::DebugColorFlags::empty(),
+                Some("File Source"),
+            ),
             settings: Mutex::new(Default::default()),
             state: Mutex::new(Default::default()),
         }

gst-plugin-flv/src/flvdemux.rs

@@ -31,7 +31,7 @@ lazy_static! {
         gst::DebugCategory::new(
             "rsflvdemux",
             gst::DebugColorFlags::empty(),
-            "Rust FLV demuxer",
+            Some("Rust FLV demuxer"),
         )
     };
 }
@@ -388,21 +388,21 @@ impl FlvDemux {
         match event.view() {
             EventView::Eos(..) => {
                 // TODO implement
-                pad.event_default(element, event)
+                pad.event_default(Some(element), event)
             }
             EventView::Segment(..) => {
                 // TODO implement
-                pad.event_default(element, event)
+                pad.event_default(Some(element), event)
             }
             EventView::FlushStart(..) => {
                 // TODO implement
-                pad.event_default(element, event)
+                pad.event_default(Some(element), event)
             }
             EventView::FlushStop(..) => {
                 // TODO implement
-                pad.event_default(element, event)
+                pad.event_default(Some(element), event)
             }
-            _ => pad.event_default(element, event),
+            _ => pad.event_default(Some(element), event),
         }
     }
 
@@ -450,7 +450,7 @@ impl FlvDemux {
                     false
                 }
             }
-            _ => pad.query_default(element, query),
+            _ => pad.query_default(Some(element), query),
         }
     }
 
@@ -462,7 +462,7 @@ impl FlvDemux {
                 // TODO: Implement
                 false
             }
-            _ => pad.event_default(element, event),
+            _ => pad.event_default(Some(element), event),
         }
     }
 

gst-plugin-http/src/httpsrc.rs

@@ -436,7 +436,7 @@ impl ObjectSubclass for HttpSrc {
             cat: gst::DebugCategory::new(
                 "rshttpsrc",
                 gst::DebugColorFlags::empty(),
-                "Rust HTTP source",
+                Some("Rust HTTP source"),
             ),
             client: Client::new(),
             settings: Mutex::new(Default::default()),

gst-plugin-sodium/src/decrypter.rs

@@ -36,7 +36,7 @@ lazy_static! {
         gst::DebugCategory::new(
             "rssodiumdecrypter",
             gst::DebugColorFlags::empty(),
-            "Decrypter Element",
+            Some("Decrypter Element"),
         )
     };
 }
@@ -328,7 +328,7 @@ impl Decrypter {
             }
             QueryView::Duration(ref mut q) => {
                 if q.get_format() != gst::Format::Bytes {
-                    return pad.query_default(element, query);
+                    return pad.query_default(Some(element), query);
                 }
 
                 /* First let's query the bytes duration upstream */
@@ -370,7 +370,7 @@ impl Decrypter {
 
                 true
             }
-            _ => pad.query_default(element, query),
+            _ => pad.query_default(Some(element), query),
         }
     }
 

gst-plugin-sodium/src/encrypter.rs

@@ -39,7 +39,7 @@ lazy_static! {
         gst::DebugCategory::new(
             "rssodiumencrypter",
             gst::DebugColorFlags::empty(),
-            "Encrypter Element",
+            Some("Encrypter Element"),
         )
     };
 }
@@ -334,9 +334,9 @@ impl Encrypter {
                     }
                 }
 
-                pad.event_default(element, event)
+                pad.event_default(Some(element), event)
             }
-            _ => pad.event_default(element, event),
+            _ => pad.event_default(Some(element), event),
         }
     }
 
@@ -347,7 +347,7 @@ impl Encrypter {
 
         match event.view() {
             EventView::Seek(_) => false,
-            _ => pad.event_default(element, event),
+            _ => pad.event_default(Some(element), event),
         }
     }
 
@@ -369,7 +369,7 @@ impl Encrypter {
             }
             QueryView::Duration(ref mut q) => {
                 if q.get_format() != gst::Format::Bytes {
-                    return pad.query_default(element, query);
+                    return pad.query_default(Some(element), query);
                 }
 
                 /* First let's query the bytes duration upstream */
@@ -410,7 +410,7 @@ impl Encrypter {
 
                 true
             }
-            _ => pad.query_default(element, query),
+            _ => pad.query_default(Some(element), query),
         }
     }
 }

gst-plugin-sodium/src/lib.rs

@@ -48,11 +48,11 @@ fn typefind_register(plugin: &gst::Plugin) -> Result<(), glib::BoolError> {
     use gst::{Caps, TypeFind, TypeFindProbability};
 
     TypeFind::register(
-        plugin,
+        Some(plugin),
         "sodium_encrypted_typefind",
         gst::Rank::Primary.to_glib() as u32,
         None,
-        &Caps::new_simple("application/x-sodium-encrypted", &[]),
+        Some(&Caps::new_simple("application/x-sodium-encrypted", &[])),
         |typefind| {
             if let Some(data) = typefind.peek(0, TYPEFIND_HEADER_SIZE as u32) {
                 if data == TYPEFIND_HEADER {

gst-plugin-threadshare/src/appsrc.rs

@@ -563,7 +563,7 @@ impl ObjectSubclass for AppSrc {
             cat: gst::DebugCategory::new(
                 "ts-appsrc",
                 gst::DebugColorFlags::empty(),
-                "Thread-sharing app source",
+                Some("Thread-sharing app source"),
             ),
             src_pad,
             state: Mutex::new(State::default()),

gst-plugin-threadshare/src/dataqueue.rs

@@ -32,7 +32,7 @@ lazy_static! {
     static ref DATA_QUEUE_CAT: gst::DebugCategory = gst::DebugCategory::new(
         "ts-dataqueue",
         gst::DebugColorFlags::empty(),
-        "Thread-sharing queue",
+        Some("Thread-sharing queue"),
     );
 }
 

gst-plugin-threadshare/src/iocontext.rs

@@ -38,7 +38,7 @@ lazy_static! {
     static ref CONTEXT_CAT: gst::DebugCategory = gst::DebugCategory::new(
         "ts-context",
         gst::DebugColorFlags::empty(),
-        "Thread-sharing Context",
+        Some("Thread-sharing Context"),
     );
 }
 

gst-plugin-threadshare/src/proxy.rs

@@ -559,7 +559,7 @@ impl ProxySink {
     ) -> bool {
         gst_log!(self.cat, obj: pad, "Handling query {:?}", query);
 
-        pad.query_default(element, query)
+        pad.query_default(Some(element), query)
     }
 
     fn prepare(&self, element: &gst::Element) -> Result<(), gst::ErrorMessage> {
@@ -693,7 +693,7 @@ impl ObjectSubclass for ProxySink {
             cat: gst::DebugCategory::new(
                 "ts-proxysink",
                 gst::DebugColorFlags::empty(),
-                "Thread-sharing proxy sink",
+                Some("Thread-sharing proxy sink"),
             ),
             sink_pad,
             state: Mutex::new(StateSink::default()),
@@ -1221,7 +1221,7 @@ impl ObjectSubclass for ProxySrc {
             cat: gst::DebugCategory::new(
                 "ts-proxysrc",
                 gst::DebugColorFlags::empty(),
-                "Thread-sharing proxy source",
+                Some("Thread-sharing proxy source"),
             ),
             src_pad,
             state: Mutex::new(StateSrc::default()),

gst-plugin-threadshare/src/queue.rs

@@ -844,7 +844,7 @@ impl ObjectSubclass for Queue {
             cat: gst::DebugCategory::new(
                 "ts-queue",
                 gst::DebugColorFlags::empty(),
-                "Thread-sharing queue",
+                Some("Thread-sharing queue"),
             ),
             sink_pad,
             src_pad,

gst-plugin-threadshare/src/socket.rs

@@ -34,7 +34,7 @@ lazy_static! {
     static ref SOCKET_CAT: gst::DebugCategory = gst::DebugCategory::new(
         "ts-socket",
         gst::DebugColorFlags::empty(),
-        "Thread-sharing Socket",
+        Some("Thread-sharing Socket"),
     );
 }
 

gst-plugin-threadshare/src/tcpclientsrc.rs

@@ -626,7 +626,7 @@ impl ObjectSubclass for TcpClientSrc {
             cat: gst::DebugCategory::new(
                 "ts-tcpclientsrc",
                 gst::DebugColorFlags::empty(),
-                "Thread-sharing TCP Client source",
+                Some("Thread-sharing TCP Client source"),
             ),
             src_pad,
             state: Mutex::new(State::default()),

gst-plugin-threadshare/src/udpsrc.rs

@@ -968,7 +968,7 @@ impl ObjectSubclass for UdpSrc {
             cat: gst::DebugCategory::new(
                 "ts-udpsrc",
                 gst::DebugColorFlags::empty(),
-                "Thread-sharing UDP source",
+                Some("Thread-sharing UDP source"),
             ),
             src_pad,
             state: Mutex::new(State::default()),

gst-plugin-togglerecord/src/togglerecord.rs

@@ -1165,7 +1165,7 @@ impl ObjectSubclass for ToggleRecord {
             cat: gst::DebugCategory::new(
                 "togglerecord",
                 gst::DebugColorFlags::empty(),
-                "Toggle Record Element",
+                Some("Toggle Record Element"),
             ),
             settings: Mutex::new(Settings::default()),
             state: Mutex::new(State::default()),
@@ -1340,7 +1340,7 @@ impl ElementImpl for ToggleRecord {
         element: &gst::Element,
         _templ: &gst::PadTemplate,
         _name: Option<String>,
-        _caps: Option<&gst::CapsRef>,
+        _caps: Option<&gst::Caps>,
     ) -> Option<gst::Pad> {
         let mut other_streams = self.other_streams.lock();
         let (ref mut other_streams, ref mut pad_count) = *other_streams;

gst-plugin-tutorial/src/identity.rs

@@ -183,7 +183,7 @@ impl ObjectSubclass for Identity {
             cat: gst::DebugCategory::new(
                 "rsidentity",
                 gst::DebugColorFlags::empty(),
-                "Identity Element",
+                Some("Identity Element"),
             ),
             srcpad,
             sinkpad,

gst-plugin-tutorial/src/progressbin.rs

@@ -59,7 +59,7 @@ impl ObjectSubclass for ProgressBin {
             cat: gst::DebugCategory::new(
                 "rsprogressbin",
                 gst::DebugColorFlags::empty(),
-                "Progress printing Bin",
+                Some("Progress printing Bin"),
             ),
             progress,
             srcpad,

gst-plugin-tutorial/src/rgb2gray.rs

@@ -122,7 +122,7 @@ impl ObjectSubclass for Rgb2Gray {
             cat: gst::DebugCategory::new(
                 "rsrgb2gray",
                 gst::DebugColorFlags::empty(),
-                "Rust RGB-GRAY converter",
+                Some("Rust RGB-GRAY converter"),
             ),
             settings: Mutex::new(Default::default()),
             state: Mutex::new(None),

gst-plugin-tutorial/src/sinesrc.rs

@@ -207,7 +207,7 @@ impl ObjectSubclass for SineSrc {
             cat: gst::DebugCategory::new(
                 "rssinesrc",
                 gst::DebugColorFlags::empty(),
-                "Rust Sine Wave Source",
+                Some("Rust Sine Wave Source"),
             ),
             settings: Mutex::new(Default::default()),
             state: Mutex::new(Default::default()),
@@ -437,7 +437,7 @@ impl BaseSrcImpl for SineSrc {
     fn set_caps(
         &self,
         element: &gst_base::BaseSrc,
-        caps: &gst::CapsRef,
+        caps: &gst::Caps,
     ) -> Result<(), gst::LoggableError> {
         use std::f64::consts::PI;