diff --git a/subprojects/gstreamer-sharp/ges/generated/gst-editing-services-api.xml b/subprojects/gstreamer-sharp/ges/generated/gst-editing-services-api.xml
index d08ca77077..39330b9d0e 100644
--- a/subprojects/gstreamer-sharp/ges/generated/gst-editing-services-api.xml
+++ b/subprojects/gstreamer-sharp/ges/generated/gst-editing-services-api.xml
@@ -4538,4 +4538,4 @@
       <constant value="1" ctype="gint" gtype="gint" name="VERSION_NANO" />
     </object>
   </namespace>
-</api>
+</api>
\ No newline at end of file
diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst.Audio/AudioRingBuffer.cs b/subprojects/gstreamer-sharp/sources/generated/Gst.Audio/AudioRingBuffer.cs
index 116201c6fb..7335c634fb 100644
--- a/subprojects/gstreamer-sharp/sources/generated/Gst.Audio/AudioRingBuffer.cs
+++ b/subprojects/gstreamer-sharp/sources/generated/Gst.Audio/AudioRingBuffer.cs
@@ -99,34 +99,6 @@ namespace Gst.Audio {
 			}
 		}
 
-		[DllImport("gstaudio-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
-		static extern ulong gst_audio_ring_buffer_get_segdone(IntPtr raw);
-
-		[DllImport("gstaudio-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
-		static extern void gst_audio_ring_buffer_set_segdone(IntPtr raw, ulong segdone);
-
-		public ulong Segdone {
-			get  {
-				ulong raw_ret = gst_audio_ring_buffer_get_segdone(Handle);
-				ulong ret = raw_ret;
-				return ret;
-			}
-			set  {
-				gst_audio_ring_buffer_set_segdone(Handle, value);
-			}
-		}
-
-		[DllImport("gstaudio-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
-		static extern ulong gst_audio_ring_buffer_get_segbase(IntPtr raw);
-
-		public ulong Segbase {
-			get  {
-				ulong raw_ret = gst_audio_ring_buffer_get_segbase(Handle);
-				ulong ret = raw_ret;
-				return ret;
-			}
-		}
-
 		public int Waiting {
 			get {
 				unsafe {
@@ -1076,6 +1048,34 @@ namespace Gst.Audio {
 			return ret;
 		}
 
+		[DllImport("gstaudio-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+		static extern ulong gst_audio_ring_buffer_get_segbase(IntPtr raw);
+
+		public ulong Segbase { 
+			get {
+				ulong raw_ret = gst_audio_ring_buffer_get_segbase(Handle);
+				ulong ret = raw_ret;
+				return ret;
+			}
+		}
+
+		[DllImport("gstaudio-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+		static extern ulong gst_audio_ring_buffer_get_segdone(IntPtr raw);
+
+		[DllImport("gstaudio-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+		static extern void gst_audio_ring_buffer_set_segdone(IntPtr raw, ulong segdone);
+
+		public ulong Segdone { 
+			get {
+				ulong raw_ret = gst_audio_ring_buffer_get_segdone(Handle);
+				ulong ret = raw_ret;
+				return ret;
+			}
+			set {
+				gst_audio_ring_buffer_set_segdone(Handle, value);
+			}
+		}
+
 		[DllImport("gstaudio-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
 		static extern bool gst_audio_ring_buffer_is_acquired(IntPtr raw);
 
@@ -1497,14 +1497,14 @@ namespace Gst.Audio {
 		public struct GstAudioRingBuffer_segdoneAlign
 		{
 			sbyte f1;
-			private ulong segdone;
+			private int segdone;
 		}
 
 		[StructLayout(LayoutKind.Sequential)]
 		public struct GstAudioRingBuffer_segbaseAlign
 		{
 			sbyte f1;
-			private ulong segbase;
+			private int segbase;
 		}
 
 		[StructLayout(LayoutKind.Sequential)]
diff --git a/subprojects/gstreamer-sharp/sources/generated/gstreamer-sharp-api.xml b/subprojects/gstreamer-sharp/sources/generated/gstreamer-sharp-api.xml
index 10254e2cc6..c5d5d8a1e8 100644
--- a/subprojects/gstreamer-sharp/sources/generated/gstreamer-sharp-api.xml
+++ b/subprojects/gstreamer-sharp/sources/generated/gstreamer-sharp-api.xml
@@ -16780,8 +16780,8 @@
       <field cname="samples_per_seg" access="public" writeable="false" readable="true" is_callback="false" name="SamplesPerSeg" type="gint" />
       <field cname="empty_seg" access="public" writeable="false" readable="true" is_callback="false" name="EmptySeg" type="guint8*" />
       <field cname="state" access="public" writeable="false" readable="true" is_callback="false" name="State" type="gint" />
-      <field cname="segdone" access="public" writeable="false" readable="true" is_callback="false" name="Segdone" type="gint" />
-      <field cname="segbase" access="public" writeable="false" readable="true" is_callback="false" name="Segbase" type="gint" />
+      <field cname="segdone" access="public" writeable="false" readable="true" is_callback="false" name="SegdoneField" type="gint" hidden="true" />
+      <field cname="segbase" access="public" writeable="false" readable="true" is_callback="false" name="SegbaseField" type="gint" hidden="true" />
       <field cname="waiting" access="public" writeable="false" readable="true" is_callback="false" name="Waiting" type="gint" />
       <field cname="callback" access="private" writeable="false" readable="false" is_callback="false" name="Callback" type="GstAudioRingBufferCallback" />
       <field cname="cb_data" access="private" writeable="false" readable="false" is_callback="false" name="CbData" type="gpointer" />
diff --git a/subprojects/gstreamer-sharp/sources/gstreamer-sharp.metadata b/subprojects/gstreamer-sharp/sources/gstreamer-sharp.metadata
index 67a71849cb..9bd1f21f1a 100644
--- a/subprojects/gstreamer-sharp/sources/gstreamer-sharp.metadata
+++ b/subprojects/gstreamer-sharp/sources/gstreamer-sharp.metadata
@@ -341,6 +341,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 	<attr path="//callback[@cname='GstAudioFormatUnpack']/parameters/parameter[@name='length']" name="name">n_length</attr>
 	<attr path="/api/namespace/object[@cname='GstObject']/field[@cname='flags']" name="writeable">true</attr>
 	<attr path="/api/namespace/object[@cname='GstAudioRingBuffer']/field[@cname='empty_seg']" name="type">guint8*</attr>
+
+	<!-- GstAudioRingBuffer has segdone and segbase as struct fields and a get/set API with the same name but different types.
+	     The fields have been deprecated and they need to be hidden and we also need to rename them so that the generator does not mix types. -->
+	<attr path="//object[@cname='GstAudioRingBuffer']/field[@cname='segdone']" name="name">SegdoneField</attr>
+	<attr path="//object[@cname='GstAudioRingBuffer']/field[@cname='segdone']" name="hidden">true</attr>
+	<attr path="//object[@cname='GstAudioRingBuffer']/field[@cname='segbase']" name="name">SegbaseField</attr>
+	<attr path="//object[@cname='GstAudioRingBuffer']/field[@cname='segbase']" name="hidden">true</attr>
+
 	<attr path="/api/namespace/struct[@cname='GstMIKEYPayloadKeyData']/field[@cname='key_data']" name="type">guint8*</attr>
 	<attr path="/api/namespace/struct[@cname='GstMIKEYPayloadKeyData']/field[@cname='salt_data']" name="type">guint8*</attr>
 	<attr path="/api/namespace/struct[@cname='GstMIKEYPayloadKeyData']/field[@cname='kv_data']" name="type">guint8*</attr>