Update for ObjectImpl::get_property() being infallible now

8 files changed, 75 insertions, 75 deletions

diff --git a/generic/threadshare/src/appsrc/imp.rs b/generic/threadshare/src/appsrc/imp.rs
index 85247392b..9ab686dae 100644
--- a/generic/threadshare/src/appsrc/imp.rs
+++ b/generic/threadshare/src/appsrc/imp.rs
@@ -667,16 +667,16 @@ impl ObjectImpl for AppSrc {
         }
     }
 
-    fn get_property(&self, _obj: &Self::Type, id: usize) -> Result<glib::Value, ()> {
+    fn get_property(&self, _obj: &Self::Type, id: usize) -> glib::Value {
         let prop = &PROPERTIES[id];
 
         let settings = self.settings.lock().unwrap();
         match *prop {
-            subclass::Property("context", ..) => Ok(settings.context.to_value()),
-            subclass::Property("context-wait", ..) => Ok(settings.context_wait.to_value()),
-            subclass::Property("caps", ..) => Ok(settings.caps.to_value()),
-            subclass::Property("max-buffers", ..) => Ok(settings.max_buffers.to_value()),
-            subclass::Property("do-timestamp", ..) => Ok(settings.do_timestamp.to_value()),
+            subclass::Property("context", ..) => settings.context.to_value(),
+            subclass::Property("context-wait", ..) => settings.context_wait.to_value(),
+            subclass::Property("caps", ..) => settings.caps.to_value(),
+            subclass::Property("max-buffers", ..) => settings.max_buffers.to_value(),
+            subclass::Property("do-timestamp", ..) => settings.do_timestamp.to_value(),
             _ => unimplemented!(),
         }
     }
diff --git a/generic/threadshare/src/inputselector/imp.rs b/generic/threadshare/src/inputselector/imp.rs
index 914e4f39f..b7c6c8c33 100644
--- a/generic/threadshare/src/inputselector/imp.rs
+++ b/generic/threadshare/src/inputselector/imp.rs
@@ -527,22 +527,22 @@ impl ObjectImpl for InputSelector {
         }
     }
 
