Fix indention of all files

This commit is contained in:
Sebastian Dröge 2009-04-07 11:27:20 +02:00
parent 2a2822bb80
commit 85e2db4e5f
25 changed files with 975 additions and 1009 deletions

View file

@ -12,35 +12,28 @@
using System;
using System.Runtime.InteropServices;
namespace Gst
{
public static class Application
{
public static void Init()
{
namespace Gst {
public static class Application {
public static void Init() {
IntPtr argv = new IntPtr (0);
int argc = 0;
gst_init (ref argc, ref argv);
}
public static void Init(string progname, ref string [] args)
{
public static void Init (string progname, ref string [] args) {
FullInit (progname, ref args, false);
}
public static void InitCheck(string progname, ref string [] args)
{
public static void InitCheck (string progname, ref string [] args) {
FullInit (progname, ref args, true);
}
public static void Deinit()
{
public static void Deinit() {
gst_deinit();
}
private static void FullInit(string progname, ref string [] args, bool check)
{
private static void FullInit (string progname, ref string [] args, bool check) {
string [] progargs = new string[args.Length + 1];
progargs[0] = progname;

View file

@ -36,8 +36,7 @@
return ret;
}
public bool AddMany(params Element[] elements)
{
public bool AddMany (params Element[] elements) {
if (elements == null) {
return false;
}
@ -51,8 +50,7 @@
return true;
}
public bool RemoveMany(params Element[] elements)
{
public bool RemoveMany (params Element[] elements) {
if (elements == null) {
return false;
}

View file

@ -11,13 +11,10 @@
using System;
using GLib;
namespace Gst
{
public static class BindingHelper
{
namespace Gst {
public static class BindingHelper {
public static Delegate AddProxySignalDelegate (Element element, string signal,
DynamicSignalHandler baseHandler, Delegate existingHandler, Delegate addHandler)
{
DynamicSignalHandler baseHandler, Delegate existingHandler, Delegate addHandler) {
if (existingHandler == null) {
element.Connect (signal, baseHandler);
}
@ -26,8 +23,7 @@ namespace Gst
}
public static Delegate RemoveProxySignalDelegate (Element element, string signal,
DynamicSignalHandler baseHandler, Delegate existingHandler, Delegate removeHandler)
{
DynamicSignalHandler baseHandler, Delegate existingHandler, Delegate removeHandler) {
Delegate temp_delegate = Delegate.Remove (existingHandler, removeHandler);
if (temp_delegate == null) {
element.Disconnect (signal, baseHandler);
@ -37,8 +33,7 @@ namespace Gst
}
public static void InvokeProxySignalDelegate (Delegate raiseDelegate, Type type,
object o, GLib.SignalArgs args)
{
object o, GLib.SignalArgs args) {
if (!type.IsSubclassOf (typeof (GLib.SignalArgs))) {
throw new ArgumentException ("Args type must derive SignalArgs");
}

View file

@ -1,24 +1,21 @@
[DllImport ("gstreamer-0.10") ]
static extern IntPtr gst_mini_object_ref (IntPtr buf);
public void Ref()
{
public void Ref() {
IntPtr tmp = gst_mini_object_ref (this.Handle);
}
[DllImport ("gstreamer-0.10") ]
static extern void gst_mini_object_unref (IntPtr buf);
public void Unref()
{
public void Unref() {
gst_mini_object_unref (this.Handle);
}
[DllImport ("gstreamersharpglue-0.10") ]
static extern uint gstsharp_gst_buffer_refcount (IntPtr buf);
public uint Refcount
{
public uint Refcount {
get {
return gstsharp_gst_buffer_refcount (this.Handle);
}

View file

@ -1,5 +1,4 @@
public uint AddWatch(BusFunc func)
{
public uint AddWatch (BusFunc func) {
return AddWatchFull (0, func);
}

View file

@ -27,8 +27,7 @@
[DllImport ("gstreamersharpglue-0.10") ]
private extern static bool gstsharp_gst_clock_time_is_valid (ulong time);
public static bool TimeIsValid(ulong time)
{
public static bool TimeIsValid (ulong time) {
return gstsharp_gst_clock_time_is_valid (time);
}

View file

@ -7,10 +7,8 @@
// (C) 2002 Alp Toker
//
namespace Gst
{
public sealed class CommonTags
{
namespace Gst {
public sealed class CommonTags {
public const string Title = "title";
public const string Artist = "artist";
public const string Album = "album";

View file

@ -2,8 +2,7 @@
[DllImport ("gstreamer-0.10.dll") ]
static extern void gst_debug_set_default_threshold (Gst.DebugLevel debug_level);
public static void SetDefaultThreshold(Gst.DebugLevel debug_level)
{
public static void SetDefaultThreshold (Gst.DebugLevel debug_level) {
gst_debug_set_default_threshold (debug_level);
}

View file

@ -52,18 +52,30 @@ namespace Gst {
Delegate registeredHandler;
public IntPtr Closure {
get { return closure; }
set { closure = value; }
get {
return closure;
}
set {
closure = value;
}
}
public uint HandlerId {
get { return handlerId; }
set { handlerId = value; }
get {
return handlerId;
}
set {
handlerId = value;
}
}
public Delegate RegisteredHandler {
get { return registeredHandler; }
set { registeredHandler = value; }
get {
return registeredHandler;
}
set {
registeredHandler = value;
}
}
public SignalInfo (uint handlerId, IntPtr closure, Delegate registeredHandler) {
@ -84,8 +96,7 @@ namespace Gst {
static int g_closure_sizeof = gstsharp_g_closure_sizeof ();
public static void Connect (GLib.Object o, string name,
bool after, DynamicSignalHandler handler)
{
bool after, DynamicSignalHandler handler) {
Delegate newHandler;
ObjectSignalKey k = new ObjectSignalKey (o, name);
@ -94,8 +105,7 @@ namespace Gst {
SignalInfo si = (SignalInfo) SignalHandlers[k];
newHandler = Delegate.Combine (si.RegisteredHandler, handler);
si.RegisteredHandler = newHandler;
}
else {
} else {
IntPtr closure = g_closure_new_simple (g_closure_sizeof, IntPtr.Zero);
g_closure_set_meta_marshal (closure, (IntPtr) GCHandle.Alloc (k), marshalHandler);
uint signalId = g_signal_connect_closure (o.Handle, name, closure, after);
@ -108,8 +118,7 @@ namespace Gst {
public static void Disconnect (GLib.Object o, string name, DynamicSignalHandler handler) {
ObjectSignalKey k = new ObjectSignalKey (o, name);
if(SignalHandlers[k] != null)
{
if (SignalHandlers[k] != null) {
SignalInfo si = (SignalInfo) SignalHandlers[k];
Delegate newHandler = Delegate.Remove (si.RegisteredHandler, handler);
if (newHandler == null || handler == null) {
@ -125,8 +134,7 @@ namespace Gst {
static extern IntPtr g_value_peek_pointer (IntPtr ptr);
static void OnMarshal (IntPtr closure, ref GLib.Value retval, uint argc, IntPtr argsPtr,
IntPtr ihint, IntPtr data)
{
IntPtr ihint, IntPtr data) {
object [] args = new object[argc - 1];
object o = ( (GLib.Value) Marshal.PtrToStructure (argsPtr, typeof (GLib.Value))).Val;
@ -135,8 +143,7 @@ namespace Gst {
Type detectedType = GLib.GType.LookupType (Marshal.ReadIntPtr (struct_ptr));
if (detectedType.IsSubclassOf (typeof (Opaque))) {
args[i - 1] = (Opaque) Opaque.GetOpaque (g_value_peek_pointer (struct_ptr), detectedType, false);
}
else {
} else {
GLib.Value argument = (GLib.Value) Marshal.PtrToStructure (struct_ptr, typeof (GLib.Value));
args[i - 1] = argument.Val;
}
@ -204,8 +211,7 @@ namespace Gst {
static Hashtable SignalEmitInfo = new Hashtable ();
public static object Emit (GLib.Object o, string name, params object[] parameters)
{
public static object Emit (GLib.Object o, string name, params object[] parameters) {
SignalQuery query;
IntPtr type = gstsharp_g_type_from_instance (o.Handle);
GType gtype = new GType (type);

View file

@ -1,78 +1,68 @@
public object this[string property] {
get { return GetProperty(property).Val; }
set { SetProperty(property, value); }
get {
return GetProperty (property).Val;
}
set {
SetProperty (property, value);
}
}
public new GLib.Value GetProperty(string propertyName)
{
public new GLib.Value GetProperty (string propertyName) {
return base.GetProperty (propertyName);
}
public new void SetProperty(string propertyName, GLib.Value value)
{
public new void SetProperty (string propertyName, GLib.Value value) {
base.SetProperty (propertyName, value);
}
public void SetProperty(string propertyName, object value)
{
public void SetProperty (string propertyName, object value) {
base.SetProperty (propertyName, new GLib.Value (value));
}
public void SetProperty(string propertyName, string value)
{
public void SetProperty (string propertyName, string value) {
base.SetProperty (propertyName, new GLib.Value (value));
}
public void SetProperty(string propertyName, int value)
{
public void SetProperty (string propertyName, int value) {
base.SetProperty (propertyName, new GLib.Value (value));
}
public void SetProperty(string propertyName, double value)
{
public void SetProperty (string propertyName, double value) {
base.SetProperty (propertyName, new GLib.Value (value));
}
public void SetProperty(string propertyName, bool value)
{
public void SetProperty (string propertyName, bool value) {
base.SetProperty (propertyName, new GLib.Value (value));
}
public bool QueryPosition(Gst.Format format, out long current)
{
public bool QueryPosition (Gst.Format format, out long current) {
return gst_element_query_position (Handle, ref format, out current);
}
public bool QueryDuration(Gst.Format format, out long duration)
{
public bool QueryDuration (Gst.Format format, out long duration) {
return gst_element_query_duration (Handle, ref format, out duration);
}
public void Connect(string signal, DynamicSignalHandler handler)
{
public void Connect (string signal, DynamicSignalHandler handler) {
DynamicSignal.Connect (this, signal, handler);
}
public void Disconnect(string signal, DynamicSignalHandler handler)
{
public void Disconnect (string signal, DynamicSignalHandler handler) {
DynamicSignal.Disconnect (this, signal, handler);
}
public bool AddPad(Pad p)
{
public bool AddPad (Pad p) {
bool ret = gst_element_add_pad (this.Handle, p == null ? IntPtr.Zero : p.Handle);
if (ret)
Gst.Object.Ref (p.Handle);
return ret;
}
public static bool LinkMany(params Element [] elements)
{
for(int i=0; i < elements.Length - 1; i++)
{
public static bool LinkMany (params Element [] elements) {
for (int i = 0; i < elements.Length - 1; i++) {
if (!elements[i].Link (elements[i+1]))
return false;
}
@ -80,10 +70,8 @@
return true;
}
public static void UnlinkMany(params Element [] elements)
{
for(int i=0; i < elements.Length - 1; i++)
{
public static void UnlinkMany (params Element [] elements) {
for (int i = 0; i < elements.Length - 1; i++) {
elements[i].Unlink (elements[i+1]);
}
}

View file

@ -8,10 +8,8 @@ using System;
using System.Runtime.InteropServices;
namespace Gst {
internal static class GError
{
public static string GetMessage (IntPtr error)
{
internal static class GError {
public static string GetMessage (IntPtr error) {
if (error == IntPtr.Zero)
return String.Empty;
@ -22,8 +20,7 @@ namespace Gst {
return GLib.Marshaller.PtrToStringGFree (message);
}
public static void Free (IntPtr error)
{
public static void Free (IntPtr error) {
if (error != IntPtr.Zero)
g_error_free (error);
}

View file

@ -2,8 +2,7 @@
[DllImport ("gstreamersharpglue-0.10") ]
private extern static IntPtr gstsharp_message_parse_error (IntPtr raw);
public void ParseError(out string error)
{
public void ParseError (out string error) {
IntPtr err = gstsharp_message_parse_error (Handle);
error = GLib.Marshaller.PtrToStringGFree (err);
}
@ -11,8 +10,7 @@
[DllImport ("gstreamersharpglue-0.10") ]
private extern static IntPtr gstsharp_message_error_new();
public Message(Gst.Object src, string debug)
{
public Message (Gst.Object src, string debug) {
IntPtr error = gstsharp_message_error_new();
Raw = gst_message_new_error (src == null ? IntPtr.Zero : src.Handle, error, GLib.Marshaller.StringToPtrGStrdup (debug));
}

View file

@ -1,6 +1,8 @@
public int Refcount {
get { return this.RefCount; }
get {
return this.RefCount;
}
}

View file

@ -2,16 +2,14 @@
[DllImport ("gstreamer-0.10.dll") ]
private static extern bool gst_pad_query_position (IntPtr raw, ref Format format, out long cur);
public bool QueryPosition(Gst.Format format, out long current)
{
public bool QueryPosition (Gst.Format format, out long current) {
return gst_pad_query_position (Handle, ref format, out current);
}
[DllImport ("gstreamer-0.10.dll") ]
private static extern bool gst_pad_query_duration (IntPtr raw, ref Format format, out long duration);
public bool QueryDuration(Gst.Format format, out long duration)
{
public bool QueryDuration (Gst.Format format, out long duration) {
return gst_pad_query_duration (Handle, ref format, out duration);
}
@ -23,15 +21,13 @@
internal BufferProbeNativeDelegate NativeFunc;
BufferProbeDelegate managedFunc;
public BufferProbeWrapper(BufferProbeDelegate func)
{
public BufferProbeWrapper (BufferProbeDelegate func) {
managedFunc = func;
if (func != null)
NativeFunc = new BufferProbeNativeDelegate (BufferProbeMarshaller);
}
public bool BufferProbeMarshaller(IntPtr raw_pad, IntPtr buf, IntPtr data)
{
public bool BufferProbeMarshaller (IntPtr raw_pad, IntPtr buf, IntPtr data) {
Pad pad = GLib.Object.GetObject (raw_pad) as Pad;
Gst.Buffer buffer = GLib.Opaque.GetOpaque (buf, typeof (Gst.Buffer), false) as Gst.Buffer;
return (bool) (managedFunc (pad, buffer));
@ -41,14 +37,11 @@
[DllImport ("gstreamer-0.10.dll") ]
private static extern ulong gst_pad_add_buffer_probe (IntPtr pad, BufferProbeNativeDelegate func, IntPtr data);
public ulong AddBufferProbe(BufferProbeDelegate func)
{
public ulong AddBufferProbe (BufferProbeDelegate func) {
BufferProbeWrapper func_wrapper;
if (PersistentData["AddBufferProbe"] != null) {
func_wrapper = PersistentData["AddBufferProbe"] as BufferProbeWrapper;
}
else
{
} else {
func_wrapper = new BufferProbeWrapper (func);
PersistentData["AddBufferProbe"] = func_wrapper;
}
@ -59,8 +52,7 @@
[DllImport ("gstreamer-0.10.dll") ]
private static extern void gst_pad_remove_buffer_probe (IntPtr pad, uint handler_id);
public void RemoveBufferProbe(uint handler_id)
{
public void RemoveBufferProbe (uint handler_id) {
gst_pad_remove_buffer_probe (this.Handle, handler_id);
PersistentData["AddBufferProbe"] = null;
}
@ -72,15 +64,13 @@
internal DataProbeNativeDelegate NativeFunc;
DataProbeDelegate ManagedFunc;
public DataProbeWrapper(DataProbeDelegate func)
{
public DataProbeWrapper (DataProbeDelegate func) {
ManagedFunc = func;
if (func != null)
NativeFunc = new DataProbeNativeDelegate (DataProbeMarshaller);
}
public bool DataProbeMarshaller (IntPtr raw_pad, IntPtr miniobj, IntPtr data)
{
public bool DataProbeMarshaller (IntPtr raw_pad, IntPtr miniobj, IntPtr data) {
Pad pad = GLib.Object.GetObject (raw_pad) as Pad;
GLib.Opaque opaque = GLib.Opaque.GetOpaque (miniobj, typeof (GLib.Opaque), true);
return ManagedFunc (pad, opaque);
@ -90,8 +80,7 @@
[DllImport ("gstreamer-0.10.dll") ]
static extern uint gst_pad_add_data_probe (IntPtr pad, DataProbeNativeDelegate func, IntPtr data);
public uint AddDataProbe(DataProbeDelegate func)
{
public uint AddDataProbe (DataProbeDelegate func) {
DataProbeWrapper func_wrapper;
if (PersistentData["AddDataProbe"] != null) {
func_wrapper = PersistentData["AddDataProbe"] as DataProbeWrapper;
@ -106,8 +95,7 @@
[DllImport ("gstreamer-0.10.dll") ]
static extern void gst_pad_remove_data_probe (IntPtr pad, uint handler_id);
public void RemoveDataProbe(uint handler_id)
{
public void RemoveDataProbe (uint handler_id) {
gst_pad_remove_data_probe (this.Handle, handler_id);
PersistentData["AddDataProbe"] = null;
}

View file

@ -10,18 +10,15 @@
using System;
using System.Runtime.InteropServices;
namespace Gst
{
public static class Version
{
namespace Gst {
public static class Version {
private static uint major;
private static uint minor;
private static uint micro;
private static uint nano;
private static string version_string;
static Version()
{
static Version() {
gst_version (out major, out minor, out micro, out nano);
}
@ -37,19 +34,27 @@ namespace Gst
}
public static uint Major {
get { return major; }
get {
return major;
}
}
public static uint Minor {
get { return minor; }
get {
return minor;
}
}
public static uint Micro {
get { return micro; }
get {
return micro;
}
}
public static uint Nano {
get { return nano; }
get {
return nano;
}
}
[DllImport ("gstreamer-0.10") ]

View file

@ -2,9 +2,10 @@
#include <gst/gstpipeline.h>
#include <gst/gstsegment.h>
guint
gstsharp_gst_bin_get_children_offset (void);
guint gstsharp_gst_bin_get_children_offset (void);
guint gstsharp_gst_bin_get_children_offset (void) {
guint
gstsharp_gst_bin_get_children_offset (void)
{
return (guint) G_STRUCT_OFFSET (GstBin, children);
}

View file

@ -1,33 +1,38 @@
#include <glib.h>
#include <gst/gstclock.h>
guint64 gstsharp_gst_clock_get_gst_second()
guint64
gstsharp_gst_clock_get_gst_second ()
{
return GST_SECOND;
}
guint64 gstsharp_gst_clock_get_gst_msecond()
guint64
gstsharp_gst_clock_get_gst_msecond ()
{
return GST_MSECOND;
}
guint64 gstsharp_gst_clock_get_gst_usecond()
guint64
gstsharp_gst_clock_get_gst_usecond ()
{
return GST_USECOND;
}
guint64 gstsharp_gst_clock_get_gst_nsecond()
guint64
gstsharp_gst_clock_get_gst_nsecond ()
{
return GST_NSECOND;
}
guint64 gstsharp_gst_clock_get_time_none()
guint64
gstsharp_gst_clock_get_time_none ()
{
return GST_CLOCK_TIME_NONE;
}
gboolean gstsharp_gst_clock_time_is_valid(GstClockTime time)
gboolean
gstsharp_gst_clock_time_is_valid (GstClockTime time)
{
return GST_CLOCK_TIME_IS_VALID (time);
}

View file

@ -8,4 +8,3 @@ gstsharp_g_error_get_message (GError * error)
return NULL;
}

View file

@ -28,8 +28,7 @@ namespace GtkSharp.Parsing {
public class Fixup {
public static int Main (string[] args)
{
public static int Main (string[] args) {
if (args.Length < 2) {
Console.WriteLine ("Usage: gst-gapi-fixup --metadata=<filename> --api=<filename> --symbols=<filename>");
return 0;