diff options
| author | Maarten Bosmans <mkbosmans@gmail.com> | 2009-06-19 14:39:13 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2009-06-21 10:34:11 +0200 |
| commit | 6e81430276bb5ebcb7ccd15ebc80e087f3145ad0 (patch) | |
| tree | 2849afc8f99585110d79f64fac36a0d5b87c242a | |
| parent | c1280b589665e19305ca932a7e89a7912f349017 (diff) | |
Avoid some C# compiler warnings about name collisions in subclass members
There are three types of solution used: adding the new keyword to the member
in the subclass, renaming the subclass member to avoid name collision and
removing the subclass member if the functionality is the same.
| -rw-r--r-- | gstreamer-sharp/Event.custom | 2 | ||||
| -rw-r--r-- | gstreamer-sharp/Query.custom | 2 | ||||
| -rw-r--r-- | gstreamer-sharp/baseplugins/playbin2.metadata | 1 | ||||
| -rw-r--r-- | gstreamer-sharp/coreplugins/fakesrc.metadata | 1 |
4 files changed, 4 insertions, 2 deletions
diff --git a/gstreamer-sharp/Event.custom b/gstreamer-sharp/Event.custom index c501b9f..4cd1363 100644 --- a/gstreamer-sharp/Event.custom +++ b/gstreamer-sharp/Event.custom @@ -99,7 +99,7 @@ public Gst.Structure Structure { cached_structure = null; } -public string TypeName { +public new string TypeName { get { return GetTypeName (Type); } diff --git a/gstreamer-sharp/Query.custom b/gstreamer-sharp/Query.custom index 5d0a631..46f4f05 100644 --- a/gstreamer-sharp/Query.custom +++ b/gstreamer-sharp/Query.custom @@ -25,7 +25,7 @@ public Gst.Structure Structure { cached_structure = null; } -public string TypeName { +public new string TypeName { get { return GetTypeName (Type); } diff --git a/gstreamer-sharp/baseplugins/playbin2.metadata b/gstreamer-sharp/baseplugins/playbin2.metadata index c143be2..54b5339 100644 --- a/gstreamer-sharp/baseplugins/playbin2.metadata +++ b/gstreamer-sharp/baseplugins/playbin2.metadata @@ -7,4 +7,5 @@ <attr path="/element/element-actions/signal/name[child::text()='get-video-pad']/../params/type[1]" name="name">index</attr> <attr path="/element/element-actions/signal/name[child::text()='get-audio-pad']/../params/type[1]" name="name">index</attr> <attr path="/element/element-actions/signal/name[child::text()='get-text-pad']/../params/type[1]" name="name">index</attr> + <add-node path="/element/element-properties/element-property/name[child::text()='flags']/.."><managed_name>PlayFlags</managed_name></add-node> </metadata> diff --git a/gstreamer-sharp/coreplugins/fakesrc.metadata b/gstreamer-sharp/coreplugins/fakesrc.metadata index 0c88923..144e50d 100644 --- a/gstreamer-sharp/coreplugins/fakesrc.metadata +++ b/gstreamer-sharp/coreplugins/fakesrc.metadata @@ -2,5 +2,6 @@ <metadata> <attr path="/element/element-signals/signal/name[child::text()='handoff']/../params/type[1]" name="name">Buffer</attr> <attr path="/element/element-signals/signal/name[child::text()='handoff']/../params/type[2]" name="name">Pad</attr> + <add-node path="/element/element-properties/element-property/name[child::text()='data']/.."><managed_name>Datatype</managed_name></add-node> </metadata> |