-    fn get_property(&self, _obj: &Self::Type, id: usize) -> Result<glib::Value, ()> {
+    fn get_property(&self, _obj: &Self::Type, id: usize) -> glib::Value {
         let prop = &PROPERTIES[id];
 
         match *prop {
             subclass::Property("context", ..) => {
                 let settings = self.settings.lock().unwrap();
-                Ok(settings.context.to_value())
+                settings.context.to_value()
             }
             subclass::Property("context-wait", ..) => {
                 let settings = self.settings.lock().unwrap();
-                Ok(settings.context_wait.to_value())
+                settings.context_wait.to_value()
             }
             subclass::Property("active-pad", ..) => {
                 let state = self.state.lock().unwrap();
                 let active_pad = state.active_sinkpad.clone();
-                Ok(active_pad.to_value())
+                active_pad.to_value()
             }
             _ => unimplemented!(),
         }
diff --git a/generic/threadshare/src/jitterbuffer/imp.rs b/generic/threadshare/src/jitterbuffer/imp.rs
index 895efbc06..b92aa66fe 100644
--- a/generic/threadshare/src/jitterbuffer/imp.rs
+++ b/generic/threadshare/src/jitterbuffer/imp.rs
@@ -1537,25 +1537,25 @@ impl ObjectImpl for JitterBuffer {
         }
     }
 
-    fn get_property(&self, _obj: &Self::Type, id: usize) -> Result<glib::Value, ()> {
+    fn get_property(&self, _obj: &Self::Type, id: usize) -> glib::Value {
         let prop = &PROPERTIES[id];
 
         match *prop {
             subclass::Property("latency", ..) => {
                 let settings = self.settings.lock().unwrap();
-                Ok(settings.latency_ms.to_value())
+                settings.latency_ms.to_value()
             }
             subclass::Property("do-lost", ..) => {
                 let settings = self.settings.lock().unwrap();
-                Ok(settings.do_lost.to_value())
+                settings.do_lost.to_value()
             }
             subclass::Property("max-dropout-time", ..) => {
                 let settings = self.settings.lock().unwrap();
-                Ok(settings.max_dropout_time.to_value())
+                settings.max_dropout_time.to_value()
             }
             subclass::Property("max-misorder-time", ..) => {
                 let settings = self.settings.lock().unwrap();
-                Ok(settings.max_misorder_time.to_value())
+                settings.max_misorder_time.to_value()
             }
             subclass::Property("stats", ..) => {
                 let state = self.state.lock().unwrap();
@@ -1567,15 +1567,15 @@ impl ObjectImpl for JitterBuffer {
                         ("num-late", &state.stats.num_late),
                     ],
                 );
-                Ok(s.to_value())
+                s.to_value()
             }
             subclass::Property("context", ..) => {
                 let settings = self.settings.lock().unwrap();
-                Ok(settings.context.to_value())
+                settings.context.to_value()
             }
             subclass::Property("context-wait", ..) => {
                 let settings = self.settings.lock().unwrap();
-                Ok(settings.context_wait.to_value())
+                settings.context_wait.to_value()
             }
             _ => unimplemented!(),
         }
diff --git a/generic/threadshare/src/proxy/imp.rs b/generic/threadshare/src/proxy/imp.rs
index d4eb1aa2f..d4b22aca9 100644
--- a/generic/threadshare/src/proxy/imp.rs
+++ b/generic/threadshare/src/proxy/imp.rs
@@ -709,12 +709,12 @@ impl ObjectImpl for ProxySink {
         }
     }
 
-    fn get_property(&self, _obj: &Self::Type, id: usize) -> Result<glib::Value, ()> {
+    fn get_property(&self, _obj: &Self::Type, id: usize) -> glib::Value {
         let prop = &PROPERTIES_SINK[id];
 
         let settings = self.settings.lock().unwrap();
         match *prop {
-            subclass::Property("proxy-context", ..) => Ok(settings.proxy_context.to_value()),
+            subclass::Property("proxy-context", ..) => settings.proxy_context.to_value(),
             _ => unimplemented!(),
         }
     }
@@ -1248,17 +1248,17 @@ impl ObjectImpl for ProxySrc {
         }
     }
 
-    fn get_property(&self, _obj: &Self::Type, id: usize) -> Result<glib::Value, ()> {
+    fn get_property(&self, _obj: &Self::Type, id: usize) -> glib::Value {
         let prop = &PROPERTIES_SRC[id];
 
         let settings = self.settings.lock().unwrap();
         match *prop {
-            subclass::Property("max-size-buffers", ..) => Ok(settings.max_size_buffers.to_value()),
-            subclass::Property("max-size-bytes", ..) => Ok(settings.max_size_bytes.to_value()),
-            subclass::Property("max-size-time", ..) => Ok(settings.max_size_time.to_value()),
-            subclass::Property("context", ..) => Ok(settings.context.to_value()),
-            subclass::Property("context-wait", ..) => Ok(settings.context_wait.to_value()),
-            subclass::Property("proxy-context", ..) => Ok(settings.proxy_context.to_value()),
+            subclass::Property("max-size-buffers", ..) => settings.max_size_buffers.to_value(),
+            subclass::Property("max-size-bytes", ..) => settings.max_size_bytes.to_value(),
+            subclass::Property("max-size-time", ..) => settings.max_size_time.to_value(),
+            subclass::Property("context", ..) => settings.context.to_value(),
+            subclass::Property("context-wait", ..) => settings.context_wait.to_value(),
+            subclass::Property("proxy-context", ..) => settings.proxy_context.to_value(),
             _ => unimplemented!(),
         }
     }
diff --git a/generic/threadshare/src/queue/imp.rs b/generic/threadshare/src/queue/imp.rs
index 28ac0a351..fb9ee8f22 100644
--- a/generic/threadshare/src/queue/imp.rs
+++ b/generic/threadshare/src/queue/imp.rs
@@ -836,16 +836,16 @@ impl ObjectImpl for Queue {
         }
     }
 
-    fn get_property(&self, _obj: &Self::Type, id: usize) -> Result<glib::Value, ()> {
+    fn get_property(&self, _obj: &Self::Type, id: usize) -> glib::Value {
         let prop = &PROPERTIES[id];
 
         let settings = self.settings.lock().unwrap();
         match *prop {
-            subclass::Property("max-size-buffers", ..) => Ok(settings.max_size_buffers.to_value()),
-            subclass::Property("max-size-bytes", ..) => Ok(settings.max_size_bytes.to_value()),
-            subclass::Property("max-size-time", ..) => Ok(settings.max_size_time.to_value()),
-            subclass::Property("context", ..) => Ok(settings.context.to_value()),
-            subclass::Property("context-wait", ..) => Ok(settings.context_wait.to_value()),
+            subclass::Property("max-size-buffers", ..) => settings.max_size_buffers.to_value(),
+            subclass::Property("max-size-bytes", ..) => settings.max_size_bytes.to_value(),
+            subclass::Property("max-size-time", ..) => settings.max_size_time.to_value(),
+            subclass::Property("context", ..) => settings.context.to_value(),
+            subclass::Property("context-wait", ..) => settings.context_wait.to_value(),
             _ => unimplemented!(),
         }
     }
diff --git a/generic/threadshare/src/tcpclientsrc/imp.rs b/generic/threadshare/src/tcpclientsrc/imp.rs
index 809f47d1b..8a7136b3b 100644
--- a/generic/threadshare/src/tcpclientsrc/imp.rs
+++ b/generic/threadshare/src/tcpclientsrc/imp.rs
@@ -685,17 +685,17 @@ impl ObjectImpl for TcpClientSrc {
         }
     }
 
-    fn get_property(&self, _obj: &Self::Type, id: usize) -> Result<glib::Value, ()> {
+    fn get_property(&self, _obj: &Self::Type, id: usize) -> glib::Value {
         let prop = &PROPERTIES[id];
 
         let settings = self.settings.lock().unwrap();
         match *prop {
-            subclass::Property("host", ..) => Ok(settings.host.to_value()),
-            subclass::Property("port", ..) => Ok(settings.port.to_value()),
-            subclass::Property("caps", ..) => Ok(settings.caps.to_value()),
-            subclass::Property("blocksize", ..) => Ok(settings.blocksize.to_value()),
-            subclass::Property("context", ..) => Ok(settings.context.to_value()),
-            subclass::Property("context-wait", ..) => Ok(settings.context_wait.to_value()),
+            subclass::Property("host", ..) => settings.host.to_value(),
+            subclass::Property("port", ..) => settings.port.to_value(),
+            subclass::Property("caps", ..) => settings.caps.to_value(),
+            subclass::Property("blocksize", ..) => settings.blocksize.to_value(),
+            subclass::Property("context", ..) => settings.context.to_value(),
+            subclass::Property("context-wait", ..) => settings.context_wait.to_value(),
             _ => unimplemented!(),
         }
     }
diff --git a/generic/threadshare/src/udpsink/imp.rs b/generic/threadshare/src/udpsink/imp.rs
index 232311ad5..39c10a412 100644
--- a/generic/threadshare/src/udpsink/imp.rs
+++ b/generic/threadshare/src/udpsink/imp.rs
@@ -1341,41 +1341,41 @@ impl ObjectImpl for UdpSink {
         }
     }
 
-    fn get_property(&self, _obj: &Self::Type, id: usize) -> Result<glib::Value, ()> {
+    fn get_property(&self, _obj: &Self::Type, id: usize) -> glib::Value {
         let prop = &PROPERTIES[id];
 
         let settings = self.settings.lock().unwrap();
         match *prop {
-            subclass::Property("sync", ..) => Ok(settings.sync.to_value()),
-            subclass::Property("bind-address", ..) => Ok(settings.bind_address.to_value()),
-            subclass::Property("bind-port", ..) => Ok(settings.bind_port.to_value()),
-            subclass::Property("bind-address-v6", ..) => Ok(settings.bind_address_v6.to_value()),
-            subclass::Property("bind-port-v6", ..) => Ok(settings.bind_port_v6.to_value()),
-            subclass::Property("socket", ..) => Ok(settings
+            subclass::Property("sync", ..) => settings.sync.to_value(),
+            subclass::Property("bind-address", ..) => settings.bind_address.to_value(),
+            subclass::Property("bind-port", ..) => settings.bind_port.to_value(),
+            subclass::Property("bind-address-v6", ..) => settings.bind_address_v6.to_value(),
+            subclass::Property("bind-port-v6", ..) => settings.bind_port_v6.to_value(),
+            subclass::Property("socket", ..) => settings
                 .socket
                 .as_ref()
                 .map(GioSocketWrapper::as_socket)
-                .to_value()),
-            subclass::Property("used-socket", ..) => Ok(settings
+                .to_value(),
+            subclass::Property("used-socket", ..) => settings
                 .used_socket
                 .as_ref()
                 .map(GioSocketWrapper::as_socket)
-                .to_value()),
-            subclass::Property("socket-v6", ..) => Ok(settings
+                .to_value(),
+            subclass::Property("socket-v6", ..) => settings
                 .socket_v6
                 .as_ref()
                 .map(GioSocketWrapper::as_socket)
-                .to_value()),
-            subclass::Property("used-socket-v6", ..) => Ok(settings
+                .to_value(),
+            subclass::Property("used-socket-v6", ..) => settings
                 .used_socket_v6
                 .as_ref()
                 .map(GioSocketWrapper::as_socket)
-                .to_value()),
-            subclass::Property("auto-multicast", ..) => Ok(settings.sync.to_value()),
-            subclass::Property("loop", ..) => Ok(settings.multicast_loop.to_value()),
-            subclass::Property("ttl", ..) => Ok(settings.ttl.to_value()),
-            subclass::Property("ttl-mc", ..) => Ok(settings.ttl_mc.to_value()),
-            subclass::Property("qos-dscp", ..) => Ok(settings.qos_dscp.to_value()),
+                .to_value(),
+            subclass::Property("auto-multicast", ..) => settings.sync.to_value(),
+            subclass::Property("loop", ..) => settings.multicast_loop.to_value(),
+            subclass::Property("ttl", ..) => settings.ttl.to_value(),
+            subclass::Property("ttl-mc", ..) => settings.ttl_mc.to_value(),
+            subclass::Property("qos-dscp", ..) => settings.qos_dscp.to_value(),
             subclass::Property("clients", ..) => {
                 drop(settings);
 
@@ -1386,10 +1386,10 @@ impl ObjectImpl for UdpSink {
                     .map(ToString::to_string)
                     .collect();
 
-                Ok(clients.join(",").to_value())
+                clients.join(",").to_value()
             }
-            subclass::Property("context", ..) => Ok(settings.context.to_value()),
-            subclass::Property("context-wait", ..) => Ok(settings.context_wait.to_value()),
+            subclass::Property("context", ..) => settings.context.to_value(),
+            subclass::Property("context-wait", ..) => settings.context_wait.to_value(),
             _ => unimplemented!(),
         }
     }
diff --git a/generic/threadshare/src/udpsrc/imp.rs b/generic/threadshare/src/udpsrc/imp.rs
index 22fbfa288..b536e2361 100644
--- a/generic/threadshare/src/udpsrc/imp.rs
+++ b/generic/threadshare/src/udpsrc/imp.rs
@@ -893,30 +893,30 @@ impl ObjectImpl for UdpSrc {
         }
     }
 
-    fn get_property(&self, _obj: &Self::Type, id: usize) -> Result<glib::Value, ()> {
+    fn get_property(&self, _obj: &Self::Type, id: usize) -> glib::Value {
         let prop = &PROPERTIES[id];
 
         let settings = self.settings.lock().unwrap();
         match *prop {
-            subclass::Property("address", ..) => Ok(settings.address.to_value()),
-            subclass::Property("port", ..) => Ok((settings.port).to_value()),
-            subclass::Property("reuse", ..) => Ok(settings.reuse.to_value()),
-            subclass::Property("caps", ..) => Ok(settings.caps.to_value()),
-            subclass::Property("mtu", ..) => Ok(settings.mtu.to_value()),
-            subclass::Property("socket", ..) => Ok(settings
+            subclass::Property("address", ..) => settings.address.to_value(),
+            subclass::Property("port", ..) => settings.port.to_value(),
+            subclass::Property("reuse", ..) => settings.reuse.to_value(),
+            subclass::Property("caps", ..) => settings.caps.to_value(),
+            subclass::Property("mtu", ..) => settings.mtu.to_value(),
+            subclass::Property("socket", ..) => settings
                 .socket
                 .as_ref()
                 .map(GioSocketWrapper::as_socket)
-                .to_value()),
-            subclass::Property("used-socket", ..) => Ok(settings
+                .to_value(),
+            subclass::Property("used-socket", ..) => settings
                 .used_socket
                 .as_ref()
                 .map(GioSocketWrapper::as_socket)
-                .to_value()),
-            subclass::Property("context", ..) => Ok(settings.context.to_value()),
-            subclass::Property("context-wait", ..) => Ok(settings.context_wait.to_value()),
+                .to_value(),
+            subclass::Property("context", ..) => settings.context.to_value(),
+            subclass::Property("context-wait", ..) => settings.context_wait.to_value(),
             subclass::Property("retrieve-sender-address", ..) => {
-                Ok(settings.retrieve_sender_address.to_value())
+                settings.retrieve_sender_address.to_value()
             }
             _ => unimplemented!(),
         }