[longomatch] Add more code formatting
- From: Andoni Morales Alastruey <amorales src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [longomatch] Add more code formatting
- Date: Tue, 31 Mar 2015 17:30:12 +0000 (UTC)
commit dbe5911db3420c07746a766d363fab823f944c8d
Author: Andoni Morales Alastruey <ylatuya gmail com>
Date: Fri Mar 20 20:18:17 2015 +0100
Add more code formatting
LongoMatch.Drawing.Cairo/CairoBackend.cs | 44 ++--
LongoMatch.Drawing.Cairo/CairoContext.cs | 2 +-
LongoMatch.Drawing.Cairo/Surface.cs | 6 +-
LongoMatch.Drawing.Cairo/WidgetWrapper.cs | 8 +-
LongoMatch.Drawing/Canvas.cs | 22 +-
LongoMatch.Drawing/CanvasObjects/CanvasObject.cs | 27 +-
LongoMatch.Drawing/PlayslistCellRenderer.cs | 30 +-
LongoMatch.Drawing/Utils.cs | 4 +-
LongoMatch.Drawing/Widgets/Blackboard.cs | 12 +-
LongoMatch.Drawing/Widgets/PositionTagger.cs | 12 +-
LongoMatch.GUI.Helpers/ExternalWindow.cs | 7 +-
LongoMatch.GUI.Helpers/FileChooserHelper.cs | 50 ++--
LongoMatch.GUI.Helpers/GtkGlue.cs | 11 +-
LongoMatch.GUI.Helpers/MessagesHelpers.cs | 74 ++--
LongoMatch.GUI.Helpers/Misc.cs | 10 +-
LongoMatch.GUI.Multimedia/Gui/CapturerBin.cs | 38 +-
LongoMatch.GUI.Multimedia/Gui/PlayerBin.cs | 63 ++--
.../Gui/Utils/FramesCapturer.cs | 37 +-
LongoMatch.GUI.Multimedia/Gui/Utils/Remuxer.cs | 121 ++++---
LongoMatch.GUI.Multimedia/Gui/VideoWindow.cs | 5 +-
LongoMatch.GUI.Multimedia/Gui/VolumeWindow.cs | 2 +-
LongoMatch.GUI.Multimedia/MultimediaToolkit.cs | 9 +-
LongoMatch.GUI.Multimedia/gtk-gui/objects.xml | 13 +-
LongoMatch.GUI/gtk-gui/objects.xml | 13 +-
LongoMatch.Multimedia/Capturer/FakeCapturer.cs | 29 +-
.../Capturer/GstCameraCapturer.cs | 374 +++++++++++---------
.../Converter/GstVideoConverter.cs | 263 +++++++-------
LongoMatch.Multimedia/Player/GstPlayer.cs | 82 +++---
LongoMatch.Multimedia/Remuxer/GstRemuxer.cs | 27 +-
LongoMatch.Multimedia/Utils/Devices.cs | 28 +-
LongoMatch.Multimedia/Utils/GStreamer.cs | 12 +-
LongoMatch.Multimedia/Utils/GstDiscoverer.cs | 12 +-
LongoMatch.Multimedia/Utils/MultimediaFactory.cs | 2 +-
LongoMatch.Multimedia/Utils/Seeker.cs | 4 +-
LongoMatch.Multimedia/Utils/TimeString.cs | 6 +-
LongoMatch.Multimedia/Utils/WindowHandle.cs | 2 +-
.../GStreamerRestricted.cs | 6 +-
LongoMatch.Services/Services/HotKeysManager.cs | 6 +-
LongoMatch.Services/Services/PlaylistManager.cs | 24 +-
39 files changed, 798 insertions(+), 699 deletions(-)
---
diff --git a/LongoMatch.Drawing.Cairo/CairoBackend.cs b/LongoMatch.Drawing.Cairo/CairoBackend.cs
index 83b7e49..b54f227 100644
--- a/LongoMatch.Drawing.Cairo/CairoBackend.cs
+++ b/LongoMatch.Drawing.Cairo/CairoBackend.cs
@@ -57,7 +57,7 @@ namespace LongoMatch.Drawing.Cairo
LineStyle = LineStyle.Normal;
FontAlignment = FontAlignment.Center;
if (layout == null) {
- layout = new Layout (Gdk.PangoHelper.ContextGet());
+ layout = new Layout (Gdk.PangoHelper.ContextGet ());
}
ClearOperation = false;
@@ -152,7 +152,7 @@ namespace LongoMatch.Drawing.Cairo
return CreateSurface (img.Width, img.Height, img, warnOnDispose);
}
- public ISurface CreateSurface (int width, int height, Image image=null, bool warnOnDispose =
true)
+ public ISurface CreateSurface (int width, int height, Image image = null, bool warnOnDispose
= true)
{
return new Surface (width, height, image, warnOnDispose);
}
@@ -264,7 +264,7 @@ namespace LongoMatch.Drawing.Cairo
public void DrawArea (params Point[] vertices)
{
- for (int i=0; i < vertices.Length - 1; i++) {
+ for (int i = 0; i < vertices.Length - 1; i++) {
double x1, y1, x2, y2;
x1 = vertices [i].X;
@@ -282,9 +282,9 @@ namespace LongoMatch.Drawing.Cairo
public void DrawRectangle (Point start, double width, double height)
{
CContext.Rectangle (new global::Cairo.Rectangle (start.X + LineWidth / 2,
- start.Y + LineWidth / 2,
- width - LineWidth,
- height - LineWidth));
+ start.Y + LineWidth / 2,
+ width - LineWidth,
+ height - LineWidth));
StrokeAndFill (false);
}
@@ -296,8 +296,8 @@ namespace LongoMatch.Drawing.Cairo
public static global::Cairo.Color RGBToCairoColor (Color c)
{
return new global::Cairo.Color (ByteToDouble (c.R),
- ByteToDouble (c.G),
- ByteToDouble (c.B));
+ ByteToDouble (c.G),
+ ByteToDouble (c.B));
}
public void DrawRoundedRectangle (Point start, double width, double height, double radius)
@@ -343,7 +343,7 @@ namespace LongoMatch.Drawing.Cairo
}
public void DrawText (Point point, double width, double height, string text,
- bool escape=false, bool ellipsize=false)
+ bool escape = false, bool ellipsize = false)
{
Layout layout = null;
Pango.Rectangle inkRect, logRect;
@@ -388,7 +388,7 @@ namespace LongoMatch.Drawing.Cairo
CContext.Paint ();
}
- public void DrawImage (Point start, double width, double height, Image image, bool scale,
bool masked=false)
+ public void DrawImage (Point start, double width, double height, Image image, bool scale,
bool masked = false)
{
double scaleX, scaleY;
Point offset;
@@ -477,7 +477,7 @@ namespace LongoMatch.Drawing.Cairo
canvas.Draw (c, new Area (new Point (0, 0), width, height));
}
img = new Image (Gdk.Pixbuf.FromDrawable (pm, Colormap.System, 0, 0, 0, 0,
- (int)width, (int)height));
+ (int)width, (int)height));
disableScalling = false;
Context = null;
return img;
@@ -487,7 +487,7 @@ namespace LongoMatch.Drawing.Cairo
{
ImageSurface pngSurface = new ImageSurface (Format.ARGB32, (int)width, (int)height);
disableScalling = true;
- using (CairoContext c = new CairoContext (new global::Cairo.Context(pngSurface))) {
+ using (CairoContext c = new CairoContext (new global::Cairo.Context (pngSurface))) {
canvas.Draw (c, new Area (new Point (0, 0), width, height));
}
pngSurface.WriteToPng (filename);
@@ -508,7 +508,7 @@ namespace LongoMatch.Drawing.Cairo
CContext.SetDash (new double[] { }, 0);
break;
default:
- CContext.SetDash (new double[] { 10 * LineWidth / 2 , 10 * LineWidth / 2 },
0);
+ CContext.SetDash (new double[] { 10 * LineWidth / 2, 10 * LineWidth / 2 }, 0);
break;
}
}
@@ -539,21 +539,23 @@ namespace LongoMatch.Drawing.Cairo
{
if (color != null) {
CContext.SetSourceRGBA ((double)color.R / byte.MaxValue,
- (double)color.G / byte.MaxValue,
- (double)color.B / byte.MaxValue,
- (double)color.A / byte.MaxValue);
+ (double)color.G / byte.MaxValue,
+ (double)color.B / byte.MaxValue,
+ (double)color.A / byte.MaxValue);
} else {
CContext.SetSourceRGBA (0, 0, 0, 0);
}
}
- public void Invoke (EventHandler handler) {
+ public void Invoke (EventHandler handler)
+ {
Gtk.Application.Invoke (handler);
}
-
- public void MeasureText(string text, out int width, out int height,
- string fontFamily, int fontSize, FontWeight fontWeight) {
- FontDescription desc = new FontDescription();
+
+ public void MeasureText (string text, out int width, out int height,
+ string fontFamily, int fontSize, FontWeight fontWeight)
+ {
+ FontDescription desc = new FontDescription ();
desc.Family = fontFamily;
desc.Size = Pango.Units.FromPixels (fontSize);
desc.Weight = WeightToPangoWeight (fontWeight);
diff --git a/LongoMatch.Drawing.Cairo/CairoContext.cs b/LongoMatch.Drawing.Cairo/CairoContext.cs
index 5cfcea1..b03c621 100644
--- a/LongoMatch.Drawing.Cairo/CairoContext.cs
+++ b/LongoMatch.Drawing.Cairo/CairoContext.cs
@@ -44,7 +44,7 @@ namespace LongoMatch.Drawing.Cairo
get;
protected set;
}
-
+
public Layout PangoLayout {
get;
protected set;
diff --git a/LongoMatch.Drawing.Cairo/Surface.cs b/LongoMatch.Drawing.Cairo/Surface.cs
index 47bd926..4033d1b 100644
--- a/LongoMatch.Drawing.Cairo/Surface.cs
+++ b/LongoMatch.Drawing.Cairo/Surface.cs
@@ -27,12 +27,12 @@ namespace LongoMatch.Drawing.Cairo
ImageSurface surface;
bool disposed, warnOnDispose;
- public Surface (int width, int height, Image image, bool warnOnDispose=true)
+ public Surface (int width, int height, Image image, bool warnOnDispose = true)
{
this.warnOnDispose = warnOnDispose;
surface = new ImageSurface (Format.ARGB32, width, height);
if (image != null) {
- using (Context context = new Context(surface)) {
+ using (Context context = new Context (surface)) {
Gdk.CairoHelper.SetSourcePixbuf (context, image.Value, 0, 0);
context.Paint ();
}
@@ -41,7 +41,7 @@ namespace LongoMatch.Drawing.Cairo
~Surface ()
{
- if (! disposed && warnOnDispose) {
+ if (!disposed && warnOnDispose) {
Log.Error (String.Format ("Surface {0} was not disposed correctly", this));
Dispose (true);
}
diff --git a/LongoMatch.Drawing.Cairo/WidgetWrapper.cs b/LongoMatch.Drawing.Cairo/WidgetWrapper.cs
index f76ae82..82fc692 100644
--- a/LongoMatch.Drawing.Cairo/WidgetWrapper.cs
+++ b/LongoMatch.Drawing.Cairo/WidgetWrapper.cs
@@ -112,8 +112,8 @@ namespace LongoMatch.Drawing.Cairo
} else {
widget.GdkWindow.InvalidateRect (
new Gdk.Rectangle ((int)area.Start.X - 1, (int)area.Start.Y - 1,
- (int)Math.Ceiling (area.Width) + 2,
- (int)Math.Ceiling (area.Height) + 2),
+ (int)Math.Ceiling (area.Width) + 2,
+ (int)Math.Ceiling (area.Height) + 2),
true);
}
widget.GdkWindow.ProcessUpdates (true);
@@ -200,7 +200,7 @@ namespace LongoMatch.Drawing.Cairo
widget.GdkWindow.Cursor = null;
} else {
Cursor c = new Cursor (widget.Display,
- Gdk.Pixbuf.LoadFromResource (cursor), 0, 0);
+ Gdk.Pixbuf.LoadFromResource (cursor), 0, 0);
widget.GdkWindow.Cursor = c;
}
}
@@ -337,7 +337,7 @@ namespace LongoMatch.Drawing.Cairo
bt = ParseButtonType (args.Event.Button);
bm = ParseButtonModifier (args.Event.State);
ButtonPressEvent (new Point (args.Event.X, args.Event.Y),
- args.Event.Time, bt, bm);
+ args.Event.Time, bt, bm);
}
}
diff --git a/LongoMatch.Drawing/Canvas.cs b/LongoMatch.Drawing/Canvas.cs
index a272085..530d3ef 100644
--- a/LongoMatch.Drawing/Canvas.cs
+++ b/LongoMatch.Drawing/Canvas.cs
@@ -49,7 +49,7 @@ namespace LongoMatch.Drawing
~ Canvas ()
{
- if (! disposed) {
+ if (!disposed) {
Log.Error (String.Format ("Canvas {0} was not disposed correctly", this));
Dispose (true);
}
@@ -103,7 +103,7 @@ namespace LongoMatch.Drawing
protected Point ToUserCoords (Point p)
{
return new Point ((p.X - translation.X) / scaleX,
- (p.Y - translation.Y) / scaleY);
+ (p.Y - translation.Y) / scaleY);
}
@@ -162,7 +162,7 @@ namespace LongoMatch.Drawing
Selection clickedSel;
CanvasObject highlighted;
- public SelectionCanvas (IWidget widget): base (widget)
+ public SelectionCanvas (IWidget widget) : base (widget)
{
Selections = new List<Selection> ();
SelectionMode = MultiSelectionMode.Single;
@@ -284,7 +284,7 @@ namespace LongoMatch.Drawing
Selections.Clear ();
}
- protected void UpdateSelection (Selection sel, bool notify=true)
+ protected void UpdateSelection (Selection sel, bool notify = true)
{
ICanvasSelectableObject so;
Selection seldup;
@@ -300,7 +300,7 @@ namespace LongoMatch.Drawing
so = sel.Drawable as ICanvasSelectableObject;
if (Selections.Count > 0) {
if (SingleSelectionObjects.Contains (so.GetType ()) ||
- SingleSelectionObjects.Contains (Selections [0].Drawable.GetType ()))
{
+ SingleSelectionObjects.Contains (Selections [0].Drawable.GetType ())) {
return;
}
}
@@ -319,7 +319,7 @@ namespace LongoMatch.Drawing
}
}
- Selection GetSelection (Point coords, bool inMotion=false)
+ Selection GetSelection (Point coords, bool inMotion = false)
{
Selection sel = null;
@@ -361,9 +361,9 @@ namespace LongoMatch.Drawing
}
if ((SelectionMode == MultiSelectionMode.Multiple) ||
- (SelectionMode == MultiSelectionMode.MultipleWithModifier &&
- (modif == ButtonModifier.Control ||
- modif == ButtonModifier.Shift))) {
+ (SelectionMode == MultiSelectionMode.MultipleWithModifier &&
+ (modif == ButtonModifier.Control ||
+ modif == ButtonModifier.Shift))) {
if (sel != null) {
sel.Position = SelectionPosition.All;
UpdateSelection (sel);
@@ -439,7 +439,7 @@ namespace LongoMatch.Drawing
Image background;
- public BackgroundCanvas (IWidget widget): base (widget)
+ public BackgroundCanvas (IWidget widget) : base (widget)
{
widget.SizeChangedEvent += HandleSizeChangedEvent;
}
@@ -458,7 +458,7 @@ namespace LongoMatch.Drawing
{
if (background != null) {
background.ScaleFactor ((int)widget.Width, (int)widget.Height, out scaleX,
- out scaleY, out translation);
+ out scaleY, out translation);
}
}
diff --git a/LongoMatch.Drawing/CanvasObjects/CanvasObject.cs
b/LongoMatch.Drawing/CanvasObjects/CanvasObject.cs
index f69e23b..701cb88 100644
--- a/LongoMatch.Drawing/CanvasObjects/CanvasObject.cs
+++ b/LongoMatch.Drawing/CanvasObjects/CanvasObject.cs
@@ -27,7 +27,7 @@ namespace LongoMatch.Drawing.CanvasObjects
{
public event CanvasHandler ClickedEvent;
public event RedrawHandler RedrawEvent;
-
+
bool disposed;
bool highlighted;
bool selected;
@@ -39,7 +39,7 @@ namespace LongoMatch.Drawing.CanvasObjects
~CanvasObject ()
{
- if (! disposed) {
+ if (!disposed) {
Log.Error (String.Format ("Canvas object {0} not disposed correctly", this));
Dispose (true);
}
@@ -91,12 +91,12 @@ namespace LongoMatch.Drawing.CanvasObjects
}
}
}
-
+
public virtual void ResetDrawArea ()
{
DrawArea = null;
}
-
+
protected Area DrawArea {
get;
set;
@@ -133,7 +133,7 @@ namespace LongoMatch.Drawing.CanvasObjects
{
return DrawArea == null || area == null || area.IntersectsWith (DrawArea);
}
-
+
protected virtual bool UpdateDrawArea (IDrawingToolkit tk, Area redrawArea, Area drawArea)
{
if (NeedsRedraw (redrawArea)) {
@@ -143,14 +143,14 @@ namespace LongoMatch.Drawing.CanvasObjects
return false;
}
}
-
+
public abstract void Draw (IDrawingToolkit tk, Area area);
}
public abstract class CanvasButtonObject: CanvasObject
{
bool active;
-
+
public bool Toggle {
get;
set;
@@ -184,9 +184,10 @@ namespace LongoMatch.Drawing.CanvasObjects
set;
}
- public void Click () {
+ public void Click ()
+ {
ClickPressed (new Point (Position.X + 1, Position.Y + 1),
- ButtonModifier.None);
+ ButtonModifier.None);
ClickReleased ();
}
@@ -237,7 +238,7 @@ namespace LongoMatch.Drawing.CanvasObjects
}
}
- public Selection GetSelection (Point point, double precision, bool inMotion=false)
+ public Selection GetSelection (Point point, double precision, bool inMotion = false)
{
Selection sel = Drawable.GetSelection (point, precision, inMotion);
if (sel != null) {
@@ -259,8 +260,8 @@ namespace LongoMatch.Drawing.CanvasObjects
tk.LineStyle = LineStyle.Normal;
tk.LineWidth = 0;
tk.DrawRectangle (new Point (p.X - selectionSize,
- p.Y - selectionSize),
- selectionSize * 2, selectionSize * 2);
+ p.Y - selectionSize),
+ selectionSize * 2, selectionSize * 2);
}
protected void DrawCenterSelection (IDrawingToolkit tk, Point p)
@@ -270,7 +271,7 @@ namespace LongoMatch.Drawing.CanvasObjects
tk.LineStyle = LineStyle.Normal;
tk.DrawCircle (p, selectionSize);
}
-
+
protected override bool UpdateDrawArea (IDrawingToolkit tk, Area redrawArea, Area drawArea)
{
if (NeedsRedraw (redrawArea)) {
diff --git a/LongoMatch.Drawing/PlayslistCellRenderer.cs b/LongoMatch.Drawing/PlayslistCellRenderer.cs
index 254b252..3661290 100644
--- a/LongoMatch.Drawing/PlayslistCellRenderer.cs
+++ b/LongoMatch.Drawing/PlayslistCellRenderer.cs
@@ -73,15 +73,15 @@ namespace LongoMatch.Drawing
if (!isExpanded) {
if (ArrowRight == null) {
ArrowRight = Config.DrawingToolkit.CreateSurface
(Path.Combine (Config.IconsDir,
-
StyleConf.ListArrowRightPath));
+ StyleConf.ListArrowRightPath));
}
arrow = ArrowRight;
arrowY = new Point (cellArea.Start.X + 1,
- cellArea.Start.Y + cellArea.Height / 2 -
arrow.Height / 2);
+ cellArea.Start.Y + cellArea.Height / 2 - arrow.Height / 2);
} else {
if (ArrowDown == null) {
ArrowDown = Config.DrawingToolkit.CreateSurface (Path.Combine
(Config.IconsDir,
-
StyleConf.ListArrowDownPath));
+ StyleConf.ListArrowDownPath));
}
arrow = ArrowDown;
arrowY = new Point (cellArea.Start.X + 1, cellArea.Start.Y +
cellArea.Height / 2);
@@ -99,7 +99,7 @@ namespace LongoMatch.Drawing
tk.FontWeight = FontWeight.Bold;
tk.FontSize = 14;
tk.DrawText (new Point (countX1, countY), StyleConf.ListCountWidth,
- 2 * StyleConf.ListCountRadio, count.ToString ());
+ 2 * StyleConf.ListCountRadio, count.ToString ());
}
static void RenderBackgroundAndText (bool isExpanded, IDrawingToolkit tk, Area
backgroundArea, Point textP, double textW, string text)
@@ -134,7 +134,7 @@ namespace LongoMatch.Drawing
image = new Point (StyleConf.ListTextOffset, cellArea.Start.Y);
text = new Point (image.X + StyleConf.ListRowSeparator + StyleConf.ListImageWidth,
- cellArea.Start.Y);
+ cellArea.Start.Y);
textWidth = cellArea.Start.X + cellArea.Width - text.X;
tk.Context = context;
@@ -165,7 +165,7 @@ namespace LongoMatch.Drawing
Point textP = new Point (StyleConf.ListTextOffset, cellArea.Start.Y);
tk.Context = context;
tk.Begin ();
- RenderBackgroundAndText (isExpanded, tk, backgroundArea, textP , cellArea.Width -
textP.X, cat.Name);
+ RenderBackgroundAndText (isExpanded, tk, backgroundArea, textP, cellArea.Width -
textP.X, cat.Name);
RenderCount (isExpanded, cat.Color, count, tk, backgroundArea, cellArea);
RenderSeparationLine (tk, context, backgroundArea);
tk.End ();
@@ -220,8 +220,8 @@ namespace LongoMatch.Drawing
}
public static void RenderSubstitution (Color color, Time evt, Player playerIn, Player
playerOut, bool selected,
- bool isExpanded, IDrawingToolkit tk, IContext context,
Area backgroundArea,
- Area cellArea, CellState state)
+ bool isExpanded, IDrawingToolkit tk, IContext context,
Area backgroundArea,
+ Area cellArea, CellState state)
{
Point selectPoint, textPoint, imagePoint, circlePoint;
Point inPoint, imgPoint, outPoint, timePoint;
@@ -234,7 +234,7 @@ namespace LongoMatch.Drawing
tk.Begin ();
RenderTimelineEventBase (color, null, selected, null, tk, context, backgroundArea,
cellArea, state,
- out selectPoint, out textPoint, out imagePoint, out
circlePoint, out textWidth);
+ out selectPoint, out textPoint, out imagePoint, out circlePoint, out
textWidth);
inPoint = textPoint;
imgPoint = new Point (textPoint.X + StyleConf.ListImageWidth +
StyleConf.ListRowSeparator, textPoint.Y);
outPoint = new Point (imgPoint.X + 20 + StyleConf.ListRowSeparator, imgPoint.Y);
@@ -263,7 +263,7 @@ namespace LongoMatch.Drawing
tk.Begin ();
RenderTimelineEventBase (color, ss, selected, desc, tk, context, backgroundArea,
cellArea, state,
- out selectPoint, out textPoint, out imagePoint, out
circlePoint, out textWidth);
+ out selectPoint, out textPoint, out imagePoint, out circlePoint, out
textWidth);
imagePoint.X += StyleConf.ListImageWidth + StyleConf.ListRowSeparator;
if (players != null && players.Count > 0) {
@@ -281,15 +281,15 @@ namespace LongoMatch.Drawing
{
if (item is EventType) {
RenderAnalysisCategory (item as EventType, count, isExpanded, tk,
- context, backgroundArea, cellArea);
+ context, backgroundArea, cellArea);
} else if (item is SubstitutionEvent) {
SubstitutionEvent s = item as SubstitutionEvent;
RenderSubstitution (s.Color, s.EventTime, s.In, s.Out, s.Selected,
isExpanded, tk, context,
- backgroundArea, cellArea, state);
+ backgroundArea, cellArea, state);
} else if (item is TimelineEvent) {
TimelineEvent p = item as TimelineEvent;
RenderPlay (p.Color, p.Miniature, p.Players, p.Selected, p.Description,
count, isExpanded, tk,
- context, backgroundArea, cellArea, state);
+ context, backgroundArea, cellArea, state);
} else if (item is Player) {
RenderPlayer (item as Player, count, isExpanded, tk, context, backgroundArea,
cellArea);
} else if (item is Playlist) {
@@ -297,11 +297,11 @@ namespace LongoMatch.Drawing
} else if (item is PlaylistPlayElement) {
PlaylistPlayElement p = item as PlaylistPlayElement;
RenderPlay (p.Play.EventType.Color, p.Miniature, null, p.Selected,
p.Description, count, isExpanded, tk,
- context, backgroundArea, cellArea, state);
+ context, backgroundArea, cellArea, state);
} else if (item is IPlaylistElement) {
IPlaylistElement p = item as IPlaylistElement;
RenderPlay (Config.Style.PaletteActive, p.Miniature, null, p.Selected,
p.Description,
- count, isExpanded, tk, context, backgroundArea, cellArea, state);
+ count, isExpanded, tk, context, backgroundArea, cellArea, state);
} else {
Log.Error ("No renderer for type " + item.GetType ());
}
diff --git a/LongoMatch.Drawing/Utils.cs b/LongoMatch.Drawing/Utils.cs
index caee032..a592a47 100644
--- a/LongoMatch.Drawing/Utils.cs
+++ b/LongoMatch.Drawing/Utils.cs
@@ -72,7 +72,7 @@ namespace LongoMatch.Drawing
public static ICanvasSelectableObject CanvasFromDrawableObject (IBlackboardObject drawable)
{
string objecttype = String.Format ("LongoMatch.Drawing.CanvasObjects.{0}Object",
- drawable.GetType ().ToString ().Split ('.').Last
());
+ drawable.GetType ().ToString ().Split ('.').Last ());
ObjectHandle handle = Activator.CreateInstance (null, objecttype);
ICanvasDrawableObject d = (ICanvasDrawableObject)handle.Unwrap ();
d.IDrawableObject = drawable;
@@ -111,7 +111,7 @@ namespace LongoMatch.Drawing
public static Point ToUserCoords (Point p, Point offset, double scaleX, double scaleY)
{
return new Point ((p.X - offset.X) / scaleX,
- (p.Y - offset.Y) / scaleY);
+ (p.Y - offset.Y) / scaleY);
}
}
diff --git a/LongoMatch.Drawing/Widgets/Blackboard.cs b/LongoMatch.Drawing/Widgets/Blackboard.cs
index 9360b6f..461e3e2 100644
--- a/LongoMatch.Drawing/Widgets/Blackboard.cs
+++ b/LongoMatch.Drawing/Widgets/Blackboard.cs
@@ -36,7 +36,7 @@ namespace LongoMatch.Drawing.Widgets
ISurface backbuffer;
bool handdrawing, inObjectCreation;
- public Blackboard (IWidget widget): base(widget)
+ public Blackboard (IWidget widget) : base (widget)
{
Accuracy = 5;
SelectionMode = MultiSelectionMode.Single;
@@ -70,7 +70,7 @@ namespace LongoMatch.Drawing.Widgets
Add (d);
}
backbuffer = tk.CreateSurface (Background.Width, Background.Height,
- drawing.Freehand);
+ drawing.Freehand);
} else {
backbuffer = tk.CreateSurface (Background.Width, Background.Height);
}
@@ -189,13 +189,13 @@ namespace LongoMatch.Drawing.Widgets
switch (Tool) {
case DrawTool.Line:
drawable = new Line (start, new Point (start.X + 1, start.Y + 1),
- LineType, LineStyle);
+ LineType, LineStyle);
drawable.FillColor = Color;
pos = SelectionPosition.LineStop;
break;
case DrawTool.Cross:
drawable = new Cross (start, new Point (start.X + 1, start.Y + 1),
- LineStyle);
+ LineStyle);
break;
case DrawTool.Ellipse:
drawable = new Ellipse (start, 2, 2);
@@ -233,7 +233,7 @@ namespace LongoMatch.Drawing.Widgets
Config.DrawingToolkit.MeasureText (text.Value, out width, out heigth,
Config.Style.Font, FontSize, FontWeight.Normal);
text.Update (new Point (start.X - width / 2, start.Y - heigth / 2),
- width, heigth);
+ width, heigth);
text.TextColor = TextColor.Copy ();
text.FillColor = text.StrokeColor = TextBackgroundColor.Copy ();
text.TextSize = FontSize;
@@ -311,7 +311,7 @@ namespace LongoMatch.Drawing.Widgets
Objects.Select (o => (o as ICanvasDrawableObject).IDrawableObject)) {
if (bo is Counter) {
(bo as Counter).Count = index;
- index ++;
+ index++;
}
}
}
diff --git a/LongoMatch.Drawing/Widgets/PositionTagger.cs b/LongoMatch.Drawing/Widgets/PositionTagger.cs
index 90171e3..0eaf35c 100644
--- a/LongoMatch.Drawing/Widgets/PositionTagger.cs
+++ b/LongoMatch.Drawing/Widgets/PositionTagger.cs
@@ -35,7 +35,7 @@ namespace LongoMatch.Drawing.Widgets
EventsFilter filter;
TimelineEvent playSelected;
- public PositionTagger (IWidget widget): base (widget)
+ public PositionTagger (IWidget widget) : base (widget)
{
Accuracy = Constants.TAGGER_POINT_SIZE + 3;
EmitSignals = true;
@@ -44,7 +44,7 @@ namespace LongoMatch.Drawing.Widgets
}
public PositionTagger (IWidget widget, Project project, List<TimelineEvent> plays,
- Image background, FieldPositionType position): base (widget)
+ Image background, FieldPositionType position) : base (widget)
{
Project = project;
Background = background;
@@ -75,7 +75,7 @@ namespace LongoMatch.Drawing.Widgets
filter.FilterUpdated += HandleFilterUpdated;
}
}
-
+
public FieldPositionType FieldPosition {
get;
set;
@@ -112,7 +112,7 @@ namespace LongoMatch.Drawing.Widgets
}
}
}
-
+
public List<Point> Points {
set {
ClearObjects ();
@@ -139,7 +139,7 @@ namespace LongoMatch.Drawing.Widgets
return;
po = new PositionObject (coords.Points, Background.Width,
- Background.Height);
+ Background.Height);
po.Play = play;
po.Project = Project;
if (Filter != null) {
@@ -182,7 +182,7 @@ namespace LongoMatch.Drawing.Widgets
ShowMenuEvent (plays);
}
}
-
+
public override void Draw (IContext context, Area area)
{
tk.Context = context;
diff --git a/LongoMatch.GUI.Helpers/ExternalWindow.cs b/LongoMatch.GUI.Helpers/ExternalWindow.cs
index 94de3f2..e450573 100644
--- a/LongoMatch.GUI.Helpers/ExternalWindow.cs
+++ b/LongoMatch.GUI.Helpers/ExternalWindow.cs
@@ -25,7 +25,7 @@ namespace LongoMatch.GUI.Helpers
{
EventBox box;
- public ExternalWindow (): base (WindowType.Toplevel)
+ public ExternalWindow () : base (WindowType.Toplevel)
{
Icon = LongoMatch.Gui.Helpers.Misc.LoadIcon ("longomatch", IconSize.Menu);
@@ -45,8 +45,9 @@ namespace LongoMatch.GUI.Helpers
return box;
}
}
-
- new public void Add (Widget widget) {
+
+ new public void Add (Widget widget)
+ {
box.Add (widget);
}
}
diff --git a/LongoMatch.GUI.Helpers/FileChooserHelper.cs b/LongoMatch.GUI.Helpers/FileChooserHelper.cs
index 0ce704a..58291d3 100644
--- a/LongoMatch.GUI.Helpers/FileChooserHelper.cs
+++ b/LongoMatch.GUI.Helpers/FileChooserHelper.cs
@@ -30,49 +30,49 @@ namespace LongoMatch.Gui.Helpers
string defaultFolder, string filterName,
string[] extensions)
{
- return FileChooser(parent, title, defaultName, defaultFolder, filterName,
- extensions, FileChooserAction.Save);
+ return FileChooser (parent, title, defaultName, defaultFolder, filterName,
+ extensions, FileChooserAction.Save);
}
-
+
static public string SelectFolder (Widget parent, string title, string defaultName,
string defaultFolder, string filterName,
string[] extensions)
{
- return FileChooser(parent, title, defaultName, defaultFolder, filterName,
- extensions, FileChooserAction.SelectFolder);
+ return FileChooser (parent, title, defaultName, defaultFolder, filterName,
+ extensions, FileChooserAction.SelectFolder);
}
-
+
static public string OpenFile (Widget parent, string title, string defaultName,
string defaultFolder, string filterName,
string[] extensions)
{
- return FileChooser(parent, title, defaultName, defaultFolder, filterName,
- extensions, FileChooserAction.Open);
+ return FileChooser (parent, title, defaultName, defaultFolder, filterName,
+ extensions, FileChooserAction.Open);
}
-
- static public List<string> OpenFiles(Widget parent, string title, string defaultName,
- string defaultFolder, string filterName,
- string[] extensions)
+
+ static public List<string> OpenFiles (Widget parent, string title, string defaultName,
+ string defaultFolder, string filterName,
+ string[] extensions)
{
return MultiFileChooser (parent, title, defaultName, defaultFolder, filterName,
- extensions, FileChooserAction.Open);
+ extensions, FileChooserAction.Open);
}
-
- static string FileChooser(Widget parent, string title, string defaultName,
- string defaultFolder, string filterName,
- string[] extensions, FileChooserAction action)
+
+ static string FileChooser (Widget parent, string title, string defaultName,
+ string defaultFolder, string filterName,
+ string[] extensions, FileChooserAction action)
{
- List<string> res = MultiFileChooser(parent, title, defaultName, defaultFolder,
- filterName, extensions, action, false);
+ List<string> res = MultiFileChooser (parent, title, defaultName, defaultFolder,
+ filterName, extensions, action, false);
if (res.Count == 1)
- return res[0];
+ return res [0];
return null;
}
-
- static List<string> MultiFileChooser(Widget parent, string title, string defaultName,
- string defaultFolder, string filterName,
- string[] extensions, FileChooserAction action,
- bool allowMultiple=true)
+
+ static List<string> MultiFileChooser (Widget parent, string title, string defaultName,
+ string defaultFolder, string filterName,
+ string[] extensions, FileChooserAction action,
+ bool allowMultiple = true)
{
Window toplevel;
FileChooserDialog fChooser;
diff --git a/LongoMatch.GUI.Helpers/GtkGlue.cs b/LongoMatch.GUI.Helpers/GtkGlue.cs
index f0ad5f6..8051c66 100644
--- a/LongoMatch.GUI.Helpers/GtkGlue.cs
+++ b/LongoMatch.GUI.Helpers/GtkGlue.cs
@@ -25,17 +25,20 @@ namespace LongoMatch
public class GtkGlue
{
- [DllImport("libgtk-2.0.dll") /* willfully unmapped */ ]
+ [DllImport ("libgtk-2.0.dll") /* willfully unmapped */]
static extern void gtk_menu_item_set_label (IntPtr menu, IntPtr label);
+
[DllImport ("libcesarplayer.dll")]
static extern void lgm_gtk_glue_gdk_event_button_set_button (IntPtr evt, uint button);
-
- public static void MenuItemSetLabel (MenuItem menu, string label) {
+
+ public static void MenuItemSetLabel (MenuItem menu, string label)
+ {
gtk_menu_item_set_label (menu.Handle, GLib.Marshaller.StringToFilenamePtr (label));
}
- public static void EventButtonSetButton (EventButton ev, uint button) {
+ public static void EventButtonSetButton (EventButton ev, uint button)
+ {
lgm_gtk_glue_gdk_event_button_set_button (ev.Handle, button);
}
diff --git a/LongoMatch.GUI.Helpers/MessagesHelpers.cs b/LongoMatch.GUI.Helpers/MessagesHelpers.cs
index d9b3e09..a4dbcd6 100644
--- a/LongoMatch.GUI.Helpers/MessagesHelpers.cs
+++ b/LongoMatch.GUI.Helpers/MessagesHelpers.cs
@@ -28,76 +28,82 @@ namespace LongoMatch.Gui.Helpers
public class MessagesHelpers
{
- static public void InfoMessage (Widget parent, string message) {
- PopupMessage(parent, MessageType.Info, message);
+ static public void InfoMessage (Widget parent, string message)
+ {
+ PopupMessage (parent, MessageType.Info, message);
}
-
- static public void ErrorMessage(Widget parent, string message) {
- PopupMessage(parent, MessageType.Error, message);
+
+ static public void ErrorMessage (Widget parent, string message)
+ {
+ PopupMessage (parent, MessageType.Error, message);
}
-
- static public void WarningMessage(Widget parent, string message) {
- PopupMessage(parent, Gtk.MessageType.Warning, message);
+
+ static public void WarningMessage (Widget parent, string message)
+ {
+ PopupMessage (parent, Gtk.MessageType.Warning, message);
}
-
- static public bool QuestionMessage(Widget parent, string question, string title=null) {
+
+ static public bool QuestionMessage (Widget parent, string question, string title = null)
+ {
Window toplevel;
- if(parent != null)
+ if (parent != null)
toplevel = parent.Toplevel as Window;
else
toplevel = null;
- MessageDialog md = new MessageDialog(toplevel, DialogFlags.Modal,
- MessageType.Question, ButtonsType.YesNo,
- question);
+ MessageDialog md = new MessageDialog (toplevel, DialogFlags.Modal,
+ MessageType.Question, ButtonsType.YesNo,
+ question);
- md.Icon = Misc.LoadIcon("longomatch", IconSize.Button, 0);
+ md.Icon = Misc.LoadIcon ("longomatch", IconSize.Button, 0);
md.Title = title;
- var res = md.Run();
- md.Destroy();
+ var res = md.Run ();
+ md.Destroy ();
return (res == (int)ResponseType.Yes);
}
- public static int PopupMessage(Widget sender,MessageType type, String errorMessage) {
+ public static int PopupMessage (Widget sender, MessageType type, String errorMessage)
+ {
Window toplevel;
int ret;
- if(sender != null)
+ if (sender != null)
toplevel = (Window)sender.Toplevel;
else
toplevel = null;
- MessageDialog md = new MessageDialog(toplevel,
- DialogFlags.Modal,
- type,
- ButtonsType.Ok,
- errorMessage);
- md.Icon = Misc.LoadIcon("longomatch", Gtk.IconSize.Dialog, 0);
- ret = md.Run();
- md.Destroy();
+ MessageDialog md = new MessageDialog (toplevel,
+ DialogFlags.Modal,
+ type,
+ ButtonsType.Ok,
+ errorMessage);
+ md.Icon = Misc.LoadIcon ("longomatch", Gtk.IconSize.Dialog, 0);
+ ret = md.Run ();
+ md.Destroy ();
return ret;
}
-
- static public string QueryMessage (Widget sender, string key, string title=null, string
value="") {
+
+ static public string QueryMessage (Widget sender, string key, string title = null, string
value = "")
+ {
string ret = null;
Window parent;
- if(sender != null)
+ if (sender != null)
parent = (Window)sender.Toplevel;
else
parent = null;
- Label label = new Label(key);
- Entry entry = new Entry(value);
+ Label label = new Label (key);
+ Entry entry = new Entry (value);
Gtk.Dialog dialog = new Gtk.Dialog (title, parent, DialogFlags.DestroyWithParent);
dialog.Modal = true;
- dialog.AddButton (Catalog.GetString("Add"), ResponseType.Ok);
+ dialog.AddButton (Catalog.GetString ("Add"), ResponseType.Ok);
dialog.VBox.PackStart (label, false, false, 0);
dialog.VBox.PackStart (entry, true, true, 0);
dialog.Icon = Misc.LoadIcon ("longomatch", Gtk.IconSize.Dialog, 0);
dialog.ShowAll ();
- if (dialog.Run () == (int) ResponseType.Ok) {
+ if (dialog.Run () == (int)ResponseType.Ok) {
ret = entry.Text;
}
dialog.Destroy ();
diff --git a/LongoMatch.GUI.Helpers/Misc.cs b/LongoMatch.GUI.Helpers/Misc.cs
index f82090a..1593769 100644
--- a/LongoMatch.GUI.Helpers/Misc.cs
+++ b/LongoMatch.GUI.Helpers/Misc.cs
@@ -73,7 +73,7 @@ namespace LongoMatch.Gui.Helpers
return pimage;
}
- public static Pixbuf Scale (Pixbuf pixbuf, int max_width, int max_height, bool dispose=true)
+ public static Pixbuf Scale (Pixbuf pixbuf, int max_width, int max_height, bool dispose = true)
{
int ow, oh, h, w;
@@ -130,7 +130,7 @@ namespace LongoMatch.Gui.Helpers
formatStore.AppendValues (std.Name, std);
if (std.Equals (def))
active = index;
- index ++;
+ index++;
}
formatBox.Model = formatStore;
formatBox.Active = active;
@@ -286,7 +286,7 @@ namespace LongoMatch.Gui.Helpers
try {
Exception ex = null;
busy = Config.GUIToolkit.BusyDialog (Catalog.GetString ("Analyzing video
file:") + "\n" +
- filename, parent);
+ filename, parent);
Task task = new Task (() => {
try {
mediaFile = Config.MultimediaToolkit.DiscoverFile (filename);
@@ -335,11 +335,11 @@ namespace LongoMatch.Gui.Helpers
if (multimedia.FileNeedsRemux (mediaFile)) {
if (!Config.SupportsFullHD) {
string msg = Catalog.GetString ("This file is not in
a supported format, " +
- "convert it with the
video conversion tool");
+ "convert it with the video conversion
tool");
throw new Exception (msg);
} else {
string q = Catalog.GetString ("This file needs to be
converted into a more suitable format." +
- "(This step will only
take a few minutes)");
+ "(This step will only take a few
minutes)");
if (gui.QuestionMessage (q, null, parent)) {
string newFilename = multimedia.RemuxFile
(mediaFile, parent);
if (newFilename != null) {
diff --git a/LongoMatch.GUI.Multimedia/Gui/CapturerBin.cs b/LongoMatch.GUI.Multimedia/Gui/CapturerBin.cs
index 8fafcb1..3b2a4df 100644
--- a/LongoMatch.GUI.Multimedia/Gui/CapturerBin.cs
+++ b/LongoMatch.GUI.Multimedia/Gui/CapturerBin.cs
@@ -33,8 +33,8 @@ using Misc = LongoMatch.Gui.Helpers.Misc;
namespace LongoMatch.Gui
{
- [System.ComponentModel.Category("CesarPlayer")]
- [System.ComponentModel.ToolboxItem(true)]
+ [System.ComponentModel.Category ("CesarPlayer")]
+ [System.ComponentModel.ToolboxItem (true)]
public partial class CapturerBin : Gtk.Bin, ICapturerBin
{
CapturerType type;
@@ -75,21 +75,21 @@ namespace LongoMatch.Gui
playlastbutton.TooltipMarkup = Catalog.GetString ("Replay event");
recimage.Pixbuf = Misc.LoadIcon ("longomatch-control-record",
- StyleConf.PlayerCapturerIconSize);
+ StyleConf.PlayerCapturerIconSize);
stopimage.Pixbuf = Misc.LoadIcon ("longomatch-stop",
- StyleConf.PlayerCapturerIconSize);
+ StyleConf.PlayerCapturerIconSize);
pauseimage.Pixbuf = Misc.LoadIcon ("longomatch-pause-clock",
- StyleConf.PlayerCapturerIconSize);
+ StyleConf.PlayerCapturerIconSize);
resumeimage.Pixbuf = Misc.LoadIcon ("longomatch-resume-clock",
- StyleConf.PlayerCapturerIconSize);
+ StyleConf.PlayerCapturerIconSize);
saveimage.Pixbuf = Misc.LoadIcon ("longomatch-save",
- StyleConf.PlayerCapturerIconSize);
+ StyleConf.PlayerCapturerIconSize);
cancelimage.Pixbuf = Misc.LoadIcon ("longomatch-cancel-rec",
- StyleConf.PlayerCapturerIconSize);
+ StyleConf.PlayerCapturerIconSize);
deletelastimage.Pixbuf = Misc.LoadIcon ("longomatch-delete",
- StyleConf.PlayerCapturerIconSize);
+ StyleConf.PlayerCapturerIconSize);
playlastimage.Pixbuf = Misc.LoadIcon ("longomatch-control-play",
- StyleConf.PlayerCapturerIconSize);
+ StyleConf.PlayerCapturerIconSize);
lasteventbox.Visible = false;
deletelastbutton.Clicked += HandleDeleteLast;
playlastbutton.Clicked += HandlePlayLast;
@@ -295,7 +295,7 @@ namespace LongoMatch.Gui
periodlabel.ModifyFg (StateType.Normal, Misc.ToGdkColor (Config.Style.PaletteText));
}
-
+
bool UpdateTime ()
{
if (currentTimeNode != null) {
@@ -331,7 +331,7 @@ namespace LongoMatch.Gui
Capturer = Config.MultimediaToolkit.GetCapturer ();
this.outputFile = outputFile;
this.settings = settings;
- videowindow.Ratio = (float) outputFile.VideoWidth / outputFile.VideoHeight;
+ videowindow.Ratio = (float)outputFile.VideoWidth / outputFile.VideoHeight;
Capturer.Error += OnError;
Capturer.MediaInfo += HandleMediaInfo;
Capturer.DeviceChange += OnDeviceChange;
@@ -373,7 +373,7 @@ namespace LongoMatch.Gui
if (image.Value == null)
return null;
image.ScaleInplace (Constants.MAX_THUMBNAIL_SIZE,
- Constants.MAX_THUMBNAIL_SIZE);
+ Constants.MAX_THUMBNAIL_SIZE);
return image;
}
}
@@ -460,7 +460,7 @@ namespace LongoMatch.Gui
Capturer.Expose ();
}
}
-
+
void HandleEventCreated (TimelineEvent evt)
{
lasteventbox.Visible = true;
@@ -479,7 +479,7 @@ namespace LongoMatch.Gui
void HandleDeleteLast (object sender, EventArgs e)
{
if (lastevent != null) {
- Config.EventsBroker.EmitEventsDeleted (new List<TimelineEvent> {lastevent});
+ Config.EventsBroker.EmitEventsDeleted (new List<TimelineEvent> { lastevent });
lastevent = null;
lasteventbox.Visible = false;
}
@@ -489,10 +489,10 @@ namespace LongoMatch.Gui
void HandleMediaInfo (int width, int height, int parN, int parD)
{
Application.Invoke (delegate {
- videowindow.Ratio = (float) width / height * parN / parD;
- outputFile.VideoWidth = (uint) width;
- outputFile.VideoHeight = (uint) height;
- outputFile.Par = (float) parN / parD;
+ videowindow.Ratio = (float)width / height * parN / parD;
+ outputFile.VideoWidth = (uint)width;
+ outputFile.VideoHeight = (uint)height;
+ outputFile.Par = (float)parN / parD;
});
}
}
diff --git a/LongoMatch.GUI.Multimedia/Gui/PlayerBin.cs b/LongoMatch.GUI.Multimedia/Gui/PlayerBin.cs
index 0a9717d..c746610 100644
--- a/LongoMatch.GUI.Multimedia/Gui/PlayerBin.cs
+++ b/LongoMatch.GUI.Multimedia/Gui/PlayerBin.cs
@@ -41,8 +41,8 @@ using System.Collections.Generic;
namespace LongoMatch.Gui
{
- [System.ComponentModel.Category("LongoMatch")]
- [System.ComponentModel.ToolboxItem(true)]
+ [System.ComponentModel.Category ("LongoMatch")]
+ [System.ComponentModel.ToolboxItem (true)]
public partial class PlayerBin : Gtk.Bin, IPlayerBin, IPlayerController
{
@@ -81,26 +81,27 @@ namespace LongoMatch.Gui
uint timeout;
#region Constructors
+
public PlayerBin ()
{
this.Build ();
closebuttonimage.Pixbuf = Helpers.Misc.LoadIcon ("longomatch-cancel-rec",
- StyleConf.PlayerCapturerIconSize);
+ StyleConf.PlayerCapturerIconSize);
drawbuttonimage.Pixbuf = Helpers.Misc.LoadIcon ("longomatch-control-draw",
- StyleConf.PlayerCapturerIconSize);
+ StyleConf.PlayerCapturerIconSize);
playbuttonimage.Pixbuf = Helpers.Misc.LoadIcon ("longomatch-control-play",
- StyleConf.PlayerCapturerIconSize);
+ StyleConf.PlayerCapturerIconSize);
pausebuttonimage.Pixbuf = Helpers.Misc.LoadIcon ("longomatch-control-pause",
- StyleConf.PlayerCapturerIconSize);
+ StyleConf.PlayerCapturerIconSize);
prevbuttonimage.Pixbuf = Helpers.Misc.LoadIcon ("longomatch-control-rw",
- StyleConf.PlayerCapturerIconSize);
+ StyleConf.PlayerCapturerIconSize);
nextbuttonimage.Pixbuf = Helpers.Misc.LoadIcon ("longomatch-control-ff",
- StyleConf.PlayerCapturerIconSize);
+ StyleConf.PlayerCapturerIconSize);
volumebuttonimage.Pixbuf = Helpers.Misc.LoadIcon ("longomatch-control-volume-hi",
- StyleConf.PlayerCapturerIconSize);
+ StyleConf.PlayerCapturerIconSize);
detachbuttonimage.Pixbuf = Helpers.Misc.LoadIcon ("longomatch-control-detach",
- StyleConf.PlayerCapturerIconSize);
+ StyleConf.PlayerCapturerIconSize);
// Force tooltips to be translatable as there seems to be a bug in stetic
// code generation for translatable tooltips.
@@ -139,13 +140,17 @@ namespace LongoMatch.Gui
CreatePlayer ();
}
+
#endregion
+
protected override void OnDestroyed ()
{
Close ();
base.OnDestroyed ();
}
+
#region Properties
+
public MediaFileSet MediaFileSet {
get {
return fileSet;
@@ -234,7 +239,7 @@ namespace LongoMatch.Gui
vscale1.Visible = value;
}
}
-
+
public bool Playing {
get {
return player != null ? player.Playing : false;
@@ -253,9 +258,11 @@ namespace LongoMatch.Gui
get;
set;
}
-
+
#endregion
+
#region Public methods
+
public void Open (MediaFileSet fileSet)
{
if (videowindow.Ready) {
@@ -464,8 +471,11 @@ namespace LongoMatch.Gui
controlsbox.Sensitive = false;
vscale1.Sensitive = false;
}
+
#endregion
+
#region Private methods
+
bool DrawingsVisible {
set {
videowindow.Visible = !value;
@@ -473,7 +483,7 @@ namespace LongoMatch.Gui
}
}
- void Open (MediaFileSet fileSet, bool seek, bool force=false, bool play=false)
+ void Open (MediaFileSet fileSet, bool seek, bool force = false, bool play = false)
{
ResetGui ();
CloseSegment ();
@@ -525,7 +535,7 @@ namespace LongoMatch.Gui
set {
stillimageLoaded = value;
if (stillimageLoaded) {
- player.Pause();
+ player.Pause ();
imageLoadedTS = new Time (0);
ReconfigureTimeout (TIMEOUT_MS);
}
@@ -563,8 +573,8 @@ namespace LongoMatch.Gui
bool playing, float rate = 1)
{
Log.Debug (String.Format ("Update player segment {0} {1} {2}",
- start.ToMSecondsString (),
- stop.ToMSecondsString (), rate));
+ start.ToMSecondsString (),
+ stop.ToMSecondsString (), rate));
if (fileSet != this.fileSet) {
Open (fileSet, false);
}
@@ -576,7 +586,7 @@ namespace LongoMatch.Gui
ImageLoaded = false;
if (readyToSeek) {
Log.Debug ("Player is ready to seek, seeking to " +
- seekTime.ToMSecondsString ());
+ seekTime.ToMSecondsString ());
SetScaleValue (rate);
player.Rate = (double)rate;
Seek (seekTime, true);
@@ -743,8 +753,11 @@ namespace LongoMatch.Gui
}
OnTick ();
}
+
#endregion
+
#region Callbacks
+
void HandleExposeEvent (object sender, ExposeEventArgs args)
{
player.Expose ();
@@ -831,11 +844,10 @@ namespace LongoMatch.Gui
[GLib.ConnectBefore]
void OnTimescaleButtonPress (object o, Gtk.ButtonPressEventArgs args)
{
- if (args.Event.Button == 1)
- {
- GtkGlue.EventButtonSetButton(args.Event, 2);
+ if (args.Event.Button == 1) {
+ GtkGlue.EventButtonSetButton (args.Event, 2);
} else {
- GtkGlue.EventButtonSetButton(args.Event, 1);
+ GtkGlue.EventButtonSetButton (args.Event, 1);
}
if (!seeking) {
@@ -849,11 +861,10 @@ namespace LongoMatch.Gui
[GLib.ConnectBefore]
void OnTimescaleButtonRelease (object o, Gtk.ButtonReleaseEventArgs args)
{
- if (args.Event.Button == 1)
- {
- GtkGlue.EventButtonSetButton(args.Event, 2);
+ if (args.Event.Button == 1) {
+ GtkGlue.EventButtonSetButton (args.Event, 2);
} else {
- GtkGlue.EventButtonSetButton(args.Event, 1);
+ GtkGlue.EventButtonSetButton (args.Event, 1);
}
if (seeking) {
@@ -889,7 +900,7 @@ namespace LongoMatch.Gui
{
volumebuttonimage.Pixbuf = Helpers.Misc.LoadIcon (name, IconSize.Button, 0);
}
-
+
void OnVolumeChanged (double level)
{
double prevLevel;
diff --git a/LongoMatch.GUI.Multimedia/Gui/Utils/FramesCapturer.cs
b/LongoMatch.GUI.Multimedia/Gui/Utils/FramesCapturer.cs
index 2e8c94f..a08b69b 100644
--- a/LongoMatch.GUI.Multimedia/Gui/Utils/FramesCapturer.cs
+++ b/LongoMatch.GUI.Multimedia/Gui/Utils/FramesCapturer.cs
@@ -43,8 +43,8 @@ namespace LongoMatch.Video.Utils
bool cancel;
TimelineEvent evt;
MediaFileSet fileSet;
- private const int THUMBNAIL_MAX_HEIGHT=250;
- private const int THUMBNAIL_MAX_WIDTH=300;
+ private const int THUMBNAIL_MAX_HEIGHT = 250;
+ private const int THUMBNAIL_MAX_WIDTH = 300;
public event LongoMatch.Core.Handlers.FramesProgressHandler Progress;
@@ -53,7 +53,7 @@ namespace LongoMatch.Video.Utils
this.capturer = Config.MultimediaToolkit.GetFramesCapturer ();
this.fileSet = fileSet;
this.evt = evt;
- this.start= evt.Start;
+ this.start = evt.Start;
this.stop = evt.Stop;
this.interval = interval;
this.outputDir = outputDir;
@@ -62,13 +62,15 @@ namespace LongoMatch.Video.Utils
this.cancel = false;
}
- public void Cancel() {
+ public void Cancel ()
+ {
cancel = true;
}
- public void Start() {
- Thread thread = new Thread(new ThreadStart(CaptureFrames));
- thread.Start();
+ public void Start ()
+ {
+ Thread thread = new Thread (new ThreadStart (CaptureFrames));
+ thread.Start ();
}
public void CaptureFrames ()
@@ -96,15 +98,15 @@ namespace LongoMatch.Video.Utils
Log.Debug ("Start frames series capture for angle " + cameraIndex);
MediaFile file = fileSet.First ();
capturer.Open (file.FilePath);
- pos = new Time {MSeconds = start.MSeconds};
- if(Progress != null) {
+ pos = new Time { MSeconds = start.MSeconds };
+ if (Progress != null) {
Application.Invoke (delegate {
- Progress(i,totalFrames,null);
+ Progress (i, totalFrames, null);
});
}
j = 0;
- while(pos <= stop) {
+ while (pos <= stop) {
Log.Debug ("Capturing fame " + j);
if (!cancel) {
frame = capturer.GetFrame (pos + file.Offset, true);
@@ -114,19 +116,18 @@ namespace LongoMatch.Video.Utils
frame.ScaleInplace (THUMBNAIL_MAX_WIDTH,
THUMBNAIL_MAX_HEIGHT);
}
- if(Progress != null) {
+ if (Progress != null) {
Application.Invoke (delegate {
- Progress(i+1, totalFrames, frame);
+ Progress (i + 1, totalFrames, frame);
});
}
- pos.MSeconds += (int) interval;
+ pos.MSeconds += (int)interval;
i++;
j++;
- }
- else {
+ } else {
Log.Debug ("Capture cancelled, deleting output directory");
- System.IO.Directory.Delete(outputDir,true);
- cancel=false;
+ System.IO.Directory.Delete (outputDir, true);
+ cancel = false;
quit = true;
break;
}
diff --git a/LongoMatch.GUI.Multimedia/Gui/Utils/Remuxer.cs b/LongoMatch.GUI.Multimedia/Gui/Utils/Remuxer.cs
index 937d869..ed8eb4d 100644
--- a/LongoMatch.GUI.Multimedia/Gui/Utils/Remuxer.cs
+++ b/LongoMatch.GUI.Multimedia/Gui/Utils/Remuxer.cs
@@ -41,7 +41,7 @@ namespace LongoMatch.Video.Utils
bool cancelled;
VideoMuxerType muxer;
Window parent;
-
+
public Remuxer (MediaFile inputFile, string outputFilepath = null,
VideoMuxerType muxer = VideoMuxerType.Mp4)
{
@@ -51,18 +51,19 @@ namespace LongoMatch.Video.Utils
if (outputFilepath != null) {
this.outputFilepath = outputFilepath;
} else {
- this.outputFilepath = Path.ChangeExtension(inputFile.FilePath,
- GetExtension(muxer));
+ this.outputFilepath = Path.ChangeExtension (inputFile.FilePath,
+ GetExtension (muxer));
if (this.outputFilepath == inputFile.FilePath) {
- this.outputFilepath = Path.ChangeExtension(inputFile.FilePath,
- "1." +
GetExtension(muxer));
+ this.outputFilepath = Path.ChangeExtension (inputFile.FilePath,
+ "1." + GetExtension (muxer));
}
}
- this.multimedia = new MultimediaToolkit();
+ this.multimedia = new MultimediaToolkit ();
}
-
- public string Remux(Window parent) {
+
+ public string Remux (Window parent)
+ {
VBox box;
Label label;
Button cancellButton;
@@ -70,69 +71,75 @@ namespace LongoMatch.Video.Utils
this.parent = parent;
/* Create the dialog */
- dialog = new Dialog(Catalog.GetString("Remuxing file..."), parent, DialogFlags.Modal);
+ dialog = new Dialog (Catalog.GetString ("Remuxing file..."), parent,
DialogFlags.Modal);
dialog.AllowGrow = false;
dialog.AllowShrink = false;
dialog.Deletable = false;
/* Add label and progress bar */
- box = new VBox();
- label = new Label(Catalog.GetString("Remuxing file, this might take a while..."));
- box.PackStart(label);
- pb = new ProgressBar();
- box.PackStart(pb);
- box.ShowAll();
- dialog.VBox.Add(box);
+ box = new VBox ();
+ label = new Label (Catalog.GetString ("Remuxing file, this might take a while..."));
+ box.PackStart (label);
+ pb = new ProgressBar ();
+ box.PackStart (pb);
+ box.ShowAll ();
+ dialog.VBox.Add (box);
/* Add a button to cancell the task */
- cancellButton = new Button("gtk-cancel");
+ cancellButton = new Button ("gtk-cancel");
cancellButton.Clicked += (sender, e) => Cancel ();
- cancellButton.Show();
- dialog.VBox.Add(cancellButton);
+ cancellButton.Show ();
+ dialog.VBox.Add (cancellButton);
/* Add a timeout to refresh the progress bar */
- pb.Pulse();
+ pb.Pulse ();
timeout = GLib.Timeout.Add (1000, new GLib.TimeoutHandler (Update));
- remuxer = multimedia.GetRemuxer(inputFile, outputFilepath, muxer);
+ remuxer = multimedia.GetRemuxer (inputFile, outputFilepath, muxer);
remuxer.Progress += HandleRemuxerProgress;
remuxer.Error += HandleRemuxerError;
- remuxer.Start();
+ remuxer.Start ();
/* Wait until the thread call Destroy on the dialog */
- dialog.Run();
+ dialog.Run ();
if (cancelled) {
try {
- File.Delete(outputFilepath);
+ File.Delete (outputFilepath);
} catch {
}
outputFilepath = null;
}
return outputFilepath;
}
-
- void Error (string error) {
- MessageDialog md = new MessageDialog(parent, DialogFlags.Modal, MessageType.Error,
- ButtonsType.Ok,
- Catalog.GetString("Error remuxing file:" + "\n"
+ error));
- md.Run();
- md.Destroy();
- Cancel();
+
+ void Error (string error)
+ {
+ MessageDialog md = new MessageDialog (parent, DialogFlags.Modal, MessageType.Error,
+ ButtonsType.Ok,
+ Catalog.GetString ("Error remuxing file:" + "\n" + error));
+ md.Run ();
+ md.Destroy ();
+ Cancel ();
}
void HandleRemuxerError (string error)
{
- Application.Invoke (delegate {Error (error);});
+ Application.Invoke (delegate {
+ Error (error);
+ });
}
void HandleRemuxerProgress (float progress)
{
if (progress == 1) {
- Application.Invoke (delegate {Stop ();});
+ Application.Invoke (delegate {
+ Stop ();
+ });
}
}
-
- static protected string GetExtension (VideoMuxerType muxer) {
+
+ static protected string GetExtension (VideoMuxerType muxer)
+ {
switch (muxer) {
case VideoMuxerType.Avi:
return "avi";
@@ -147,34 +154,38 @@ namespace LongoMatch.Video.Utils
case VideoMuxerType.WebM:
return "webm";
}
- throw new Exception("Muxer format not supported");
+ throw new Exception ("Muxer format not supported");
}
-
- private bool Update() {
- pb.Pulse();
+
+ private bool Update ()
+ {
+ pb.Pulse ();
return true;
}
-
- private void Stop() {
+
+ private void Stop ()
+ {
GLib.Source.Remove (timeout);
- dialog.Destroy();
+ dialog.Destroy ();
}
-
- void Cancel() {
+
+ void Cancel ()
+ {
cancelled = true;
- Stop();
+ Stop ();
}
-
- public static bool AskForConversion(Window parent) {
+
+ public static bool AskForConversion (Window parent)
+ {
bool ret;
- MessageDialog md = new MessageDialog(parent, DialogFlags.Modal, MessageType.Question,
- ButtonsType.YesNo,
- Catalog.GetString("The file you are trying to
load is not properly " +
- "supported. Would you like to convert it into
a more suitable " +
- "format?"));
+ MessageDialog md = new MessageDialog (parent, DialogFlags.Modal, MessageType.Question,
+ ButtonsType.YesNo,
+ Catalog.GetString ("The file you are trying to load is not
properly " +
+ "supported. Would you like to convert it into a more
suitable " +
+ "format?"));
md.TransientFor = parent;
- ret = md.Run() == (int)ResponseType.Yes;
- md.Destroy();
+ ret = md.Run () == (int)ResponseType.Yes;
+ md.Destroy ();
return ret;
}
diff --git a/LongoMatch.GUI.Multimedia/Gui/VideoWindow.cs b/LongoMatch.GUI.Multimedia/Gui/VideoWindow.cs
index b5d1393..f5d0aad 100644
--- a/LongoMatch.GUI.Multimedia/Gui/VideoWindow.cs
+++ b/LongoMatch.GUI.Multimedia/Gui/VideoWindow.cs
@@ -20,10 +20,11 @@ using Gtk;
namespace LongoMatch.Gui
{
- [System.ComponentModel.ToolboxItem(true)]
+ [System.ComponentModel.ToolboxItem (true)]
public partial class VideoWindow : Gtk.Bin
{
AspectFrame frame;
+
public event EventHandler ReadyEvent;
public new event ExposeEventHandler ExposeEvent;
public new event ButtonPressEventHandler ButtonPressEvent;
@@ -97,7 +98,7 @@ namespace LongoMatch.Gui
{
}
-
+
public DrawingArea Window {
get;
protected set;
diff --git a/LongoMatch.GUI.Multimedia/Gui/VolumeWindow.cs b/LongoMatch.GUI.Multimedia/Gui/VolumeWindow.cs
index 6819763..2f5eba1 100644
--- a/LongoMatch.GUI.Multimedia/Gui/VolumeWindow.cs
+++ b/LongoMatch.GUI.Multimedia/Gui/VolumeWindow.cs
@@ -29,7 +29,7 @@ namespace LongoMatch.Gui
public event VolumeChangedHandler VolumeChanged;
public VolumeWindow () :
- base(Gtk.WindowType.Toplevel)
+ base (Gtk.WindowType.Toplevel)
{
this.Build ();
volumescale.Adjustment.PageIncrement = 0.0001;
diff --git a/LongoMatch.GUI.Multimedia/MultimediaToolkit.cs b/LongoMatch.GUI.Multimedia/MultimediaToolkit.cs
index d1ebf6c..b24c93e 100644
--- a/LongoMatch.GUI.Multimedia/MultimediaToolkit.cs
+++ b/LongoMatch.GUI.Multimedia/MultimediaToolkit.cs
@@ -29,11 +29,12 @@ namespace LongoMatch.Video
public class MultimediaToolkit:MultimediaFactory, IMultimediaToolkit
{
- public string RemuxFile (MediaFile file, object window) {
+ public string RemuxFile (MediaFile file, object window)
+ {
string outputFile = Config.GUIToolkit.SaveFile (Catalog.GetString ("Output file"),
- Path.ChangeExtension (file.FilePath,
".mp4"),
- Path.GetDirectoryName (file.FilePath),
- "MP4 (.mp4)", new string[] { ".mp4"});
+ Path.ChangeExtension (file.FilePath, ".mp4"),
+ Path.GetDirectoryName (file.FilePath),
+ "MP4 (.mp4)", new string[] { ".mp4" });
outputFile = Path.ChangeExtension (outputFile, ".mp4");
Utils.Remuxer remuxer = new Utils.Remuxer (file, outputFile, VideoMuxerType.Mp4);
return remuxer.Remux (window as Gtk.Window);
diff --git a/LongoMatch.GUI.Multimedia/gtk-gui/objects.xml b/LongoMatch.GUI.Multimedia/gtk-gui/objects.xml
index 808b074..b56c9ce 100644
--- a/LongoMatch.GUI.Multimedia/gtk-gui/objects.xml
+++ b/LongoMatch.GUI.Multimedia/gtk-gui/objects.xml
@@ -13,6 +13,7 @@
<property name="CloseAlwaysVisible" />
<property name="Sensitive" />
<property name="Volume" />
+ <property name="IgnoreTicks" />
</itemgroup>
</itemgroups>
<signals>
@@ -20,14 +21,20 @@
<signal name="Tick" />
<signal name="PlayStateChanged" />
<signal name="CloseEvent" />
+ <signal name="PrepareLoadEvent" />
+ <signal name="TimeChangedEvent" />
+ <signal name="PlaybackStateChangedEvent" />
+ <signal name="LoadImageEvent" />
+ <signal name="PlaybackRateChangedEvent" />
+ <signal name="VolumeChangedEvent" />
+ <signal name="ElementLoadedEvent" />
+ <signal name="ElementUnloadedEvent" />
+ <signal name="PARChangedEvent" />
</itemgroup>
</signals>
</object>
<object type="LongoMatch.Gui.PlayerCapturerBin" palette-category="General" allow-children="false"
base-type="Gtk.Bin">
<itemgroups>
- <itemgroup label="IPlayerBin Properties">
- <property name="Sensitive" />
- </itemgroup>
</itemgroups>
<signals>
<itemgroup label="IPlayerBin Signals">
diff --git a/LongoMatch.GUI/gtk-gui/objects.xml b/LongoMatch.GUI/gtk-gui/objects.xml
index fbae7fc..a38eb9d 100644
--- a/LongoMatch.GUI/gtk-gui/objects.xml
+++ b/LongoMatch.GUI/gtk-gui/objects.xml
@@ -303,6 +303,7 @@
<property name="CloseAlwaysVisible" />
<property name="Sensitive" />
<property name="Volume" />
+ <property name="IgnoreTicks" />
</itemgroup>
</itemgroups>
<signals>
@@ -310,14 +311,20 @@
<signal name="Tick" />
<signal name="PlayStateChanged" />
<signal name="CloseEvent" />
+ <signal name="PrepareLoadEvent" />
+ <signal name="TimeChangedEvent" />
+ <signal name="PlaybackStateChangedEvent" />
+ <signal name="LoadImageEvent" />
+ <signal name="PlaybackRateChangedEvent" />
+ <signal name="VolumeChangedEvent" />
+ <signal name="ElementLoadedEvent" />
+ <signal name="ElementUnloadedEvent" />
+ <signal name="PARChangedEvent" />
</itemgroup>
</signals>
</object>
<object type="LongoMatch.Gui.PlayerCapturerBin" palette-category="General" allow-children="false"
base-type="Gtk.Bin">
<itemgroups>
- <itemgroup label="IPlayerBin Properties">
- <property name="Sensitive" />
- </itemgroup>
</itemgroups>
<signals>
<itemgroup label="IPlayerBin Signals">
diff --git a/LongoMatch.Multimedia/Capturer/FakeCapturer.cs b/LongoMatch.Multimedia/Capturer/FakeCapturer.cs
index b82d790..4467879 100644
--- a/LongoMatch.Multimedia/Capturer/FakeCapturer.cs
+++ b/LongoMatch.Multimedia/Capturer/FakeCapturer.cs
@@ -85,40 +85,40 @@ namespace LongoMatch.Video.Capturer
get {
return 0;
}
- set {}
+ set { }
}
public uint OutputHeight {
get {
- return 0;
+ return 0;
}
- set {}
+ set { }
}
public string OutputFile {
get {
- return Catalog.GetString ("Fake live source");
+ return Catalog.GetString ("Fake live source");
}
- set {}
+ set { }
}
public uint VideoQuality {
get {
- return 0;
+ return 0;
}
- set {}
+ set { }
}
public uint AudioQuality {
get {
- return 0;
+ return 0;
}
- set {}
+ set { }
}
public Image CurrentFrame {
get {
- return null;
+ return null;
}
}
@@ -126,12 +126,12 @@ namespace LongoMatch.Video.Capturer
get {
return "";
}
- set {}
+ set { }
}
public bool SetVideoEncoder (VideoEncoderType type)
{
- return true;
+ return true;
}
public bool SetAudioEncoder (AudioEncoderType type)
@@ -148,8 +148,9 @@ namespace LongoMatch.Video.Capturer
{
return true;
}
-
- public void Expose () {
+
+ public void Expose ()
+ {
}
}
}
diff --git a/LongoMatch.Multimedia/Capturer/GstCameraCapturer.cs
b/LongoMatch.Multimedia/Capturer/GstCameraCapturer.cs
index ed3f8fc..af78c81 100644
--- a/LongoMatch.Multimedia/Capturer/GstCameraCapturer.cs
+++ b/LongoMatch.Multimedia/Capturer/GstCameraCapturer.cs
@@ -29,12 +29,12 @@ using LongoMatch.Video.Common;
using LongoMatch.Core.Store;
using LongoMatch.Core.Handlers;
-namespace LongoMatch.Video.Capturer {
-
-
+namespace LongoMatch.Video.Capturer
+{
#region Autogenerated code
- public class GstCameraCapturer : GLib.Object, ICapturer {
+ public class GstCameraCapturer : GLib.Object, ICapturer
+ {
public event EllpasedTimeHandler EllapsedTime;
public event ErrorHandler Error;
@@ -43,9 +43,10 @@ namespace LongoMatch.Video.Capturer {
private LiveSourceTimer timer;
- [DllImport("libcesarplayer.dll")]
- static extern unsafe IntPtr gst_camera_capturer_new(out IntPtr err);
- [DllImport("libcesarplayer.dll")]
+ [DllImport ("libcesarplayer.dll")]
+ static extern unsafe IntPtr gst_camera_capturer_new (out IntPtr err);
+
+ [DllImport ("libcesarplayer.dll")]
static extern unsafe IntPtr gst_camera_capturer_configure (
IntPtr raw, IntPtr output_file, int type, IntPtr source_element,
IntPtr device_id, int width, int height, int fps_n, int fps_d,
@@ -53,41 +54,53 @@ namespace LongoMatch.Video.Capturer {
uint video_bitrate, uint audio_bitrate, bool record_audio,
uint output_width, uint output_height, IntPtr window_handle,
out IntPtr err);
- [DllImport("libcesarplayer.dll")]
- static extern void gst_camera_capturer_stop(IntPtr raw);
- [DllImport("libcesarplayer.dll")]
- static extern void gst_camera_capturer_toggle_pause(IntPtr raw);
- [DllImport("libcesarplayer.dll")]
- static extern void gst_camera_capturer_start(IntPtr raw);
- [DllImport("libcesarplayer.dll")]
- static extern void gst_camera_capturer_run(IntPtr raw);
- [DllImport("libcesarplayer.dll")]
- static extern void gst_camera_capturer_close(IntPtr raw);
- [DllImport("libcesarplayer.dll")]
- static extern void gst_camera_capturer_expose(IntPtr raw);
- [DllImport("libcesarplayer.dll")]
- static extern IntPtr gst_camera_capturer_get_type();
- [DllImport("libcesarplayer.dll")]
- static extern IntPtr gst_camera_capturer_enum_audio_devices();
- [DllImport("libcesarplayer.dll")]
- static extern IntPtr gst_camera_capturer_enum_video_devices(string devname);
- [DllImport("libcesarplayer.dll")]
- static extern IntPtr gst_camera_capturer_get_current_frame(IntPtr raw);
- [DllImport("libcesarplayer.dll")]
- static extern IntPtr gst_camera_capturer_unref_pixbuf(IntPtr raw);
-
- public unsafe GstCameraCapturer(string filename) : base(IntPtr.Zero)
+
+ [DllImport ("libcesarplayer.dll")]
+ static extern void gst_camera_capturer_stop (IntPtr raw);
+
+ [DllImport ("libcesarplayer.dll")]
+ static extern void gst_camera_capturer_toggle_pause (IntPtr raw);
+
+ [DllImport ("libcesarplayer.dll")]
+ static extern void gst_camera_capturer_start (IntPtr raw);
+
+ [DllImport ("libcesarplayer.dll")]
+ static extern void gst_camera_capturer_run (IntPtr raw);
+
+ [DllImport ("libcesarplayer.dll")]
+ static extern void gst_camera_capturer_close (IntPtr raw);
+
+ [DllImport ("libcesarplayer.dll")]
+ static extern void gst_camera_capturer_expose (IntPtr raw);
+
+ [DllImport ("libcesarplayer.dll")]
+ static extern IntPtr gst_camera_capturer_get_type ();
+
+ [DllImport ("libcesarplayer.dll")]
+ static extern IntPtr gst_camera_capturer_enum_audio_devices ();
+
+ [DllImport ("libcesarplayer.dll")]
+ static extern IntPtr gst_camera_capturer_enum_video_devices (string devname);
+
+ [DllImport ("libcesarplayer.dll")]
+ static extern IntPtr gst_camera_capturer_get_current_frame (IntPtr raw);
+
+ [DllImport ("libcesarplayer.dll")]
+ static extern IntPtr gst_camera_capturer_unref_pixbuf (IntPtr raw);
+
+ public unsafe GstCameraCapturer (string filename) : base (IntPtr.Zero)
{
- if(GetType() != typeof(GstCameraCapturer)) {
- throw new InvalidOperationException("Can't override this constructor.");
+ if (GetType () != typeof(GstCameraCapturer)) {
+ throw new InvalidOperationException ("Can't override this constructor.");
}
IntPtr error = IntPtr.Zero;
Raw = gst_camera_capturer_new (out error);
- if(error != IntPtr.Zero) throw new GLib.GException(error);
+ if (error != IntPtr.Zero)
+ throw new GLib.GException (error);
- timer = new LiveSourceTimer();
+ timer = new LiveSourceTimer ();
timer.EllapsedTime += delegate(Time ellapsedTime) {
- if(EllapsedTime != null)
+ if (EllapsedTime != null)
EllapsedTime (ellapsedTime);
};
@@ -110,194 +123,194 @@ namespace LongoMatch.Video.Capturer {
};
}
-#pragma warning disable 0169
- [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
- delegate void ErrorSignalDelegate(IntPtr arg0, IntPtr arg1, IntPtr gch);
+ #pragma warning disable 0169
+ [UnmanagedFunctionPointer (CallingConvention.Cdecl)]
+ delegate void ErrorSignalDelegate (IntPtr arg0,IntPtr arg1,IntPtr gch);
- static void ErrorSignalCallback(IntPtr arg0, IntPtr arg1, IntPtr gch)
+ static void ErrorSignalCallback (IntPtr arg0, IntPtr arg1, IntPtr gch)
{
- ErrorArgs args = new ErrorArgs();
+ ErrorArgs args = new ErrorArgs ();
try {
- GLib.Signal sig = ((GCHandle) gch).Target as GLib.Signal;
- if(sig == null)
- throw new Exception("Unknown signal GC handle received " + gch);
+ GLib.Signal sig = ((GCHandle)gch).Target as GLib.Signal;
+ if (sig == null)
+ throw new Exception ("Unknown signal GC handle received " + gch);
args.Args = new object[1];
- args.Args[0] = GLib.Marshaller.Utf8PtrToString(arg1);
- GlibErrorHandler handler = (GlibErrorHandler) sig.Handler;
- handler(GLib.Object.GetObject(arg0), args);
- } catch(Exception e) {
- GLib.ExceptionManager.RaiseUnhandledException(e, false);
+ args.Args [0] = GLib.Marshaller.Utf8PtrToString (arg1);
+ GlibErrorHandler handler = (GlibErrorHandler)sig.Handler;
+ handler (GLib.Object.GetObject (arg0), args);
+ } catch (Exception e) {
+ GLib.ExceptionManager.RaiseUnhandledException (e, false);
}
}
- [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
- delegate void ErrorVMDelegate(IntPtr gcc, IntPtr message);
+ [UnmanagedFunctionPointer (CallingConvention.Cdecl)]
+ delegate void ErrorVMDelegate (IntPtr gcc,IntPtr message);
static ErrorVMDelegate ErrorVMCallback;
- static void error_cb(IntPtr gcc, IntPtr message)
+ static void error_cb (IntPtr gcc, IntPtr message)
{
try {
- GstCameraCapturer gcc_managed = GLib.Object.GetObject(gcc, false) as
GstCameraCapturer;
- gcc_managed.OnError(GLib.Marshaller.Utf8PtrToString(message));
- } catch(Exception e) {
- GLib.ExceptionManager.RaiseUnhandledException(e, false);
+ GstCameraCapturer gcc_managed = GLib.Object.GetObject (gcc, false) as
GstCameraCapturer;
+ gcc_managed.OnError (GLib.Marshaller.Utf8PtrToString (message));
+ } catch (Exception e) {
+ GLib.ExceptionManager.RaiseUnhandledException (e, false);
}
}
- private static void OverrideError(GLib.GType gtype)
+ private static void OverrideError (GLib.GType gtype)
{
- if(ErrorVMCallback == null)
- ErrorVMCallback = new ErrorVMDelegate(error_cb);
- OverrideVirtualMethod(gtype, "error", ErrorVMCallback);
+ if (ErrorVMCallback == null)
+ ErrorVMCallback = new ErrorVMDelegate (error_cb);
+ OverrideVirtualMethod (gtype, "error", ErrorVMCallback);
}
- [GLib.DefaultSignalHandler(Type=typeof(LongoMatch.Video.Capturer.GstCameraCapturer),
ConnectionMethod="OverrideError")]
- protected virtual void OnError(string message)
+ [GLib.DefaultSignalHandler (Type = typeof(LongoMatch.Video.Capturer.GstCameraCapturer),
ConnectionMethod = "OverrideError")]
+ protected virtual void OnError (string message)
{
GLib.Value ret = GLib.Value.Empty;
- GLib.ValueArray inst_and_params = new GLib.ValueArray(2);
+ GLib.ValueArray inst_and_params = new GLib.ValueArray (2);
GLib.Value[] vals = new GLib.Value [2];
- vals [0] = new GLib.Value(this);
- inst_and_params.Append(vals [0]);
- vals [1] = new GLib.Value(message);
- inst_and_params.Append(vals [1]);
- g_signal_chain_from_overridden(inst_and_params.ArrayPtr, ref ret);
- foreach(GLib.Value v in vals)
- v.Dispose();
+ vals [0] = new GLib.Value (this);
+ inst_and_params.Append (vals [0]);
+ vals [1] = new GLib.Value (message);
+ inst_and_params.Append (vals [1]);
+ g_signal_chain_from_overridden (inst_and_params.ArrayPtr, ref ret);
+ foreach (GLib.Value v in vals)
+ v.Dispose ();
}
- [GLib.Signal("error")]
+ [GLib.Signal ("error")]
public event GlibErrorHandler GlibError {
add {
- GLib.Signal sig = GLib.Signal.Lookup(this, "error", new
ErrorSignalDelegate(ErrorSignalCallback));
- sig.AddDelegate(value);
+ GLib.Signal sig = GLib.Signal.Lookup (this, "error", new ErrorSignalDelegate
(ErrorSignalCallback));
+ sig.AddDelegate (value);
}
remove {
- GLib.Signal sig = GLib.Signal.Lookup(this, "error", new
ErrorSignalDelegate(ErrorSignalCallback));
- sig.RemoveDelegate(value);
+ GLib.Signal sig = GLib.Signal.Lookup (this, "error", new ErrorSignalDelegate
(ErrorSignalCallback));
+ sig.RemoveDelegate (value);
}
}
- [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
- delegate void DeviceChangeSignalDelegate(IntPtr arg0, int arg1, IntPtr gch);
+ [UnmanagedFunctionPointer (CallingConvention.Cdecl)]
+ delegate void DeviceChangeSignalDelegate (IntPtr arg0,int arg1,IntPtr gch);
- static void DeviceChangeSignalCallback(IntPtr arg0, int arg1, IntPtr gch)
+ static void DeviceChangeSignalCallback (IntPtr arg0, int arg1, IntPtr gch)
{
- DeviceChangeArgs args = new DeviceChangeArgs();
+ DeviceChangeArgs args = new DeviceChangeArgs ();
try {
- GLib.Signal sig = ((GCHandle) gch).Target as GLib.Signal;
- if(sig == null)
- throw new Exception("Unknown signal GC handle received " + gch);
+ GLib.Signal sig = ((GCHandle)gch).Target as GLib.Signal;
+ if (sig == null)
+ throw new Exception ("Unknown signal GC handle received " + gch);
args.Args = new object[1];
- args.Args[0] = arg1;
- GlibDeviceChangeHandler handler = (GlibDeviceChangeHandler) sig.Handler;
- handler(GLib.Object.GetObject(arg0), args);
- } catch(Exception e) {
- GLib.ExceptionManager.RaiseUnhandledException(e, false);
+ args.Args [0] = arg1;
+ GlibDeviceChangeHandler handler = (GlibDeviceChangeHandler)sig.Handler;
+ handler (GLib.Object.GetObject (arg0), args);
+ } catch (Exception e) {
+ GLib.ExceptionManager.RaiseUnhandledException (e, false);
}
}
- [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
- delegate void DeviceChangeVMDelegate(IntPtr gcc, int deviceChange);
+ [UnmanagedFunctionPointer (CallingConvention.Cdecl)]
+ delegate void DeviceChangeVMDelegate (IntPtr gcc,int deviceChange);
static DeviceChangeVMDelegate DeviceChangeVMCallback;
- static void device_change_cb(IntPtr gcc, int deviceChange)
+ static void device_change_cb (IntPtr gcc, int deviceChange)
{
try {
- GstCameraCapturer gcc_managed = GLib.Object.GetObject(gcc, false) as
GstCameraCapturer;
- gcc_managed.OnDeviceChange(deviceChange);
- } catch(Exception e) {
- GLib.ExceptionManager.RaiseUnhandledException(e, false);
+ GstCameraCapturer gcc_managed = GLib.Object.GetObject (gcc, false) as
GstCameraCapturer;
+ gcc_managed.OnDeviceChange (deviceChange);
+ } catch (Exception e) {
+ GLib.ExceptionManager.RaiseUnhandledException (e, false);
}
}
- private static void OverrideDeviceChange(GLib.GType gtype)
+ private static void OverrideDeviceChange (GLib.GType gtype)
{
- if(DeviceChangeVMCallback == null)
- DeviceChangeVMCallback = new DeviceChangeVMDelegate(device_change_cb);
- OverrideVirtualMethod(gtype, "device_change", DeviceChangeVMCallback);
+ if (DeviceChangeVMCallback == null)
+ DeviceChangeVMCallback = new DeviceChangeVMDelegate (device_change_cb);
+ OverrideVirtualMethod (gtype, "device_change", DeviceChangeVMCallback);
}
- [GLib.DefaultSignalHandler(Type=typeof(LongoMatch.Video.Capturer.GstCameraCapturer),
ConnectionMethod="OverrideDeviceChange")]
- protected virtual void OnDeviceChange(int deviceChange)
+ [GLib.DefaultSignalHandler (Type = typeof(LongoMatch.Video.Capturer.GstCameraCapturer),
ConnectionMethod = "OverrideDeviceChange")]
+ protected virtual void OnDeviceChange (int deviceChange)
{
GLib.Value ret = GLib.Value.Empty;
- GLib.ValueArray inst_and_params = new GLib.ValueArray(2);
+ GLib.ValueArray inst_and_params = new GLib.ValueArray (2);
GLib.Value[] vals = new GLib.Value [2];
- vals [0] = new GLib.Value(this);
- inst_and_params.Append(vals [0]);
- vals [1] = new GLib.Value(deviceChange);
- inst_and_params.Append(vals [1]);
- g_signal_chain_from_overridden(inst_and_params.ArrayPtr, ref ret);
- foreach(GLib.Value v in vals)
- v.Dispose();
+ vals [0] = new GLib.Value (this);
+ inst_and_params.Append (vals [0]);
+ vals [1] = new GLib.Value (deviceChange);
+ inst_and_params.Append (vals [1]);
+ g_signal_chain_from_overridden (inst_and_params.ArrayPtr, ref ret);
+ foreach (GLib.Value v in vals)
+ v.Dispose ();
}
- [GLib.Signal("device_change")]
+ [GLib.Signal ("device_change")]
public event GlibDeviceChangeHandler GlibDeviceChange {
add {
- GLib.Signal sig = GLib.Signal.Lookup(this, "device_change", new
DeviceChangeSignalDelegate(DeviceChangeSignalCallback));
- sig.AddDelegate(value);
+ GLib.Signal sig = GLib.Signal.Lookup (this, "device_change", new
DeviceChangeSignalDelegate (DeviceChangeSignalCallback));
+ sig.AddDelegate (value);
}
remove {
- GLib.Signal sig = GLib.Signal.Lookup(this, "device_change", new
DeviceChangeSignalDelegate(DeviceChangeSignalCallback));
- sig.RemoveDelegate(value);
+ GLib.Signal sig = GLib.Signal.Lookup (this, "device_change", new
DeviceChangeSignalDelegate (DeviceChangeSignalCallback));
+ sig.RemoveDelegate (value);
}
}
- [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
- delegate void EosVMDelegate(IntPtr gcc);
+ [UnmanagedFunctionPointer (CallingConvention.Cdecl)]
+ delegate void EosVMDelegate (IntPtr gcc);
static EosVMDelegate EosVMCallback;
- static void eos_cb(IntPtr gcc)
+ static void eos_cb (IntPtr gcc)
{
try {
- GstCameraCapturer gcc_managed = GLib.Object.GetObject(gcc, false) as
GstCameraCapturer;
- gcc_managed.OnEos();
- } catch(Exception e) {
- GLib.ExceptionManager.RaiseUnhandledException(e, false);
+ GstCameraCapturer gcc_managed = GLib.Object.GetObject (gcc, false) as
GstCameraCapturer;
+ gcc_managed.OnEos ();
+ } catch (Exception e) {
+ GLib.ExceptionManager.RaiseUnhandledException (e, false);
}
}
- private static void OverrideEos(GLib.GType gtype)
+ private static void OverrideEos (GLib.GType gtype)
{
- if(EosVMCallback == null)
- EosVMCallback = new EosVMDelegate(eos_cb);
- OverrideVirtualMethod(gtype, "eos", EosVMCallback);
+ if (EosVMCallback == null)
+ EosVMCallback = new EosVMDelegate (eos_cb);
+ OverrideVirtualMethod (gtype, "eos", EosVMCallback);
}
- [GLib.DefaultSignalHandler(Type=typeof(LongoMatch.Video.Capturer.GstCameraCapturer),
ConnectionMethod="OverrideEos")]
- protected virtual void OnEos()
+ [GLib.DefaultSignalHandler (Type = typeof(LongoMatch.Video.Capturer.GstCameraCapturer),
ConnectionMethod = "OverrideEos")]
+ protected virtual void OnEos ()
{
GLib.Value ret = GLib.Value.Empty;
- GLib.ValueArray inst_and_params = new GLib.ValueArray(1);
+ GLib.ValueArray inst_and_params = new GLib.ValueArray (1);
GLib.Value[] vals = new GLib.Value [1];
- vals [0] = new GLib.Value(this);
- inst_and_params.Append(vals [0]);
- g_signal_chain_from_overridden(inst_and_params.ArrayPtr, ref ret);
- foreach(GLib.Value v in vals)
- v.Dispose();
+ vals [0] = new GLib.Value (this);
+ inst_and_params.Append (vals [0]);
+ g_signal_chain_from_overridden (inst_and_params.ArrayPtr, ref ret);
+ foreach (GLib.Value v in vals)
+ v.Dispose ();
}
- [GLib.Signal("eos")]
+ [GLib.Signal ("eos")]
public event System.EventHandler Eos {
add {
- GLib.Signal sig = GLib.Signal.Lookup(this, "eos");
- sig.AddDelegate(value);
+ GLib.Signal sig = GLib.Signal.Lookup (this, "eos");
+ sig.AddDelegate (value);
}
remove {
- GLib.Signal sig = GLib.Signal.Lookup(this, "eos");
- sig.RemoveDelegate(value);
+ GLib.Signal sig = GLib.Signal.Lookup (this, "eos");
+ sig.RemoveDelegate (value);
}
}
-
+
[UnmanagedFunctionPointer (CallingConvention.Cdecl)]
- delegate void MediaInfoVMDelegate (IntPtr gcc, int width, int height, int par_n, int par_d);
+ delegate void MediaInfoVMDelegate (IntPtr gcc,int width,int height,int par_n,int par_d);
static MediaInfoVMDelegate MediaInfoVMCallback;
@@ -318,7 +331,7 @@ namespace LongoMatch.Video.Capturer {
OverrideVirtualMethod (gtype, "media-info", MediaInfoVMCallback);
}
- [GLib.DefaultSignalHandler(Type=typeof(GstCameraCapturer),
ConnectionMethod="OverrideMediaInfo")]
+ [GLib.DefaultSignalHandler (Type = typeof(GstCameraCapturer), ConnectionMethod =
"OverrideMediaInfo")]
protected virtual void OnMediaInfo (int width, int height, int par_n, int par_d)
{
GLib.Value ret = GLib.Value.Empty;
@@ -339,7 +352,7 @@ namespace LongoMatch.Video.Capturer {
v.Dispose ();
}
- [GLib.Signal("media-info")]
+ [GLib.Signal ("media-info")]
public event GlibMediaInfoHandler GlibMediaInfo {
add {
GLib.Signal sig = GLib.Signal.Lookup (this, "media-info",
typeof(MediaInfoArgs));
@@ -351,9 +364,10 @@ namespace LongoMatch.Video.Capturer {
}
}
-#pragma warning restore 0169
+ #pragma warning restore 0169
- public void Configure (CaptureSettings settings, IntPtr window_handle) {
+ public void Configure (CaptureSettings settings, IntPtr window_handle)
+ {
IntPtr err = IntPtr.Zero;
EncodingQuality qual = settings.EncodingSettings.EncodingQuality;
Device device = settings.Device;
@@ -369,29 +383,32 @@ namespace LongoMatch.Video.Capturer {
sourceElement = Marshaller.StringToPtrGStrdup (device.SourceElement);
deviceID = Marshaller.StringToPtrGStrdup (device.ID);
- gst_camera_capturer_configure (Handle, outFile, (int) settings.Device.DeviceType,
- sourceElement, deviceID,
- format.width, format.height, format.fps_n,
format.fps_d,
- (int) enc.VideoEncoder, (int) enc.AudioEncoder,
- (int) enc.Muxer, qual.VideoQuality,
- qual.AudioQuality,
- settings.EncodingSettings.EnableAudio,
- std.Width, std.Height, window_handle,
- out err);
+ gst_camera_capturer_configure (Handle, outFile, (int)settings.Device.DeviceType,
+ sourceElement, deviceID,
+ format.width, format.height, format.fps_n, format.fps_d,
+ (int)enc.VideoEncoder, (int)enc.AudioEncoder,
+ (int)enc.Muxer, qual.VideoQuality,
+ qual.AudioQuality,
+ settings.EncodingSettings.EnableAudio,
+ std.Width, std.Height, window_handle,
+ out err);
Marshaller.Free (outFile);
Marshaller.Free (sourceElement);
Marshaller.Free (deviceID);
- if(err != IntPtr.Zero) throw new GLib.GException(err);
+ if (err != IntPtr.Zero)
+ throw new GLib.GException (err);
}
-
- public void Stop() {
- timer.Stop();
- gst_camera_capturer_stop(Handle);
+
+ public void Stop ()
+ {
+ timer.Stop ();
+ gst_camera_capturer_stop (Handle);
}
- public void TogglePause() {
- timer.TogglePause();
- gst_camera_capturer_toggle_pause(Handle);
+ public void TogglePause ()
+ {
+ timer.TogglePause ();
+ gst_camera_capturer_toggle_pause (Handle);
}
public Time CurrentTime {
@@ -400,47 +417,52 @@ namespace LongoMatch.Video.Capturer {
}
}
- public void Start() {
- timer.Start();
- gst_camera_capturer_start(Handle);
+ public void Start ()
+ {
+ timer.Start ();
+ gst_camera_capturer_start (Handle);
}
- public void Run() {
- gst_camera_capturer_run(Handle);
+ public void Run ()
+ {
+ gst_camera_capturer_run (Handle);
}
- public void Close() {
- gst_camera_capturer_close(Handle);
+ public void Close ()
+ {
+ gst_camera_capturer_close (Handle);
}
- public void Expose() {
- gst_camera_capturer_expose(Handle);
+ public void Expose ()
+ {
+ gst_camera_capturer_expose (Handle);
}
public Image CurrentFrame {
get {
- IntPtr raw_ret = gst_camera_capturer_get_current_frame(Handle);
- Gdk.Pixbuf p = GLib.Object.GetObject(raw_ret) as Gdk.Pixbuf;
+ IntPtr raw_ret = gst_camera_capturer_get_current_frame (Handle);
+ Gdk.Pixbuf p = GLib.Object.GetObject (raw_ret) as Gdk.Pixbuf;
/* The refcount for p is now 2. We need to decrease the counter to 1
* so that p.Dipose() sets it to 0 and triggers the pixbuf destroy function
* that frees the associated data*/
- gst_camera_capturer_unref_pixbuf(raw_ret);
+ gst_camera_capturer_unref_pixbuf (raw_ret);
return new Image (p);
}
}
public static new GLib.GType GType {
get {
- IntPtr raw_ret = gst_camera_capturer_get_type();
- GLib.GType ret = new GLib.GType(raw_ret);
+ IntPtr raw_ret = gst_camera_capturer_get_type ();
+ GLib.GType ret = new GLib.GType (raw_ret);
return ret;
}
}
- static GstCameraCapturer()
+ static GstCameraCapturer ()
{
- LongoMatch.GtkSharp.Capturer.ObjectManager.Initialize();
+ LongoMatch.GtkSharp.Capturer.ObjectManager.Initialize ();
}
+
#endregion
}
diff --git a/LongoMatch.Multimedia/Converter/GstVideoConverter.cs
b/LongoMatch.Multimedia/Converter/GstVideoConverter.cs
index 667209a..4a160f2 100644
--- a/LongoMatch.Multimedia/Converter/GstVideoConverter.cs
+++ b/LongoMatch.Multimedia/Converter/GstVideoConverter.cs
@@ -17,39 +17,47 @@
//
using LongoMatch.Core.Common;
-namespace LongoMatch.Video.Converter {
+namespace LongoMatch.Video.Converter
+{
using System;
using System.Runtime.InteropServices;
using LongoMatch.Core.Interfaces.Multimedia;
using LongoMatch.Video.Common;
-
+
#region Autogenerated code
- public class GstVideoConverter: GLib.Object, IVideoConverter {
+ public class GstVideoConverter: GLib.Object, IVideoConverter
+ {
public event LongoMatch.Core.Handlers.ProgressHandler Progress;
public event LongoMatch.Core.Handlers.ErrorHandler Error;
- [DllImport("libcesarplayer.dll")]
- static extern unsafe IntPtr gst_video_encoder_new(IntPtr filename, out IntPtr err);
-
+ [DllImport ("libcesarplayer.dll")]
+ static extern unsafe IntPtr gst_video_encoder_new (IntPtr filename, out IntPtr err);
+
[Obsolete]
- protected GstVideoConverter(GLib.GType gtype) : base(gtype) {}
- public GstVideoConverter(IntPtr raw) : base(raw) {}
+ protected GstVideoConverter (GLib.GType gtype) : base (gtype)
+ {
+ }
- public unsafe GstVideoConverter(string filename) : base(IntPtr.Zero)
+ public GstVideoConverter (IntPtr raw) : base (raw)
{
- if(GetType() != typeof(GstVideoConverter)) {
- throw new InvalidOperationException("Can't override this constructor.");
+ }
+
+ public unsafe GstVideoConverter (string filename) : base (IntPtr.Zero)
+ {
+ if (GetType () != typeof(GstVideoConverter)) {
+ throw new InvalidOperationException ("Can't override this constructor.");
}
IntPtr error = IntPtr.Zero;
- Raw = gst_video_encoder_new (GLib.Marshaller.StringToPtrGStrdup(filename), out error);
- if(error != IntPtr.Zero) throw new GLib.GException(error);
+ Raw = gst_video_encoder_new (GLib.Marshaller.StringToPtrGStrdup (filename), out
error);
+ if (error != IntPtr.Zero)
+ throw new GLib.GException (error);
PercentCompleted += delegate(object o, PercentCompletedArgs args) {
- if(Progress!= null)
- Progress(args.Percent);
+ if (Progress != null)
+ Progress (args.Percent);
};
InternalError += delegate(object o, ErrorArgs args) {
if (Error != null)
@@ -57,199 +65,204 @@ namespace LongoMatch.Video.Converter {
};
}
-#pragma warning disable 0169
- [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
- delegate void ErrorSignalDelegate(IntPtr arg0, IntPtr arg1, IntPtr gch);
+ #pragma warning disable 0169
+ [UnmanagedFunctionPointer (CallingConvention.Cdecl)]
+ delegate void ErrorSignalDelegate (IntPtr arg0,IntPtr arg1,IntPtr gch);
- static void ErrorSignalCallback(IntPtr arg0, IntPtr arg1, IntPtr gch)
+ static void ErrorSignalCallback (IntPtr arg0, IntPtr arg1, IntPtr gch)
{
- ErrorArgs args = new ErrorArgs();
+ ErrorArgs args = new ErrorArgs ();
try {
- GLib.Signal sig = ((GCHandle) gch).Target as GLib.Signal;
- if(sig == null)
- throw new Exception("Unknown signal GC handle received " + gch);
+ GLib.Signal sig = ((GCHandle)gch).Target as GLib.Signal;
+ if (sig == null)
+ throw new Exception ("Unknown signal GC handle received " + gch);
args.Args = new object[1];
- args.Args[0] = GLib.Marshaller.Utf8PtrToString(arg1);
- GlibErrorHandler handler = (GlibErrorHandler) sig.Handler;
- handler(GLib.Object.GetObject(arg0), args);
- } catch(Exception e) {
- GLib.ExceptionManager.RaiseUnhandledException(e, false);
+ args.Args [0] = GLib.Marshaller.Utf8PtrToString (arg1);
+ GlibErrorHandler handler = (GlibErrorHandler)sig.Handler;
+ handler (GLib.Object.GetObject (arg0), args);
+ } catch (Exception e) {
+ GLib.ExceptionManager.RaiseUnhandledException (e, false);
}
}
- [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
- delegate void ErrorVMDelegate(IntPtr gcc, IntPtr message);
+ [UnmanagedFunctionPointer (CallingConvention.Cdecl)]
+ delegate void ErrorVMDelegate (IntPtr gcc,IntPtr message);
static ErrorVMDelegate ErrorVMCallback;
- static void error_cb(IntPtr gcc, IntPtr message)
+ static void error_cb (IntPtr gcc, IntPtr message)
{
try {
- GstVideoConverter gcc_managed = GLib.Object.GetObject(gcc, false) as
GstVideoConverter;
- gcc_managed.OnError(GLib.Marshaller.Utf8PtrToString(message));
- } catch(Exception e) {
- GLib.ExceptionManager.RaiseUnhandledException(e, false);
+ GstVideoConverter gcc_managed = GLib.Object.GetObject (gcc, false) as
GstVideoConverter;
+ gcc_managed.OnError (GLib.Marshaller.Utf8PtrToString (message));
+ } catch (Exception e) {
+ GLib.ExceptionManager.RaiseUnhandledException (e, false);
}
}
- private static void OverrideError(GLib.GType gtype)
+ private static void OverrideError (GLib.GType gtype)
{
- if(ErrorVMCallback == null)
- ErrorVMCallback = new ErrorVMDelegate(error_cb);
- OverrideVirtualMethod(gtype, "error", ErrorVMCallback);
+ if (ErrorVMCallback == null)
+ ErrorVMCallback = new ErrorVMDelegate (error_cb);
+ OverrideVirtualMethod (gtype, "error", ErrorVMCallback);
}
- [GLib.DefaultSignalHandler(Type=typeof(LongoMatch.Video.Converter.GstVideoConverter),
ConnectionMethod="OverrideError")]
- protected virtual void OnError(string message)
+ [GLib.DefaultSignalHandler (Type = typeof(LongoMatch.Video.Converter.GstVideoConverter),
ConnectionMethod = "OverrideError")]
+ protected virtual void OnError (string message)
{
GLib.Value ret = GLib.Value.Empty;
- GLib.ValueArray inst_and_params = new GLib.ValueArray(2);
+ GLib.ValueArray inst_and_params = new GLib.ValueArray (2);
GLib.Value[] vals = new GLib.Value [2];
- vals [0] = new GLib.Value(this);
- inst_and_params.Append(vals [0]);
- vals [1] = new GLib.Value(message);
- inst_and_params.Append(vals [1]);
- g_signal_chain_from_overridden(inst_and_params.ArrayPtr, ref ret);
- foreach(GLib.Value v in vals)
- v.Dispose();
+ vals [0] = new GLib.Value (this);
+ inst_and_params.Append (vals [0]);
+ vals [1] = new GLib.Value (message);
+ inst_and_params.Append (vals [1]);
+ g_signal_chain_from_overridden (inst_and_params.ArrayPtr, ref ret);
+ foreach (GLib.Value v in vals)
+ v.Dispose ();
}
- [GLib.Signal("error")]
+ [GLib.Signal ("error")]
public event GlibErrorHandler InternalError {
add {
- GLib.Signal sig = GLib.Signal.Lookup(this, "error", new
ErrorSignalDelegate(ErrorSignalCallback));
- sig.AddDelegate(value);
+ GLib.Signal sig = GLib.Signal.Lookup (this, "error", new ErrorSignalDelegate
(ErrorSignalCallback));
+ sig.AddDelegate (value);
}
remove {
- GLib.Signal sig = GLib.Signal.Lookup(this, "error", new
ErrorSignalDelegate(ErrorSignalCallback));
- sig.RemoveDelegate(value);
+ GLib.Signal sig = GLib.Signal.Lookup (this, "error", new ErrorSignalDelegate
(ErrorSignalCallback));
+ sig.RemoveDelegate (value);
}
}
- [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
- delegate void PercentCompletedVMDelegate(IntPtr gvc, float percent);
+ [UnmanagedFunctionPointer (CallingConvention.Cdecl)]
+ delegate void PercentCompletedVMDelegate (IntPtr gvc,float percent);
static PercentCompletedVMDelegate PercentCompletedVMCallback;
- static void percentcompleted_cb(IntPtr gvc, float percent)
+ static void percentcompleted_cb (IntPtr gvc, float percent)
{
try {
- GstVideoConverter gvc_managed = GLib.Object.GetObject(gvc, false) as
GstVideoConverter;
- gvc_managed.OnPercentCompleted(percent);
- } catch(Exception e) {
- GLib.ExceptionManager.RaiseUnhandledException(e, false);
+ GstVideoConverter gvc_managed = GLib.Object.GetObject (gvc, false) as
GstVideoConverter;
+ gvc_managed.OnPercentCompleted (percent);
+ } catch (Exception e) {
+ GLib.ExceptionManager.RaiseUnhandledException (e, false);
}
}
- private static void OverridePercentCompleted(GLib.GType gtype)
+ private static void OverridePercentCompleted (GLib.GType gtype)
{
- if(PercentCompletedVMCallback == null)
- PercentCompletedVMCallback = new
PercentCompletedVMDelegate(percentcompleted_cb);
- OverrideVirtualMethod(gtype, "percent_completed", PercentCompletedVMCallback);
+ if (PercentCompletedVMCallback == null)
+ PercentCompletedVMCallback = new PercentCompletedVMDelegate
(percentcompleted_cb);
+ OverrideVirtualMethod (gtype, "percent_completed", PercentCompletedVMCallback);
}
- [GLib.DefaultSignalHandler(Type=typeof(LongoMatch.Video.Converter.GstVideoConverter),
ConnectionMethod="OverridePercentCompleted")]
- protected virtual void OnPercentCompleted(float percent)
+ [GLib.DefaultSignalHandler (Type = typeof(LongoMatch.Video.Converter.GstVideoConverter),
ConnectionMethod = "OverridePercentCompleted")]
+ protected virtual void OnPercentCompleted (float percent)
{
GLib.Value ret = GLib.Value.Empty;
- GLib.ValueArray inst_and_params = new GLib.ValueArray(2);
+ GLib.ValueArray inst_and_params = new GLib.ValueArray (2);
GLib.Value[] vals = new GLib.Value [2];
- vals [0] = new GLib.Value(this);
- inst_and_params.Append(vals [0]);
- vals [1] = new GLib.Value(percent);
- inst_and_params.Append(vals [1]);
- g_signal_chain_from_overridden(inst_and_params.ArrayPtr, ref ret);
- foreach(GLib.Value v in vals)
- v.Dispose();
+ vals [0] = new GLib.Value (this);
+ inst_and_params.Append (vals [0]);
+ vals [1] = new GLib.Value (percent);
+ inst_and_params.Append (vals [1]);
+ g_signal_chain_from_overridden (inst_and_params.ArrayPtr, ref ret);
+ foreach (GLib.Value v in vals)
+ v.Dispose ();
}
- [GLib.Signal("percent_completed")]
+ [GLib.Signal ("percent_completed")]
public event GlibPercentCompletedHandler PercentCompleted {
add {
- GLib.Signal sig = GLib.Signal.Lookup(this, "percent_completed",
typeof(PercentCompletedArgs));
- sig.AddDelegate(value);
+ GLib.Signal sig = GLib.Signal.Lookup (this, "percent_completed",
typeof(PercentCompletedArgs));
+ sig.AddDelegate (value);
}
remove {
- GLib.Signal sig = GLib.Signal.Lookup(this, "percent_completed",
typeof(PercentCompletedArgs));
- sig.RemoveDelegate(value);
+ GLib.Signal sig = GLib.Signal.Lookup (this, "percent_completed",
typeof(PercentCompletedArgs));
+ sig.RemoveDelegate (value);
}
}
-#pragma warning restore 0169
+ #pragma warning restore 0169
- [DllImport("libcesarplayer.dll")]
- static extern void gst_video_encoder_init_backend(out int argc, IntPtr argv);
+ [DllImport ("libcesarplayer.dll")]
+ static extern void gst_video_encoder_init_backend (out int argc, IntPtr argv);
- public static int InitBackend(string argv) {
+ public static int InitBackend (string argv)
+ {
int argc;
- gst_video_encoder_init_backend(out argc, GLib.Marshaller.StringToPtrGStrdup(argv));
+ gst_video_encoder_init_backend (out argc, GLib.Marshaller.StringToPtrGStrdup (argv));
return argc;
}
- [DllImport("libcesarplayer.dll")]
- static extern void gst_video_encoder_cancel(IntPtr raw);
+ [DllImport ("libcesarplayer.dll")]
+ static extern void gst_video_encoder_cancel (IntPtr raw);
- public void Cancel() {
- gst_video_encoder_cancel(Handle);
+ public void Cancel ()
+ {
+ gst_video_encoder_cancel (Handle);
}
- [DllImport("libcesarplayer.dll")]
- static extern void gst_video_encoder_start(IntPtr raw);
+ [DllImport ("libcesarplayer.dll")]
+ static extern void gst_video_encoder_start (IntPtr raw);
- public void Start() {
- gst_video_encoder_start(Handle);
+ public void Start ()
+ {
+ gst_video_encoder_start (Handle);
}
- [DllImport("libcesarplayer.dll")]
- static extern bool gst_video_encoder_set_encoding_format(IntPtr raw,
- VideoEncoderType video_codec,
- AudioEncoderType audio_codec,
- VideoMuxerType muxer,
- uint video_quality,
- uint audio_quality,
- uint width,
- uint height,
- uint fps_n,
- uint fps_d);
-
+ [DllImport ("libcesarplayer.dll")]
+ static extern bool gst_video_encoder_set_encoding_format (IntPtr raw,
+ VideoEncoderType video_codec,
+ AudioEncoderType audio_codec,
+ VideoMuxerType muxer,
+ uint video_quality,
+ uint audio_quality,
+ uint width,
+ uint height,
+ uint fps_n,
+ uint fps_d);
+
public EncodingSettings EncodingSettings {
set {
gst_video_encoder_set_encoding_format (Handle,
- value.EncodingProfile.VideoEncoder,
- value.EncodingProfile.AudioEncoder,
- value.EncodingProfile.Muxer,
- value.EncodingQuality.VideoQuality,
- value.EncodingQuality.AudioQuality,
- value.VideoStandard.Width,
- value.VideoStandard.Height,
- value.Framerate_n,
- value.Framerate_d);
+ value.EncodingProfile.VideoEncoder,
+ value.EncodingProfile.AudioEncoder,
+ value.EncodingProfile.Muxer,
+ value.EncodingQuality.VideoQuality,
+ value.EncodingQuality.AudioQuality,
+ value.VideoStandard.Width,
+ value.VideoStandard.Height,
+ value.Framerate_n,
+ value.Framerate_d);
}
}
-
- [DllImport("libcesarplayer.dll")]
+
+ [DllImport ("libcesarplayer.dll")]
static extern bool gst_video_encoder_add_file (IntPtr raw, IntPtr filename, long duration,
uint width, uint height, double par);
-
- public void AddFile (string filename, long duration, uint width, uint height, double par) {
- IntPtr file = GLib.Marshaller.StringToPtrGStrdup(filename);
+
+ public void AddFile (string filename, long duration, uint width, uint height, double par)
+ {
+ IntPtr file = GLib.Marshaller.StringToPtrGStrdup (filename);
gst_video_encoder_add_file (Handle, file, duration, width, height, par);
}
- [DllImport("libcesarplayer.dll")]
- static extern IntPtr gst_video_encoder_get_type();
+ [DllImport ("libcesarplayer.dll")]
+ static extern IntPtr gst_video_encoder_get_type ();
public static new GLib.GType GType {
get {
- IntPtr raw_ret = gst_video_encoder_get_type();
- GLib.GType ret = new GLib.GType(raw_ret);
+ IntPtr raw_ret = gst_video_encoder_get_type ();
+ GLib.GType ret = new GLib.GType (raw_ret);
return ret;
}
}
- static GstVideoConverter()
+ static GstVideoConverter ()
{
- LongoMatch.GtkSharp.Encoder.ObjectManager.Initialize();
+ LongoMatch.GtkSharp.Encoder.ObjectManager.Initialize ();
}
+
#endregion
}
diff --git a/LongoMatch.Multimedia/Player/GstPlayer.cs b/LongoMatch.Multimedia/Player/GstPlayer.cs
index b12a43b..945f0c1 100644
--- a/LongoMatch.Multimedia/Player/GstPlayer.cs
+++ b/LongoMatch.Multimedia/Player/GstPlayer.cs
@@ -36,78 +36,78 @@ namespace LongoMatch.Video.Player
public event ReadyToSeekHandler ReadyToSeek;
public event EosHandler Eos;
- [DllImport("libcesarplayer.dll")]
+ [DllImport ("libcesarplayer.dll")]
static extern IntPtr lgm_video_player_get_type ();
- [DllImport("libcesarplayer.dll")]
+ [DllImport ("libcesarplayer.dll")]
static extern unsafe IntPtr lgm_video_player_new (int use_type, out IntPtr error);
- [DllImport("libcesarplayer.dll")]
+ [DllImport ("libcesarplayer.dll")]
static extern unsafe IntPtr lgm_video_player_set_window_handle (IntPtr raw, IntPtr
window_handle);
- [DllImport("libcesarplayer.dll")]
+ [DllImport ("libcesarplayer.dll")]
static extern bool lgm_video_player_open (IntPtr raw, IntPtr uri, out IntPtr error);
- [DllImport("libcesarplayer.dll")]
+ [DllImport ("libcesarplayer.dll")]
static extern bool lgm_video_player_play (IntPtr raw);
- [DllImport("libcesarplayer.dll")]
+ [DllImport ("libcesarplayer.dll")]
static extern bool lgm_video_player_is_playing (IntPtr raw);
- [DllImport("libcesarplayer.dll")]
+ [DllImport ("libcesarplayer.dll")]
static extern void lgm_video_player_pause (IntPtr raw);
- [DllImport("libcesarplayer.dll")]
+ [DllImport ("libcesarplayer.dll")]
static extern void lgm_video_player_stop (IntPtr raw);
- [DllImport("libcesarplayer.dll")]
+ [DllImport ("libcesarplayer.dll")]
static extern void lgm_video_player_close (IntPtr raw);
- [DllImport("libcesarplayer.dll")]
+ [DllImport ("libcesarplayer.dll")]
static extern bool lgm_video_player_seek (IntPtr raw, double position);
- [DllImport("libcesarplayer.dll")]
+ [DllImport ("libcesarplayer.dll")]
static extern bool lgm_video_player_seek_time (IntPtr raw, long time, bool accurate, bool
synchronous);
- [DllImport("libcesarplayer.dll")]
+ [DllImport ("libcesarplayer.dll")]
static extern bool lgm_video_player_seek_to_next_frame (IntPtr raw);
- [DllImport("libcesarplayer.dll")]
+ [DllImport ("libcesarplayer.dll")]
static extern bool lgm_video_player_seek_to_previous_frame (IntPtr raw);
- [DllImport("libcesarplayer.dll")]
+ [DllImport ("libcesarplayer.dll")]
static extern double lgm_video_player_get_position (IntPtr raw);
- [DllImport("libcesarplayer.dll")]
+ [DllImport ("libcesarplayer.dll")]
static extern long lgm_video_player_get_current_time (IntPtr raw);
- [DllImport("libcesarplayer.dll")]
+ [DllImport ("libcesarplayer.dll")]
static extern long lgm_video_player_get_stream_length (IntPtr raw);
- [DllImport("libcesarplayer.dll")]
+ [DllImport ("libcesarplayer.dll")]
static extern bool lgm_video_player_set_rate (IntPtr raw, double rate);
- [DllImport("libcesarplayer.dll")]
+ [DllImport ("libcesarplayer.dll")]
static extern void lgm_video_player_set_volume (IntPtr raw, double volume);
- [DllImport("libcesarplayer.dll")]
+ [DllImport ("libcesarplayer.dll")]
static extern double lgm_video_player_get_volume (IntPtr raw);
- [DllImport("libcesarplayer.dll")]
+ [DllImport ("libcesarplayer.dll")]
static extern IntPtr lgm_video_player_get_current_frame (IntPtr raw);
- [DllImport("libcesarplayer.dll")]
+ [DllImport ("libcesarplayer.dll")]
static extern void lgm_video_player_unref_pixbuf (IntPtr pixbuf);
- [DllImport("libcesarplayer.dll")]
+ [DllImport ("libcesarplayer.dll")]
static extern void lgm_video_player_expose (IntPtr pixbuf);
- public unsafe GstPlayer () : base(IntPtr.Zero)
+ public unsafe GstPlayer () : base (IntPtr.Zero)
{
Init (PlayerUseType.Video);
}
- public unsafe GstPlayer (PlayerUseType type) : base(IntPtr.Zero)
+ public unsafe GstPlayer (PlayerUseType type) : base (IntPtr.Zero)
{
Init (type);
}
@@ -135,7 +135,7 @@ namespace LongoMatch.Video.Player
};
this.GlibEos += (sender, e) => {
- if (Eos != null)
+ if (Eos != null)
Eos ();
};
}
@@ -163,7 +163,7 @@ namespace LongoMatch.Video.Player
OverrideVirtualMethod (gtype, "ready_to_seek", ReadyToSeekVMCallback);
}
- [GLib.DefaultSignalHandler(Type=typeof(LongoMatch.Video.Player.GstPlayer),
ConnectionMethod="OverrideReadyToSeek")]
+ [GLib.DefaultSignalHandler (Type = typeof(LongoMatch.Video.Player.GstPlayer),
ConnectionMethod = "OverrideReadyToSeek")]
protected virtual void OnReadyToSeek ()
{
GLib.Value ret = GLib.Value.Empty;
@@ -176,7 +176,7 @@ namespace LongoMatch.Video.Player
v.Dispose ();
}
- [GLib.Signal("ready_to_seek")]
+ [GLib.Signal ("ready_to_seek")]
public event System.EventHandler GlibReadyToSeek {
add {
GLib.Signal sig = GLib.Signal.Lookup (this, "ready_to_seek");
@@ -210,7 +210,7 @@ namespace LongoMatch.Video.Player
OverrideVirtualMethod (gtype, "state_change", StateChangeVMCallback);
}
- [GLib.DefaultSignalHandler(Type=typeof(LongoMatch.Video.Player.GstPlayer),
ConnectionMethod="OverrideStateChange")]
+ [GLib.DefaultSignalHandler (Type = typeof(LongoMatch.Video.Player.GstPlayer),
ConnectionMethod = "OverrideStateChange")]
protected virtual void OnStateChange (bool playing)
{
GLib.Value ret = GLib.Value.Empty;
@@ -225,7 +225,7 @@ namespace LongoMatch.Video.Player
v.Dispose ();
}
- [GLib.Signal("state_change")]
+ [GLib.Signal ("state_change")]
public event GlibStateChangeHandler GlibStateChange {
add {
GLib.Signal sig = GLib.Signal.Lookup (this, "state_change",
typeof(StateChangeArgs));
@@ -259,7 +259,7 @@ namespace LongoMatch.Video.Player
OverrideVirtualMethod (gtype, "eos", EosVMCallback);
}
- [GLib.DefaultSignalHandler(Type=typeof(LongoMatch.Video.Player.GstPlayer),
ConnectionMethod="OverrideEos")]
+ [GLib.DefaultSignalHandler (Type = typeof(LongoMatch.Video.Player.GstPlayer),
ConnectionMethod = "OverrideEos")]
protected virtual void OnEos ()
{
GLib.Value ret = GLib.Value.Empty;
@@ -272,7 +272,7 @@ namespace LongoMatch.Video.Player
v.Dispose ();
}
- [GLib.Signal("eos")]
+ [GLib.Signal ("eos")]
public event System.EventHandler GlibEos {
add {
GLib.Signal sig = GLib.Signal.Lookup (this, "eos");
@@ -306,7 +306,7 @@ namespace LongoMatch.Video.Player
OverrideVirtualMethod (gtype, "error", ErrorVMCallback);
}
- [GLib.DefaultSignalHandler(Type=typeof(LongoMatch.Video.Player.GstPlayer),
ConnectionMethod="OverrideError")]
+ [GLib.DefaultSignalHandler (Type = typeof(LongoMatch.Video.Player.GstPlayer),
ConnectionMethod = "OverrideError")]
protected virtual void OnError (string message)
{
GLib.Value ret = GLib.Value.Empty;
@@ -321,7 +321,7 @@ namespace LongoMatch.Video.Player
v.Dispose ();
}
- [GLib.Signal("error")]
+ [GLib.Signal ("error")]
public event GlibErrorHandler GlibError {
add {
GLib.Signal sig = GLib.Signal.Lookup (this, "error", typeof(ErrorArgs));
@@ -355,7 +355,7 @@ namespace LongoMatch.Video.Player
OverrideVirtualMethod (gtype, "tick", TickVMCallback);
}
- [GLib.DefaultSignalHandler(Type=typeof(LongoMatch.Video.Player.GstPlayer),
ConnectionMethod="OverrideTick")]
+ [GLib.DefaultSignalHandler (Type = typeof(LongoMatch.Video.Player.GstPlayer),
ConnectionMethod = "OverrideTick")]
protected virtual void OnTick (long current_time, long stream_length, double current_position)
{
GLib.Value ret = GLib.Value.Empty;
@@ -374,7 +374,7 @@ namespace LongoMatch.Video.Player
v.Dispose ();
}
- [GLib.Signal("tick")]
+ [GLib.Signal ("tick")]
public event GlibTickHandler GlibTick {
add {
GLib.Signal sig = GLib.Signal.Lookup (this, "tick", typeof(TickArgs));
@@ -402,14 +402,14 @@ namespace LongoMatch.Video.Player
public Time CurrentTime {
get {
long ret = lgm_video_player_get_current_time (Handle);
- return new Time { NSeconds=ret };
+ return new Time { NSeconds = ret };
}
}
public Time StreamLength {
get {
long ret = lgm_video_player_get_stream_length (Handle);
- return new Time { NSeconds=ret };
+ return new Time { NSeconds = ret };
}
}
@@ -476,7 +476,7 @@ namespace LongoMatch.Video.Player
public bool Open (MediaFileSet mfs)
{
- return Open (mfs[0]);
+ return Open (mfs [0]);
}
public bool Open (MediaFile mf)
@@ -486,7 +486,7 @@ namespace LongoMatch.Video.Player
public bool Open (List<string> mrls)
{
- return Open (mrls[0]);
+ return Open (mrls [0]);
}
public bool Open (string mrl)
@@ -501,7 +501,7 @@ namespace LongoMatch.Video.Player
return ret;
}
- public Image GetCurrentFrame (int outwidth=-1, int outheight=-1)
+ public Image GetCurrentFrame (int outwidth = -1, int outheight = -1)
{
Gdk.Pixbuf managed, unmanaged;
IntPtr raw_ret;
@@ -555,7 +555,7 @@ namespace LongoMatch.Video.Player
{
}
- public Image GetFrame (Time pos, bool accurate, int outwidth=-1, int outheight=-1)
+ public Image GetFrame (Time pos, bool accurate, int outwidth = -1, int outheight = -1)
{
Image img = null;
diff --git a/LongoMatch.Multimedia/Remuxer/GstRemuxer.cs b/LongoMatch.Multimedia/Remuxer/GstRemuxer.cs
index 91c46fd..f525cdd 100644
--- a/LongoMatch.Multimedia/Remuxer/GstRemuxer.cs
+++ b/LongoMatch.Multimedia/Remuxer/GstRemuxer.cs
@@ -31,18 +31,18 @@ namespace LongoMatch.Video.Remuxer
public event LongoMatch.Core.Handlers.ProgressHandler Progress;
public event LongoMatch.Core.Handlers.ErrorHandler Error;
- [DllImport("libcesarplayer.dll")]
+ [DllImport ("libcesarplayer.dll")]
static extern unsafe IntPtr gst_remuxer_new (IntPtr input_file, IntPtr output_file,
VideoMuxerType muxer, out IntPtr err);
- public unsafe GstRemuxer (string inputFile, string outputFile, VideoMuxerType muxer) :
base(IntPtr.Zero)
+ public unsafe GstRemuxer (string inputFile, string outputFile, VideoMuxerType muxer) : base
(IntPtr.Zero)
{
if (GetType () != typeof(GstRemuxer)) {
throw new InvalidOperationException ("Can't override this constructor.");
}
IntPtr error = IntPtr.Zero;
Raw = gst_remuxer_new (GLib.Marshaller.StringToPtrGStrdup (inputFile),
- GLib.Marshaller.StringToPtrGStrdup (outputFile),
- muxer, out error);
+ GLib.Marshaller.StringToPtrGStrdup (outputFile),
+ muxer, out error);
if (error != IntPtr.Zero)
throw new GLib.GException (error);
@@ -58,6 +58,7 @@ namespace LongoMatch.Video.Remuxer
}
#pragma warning disable 0169
#region Error
+
[UnmanagedFunctionPointer (CallingConvention.Cdecl)]
delegate void ErrorSignalDelegate (IntPtr arg0,IntPtr arg1,IntPtr gch);
@@ -100,7 +101,7 @@ namespace LongoMatch.Video.Remuxer
OverrideVirtualMethod (gtype, "error", ErrorVMCallback);
}
- [GLib.DefaultSignalHandler(Type=typeof(LongoMatch.Video.Remuxer.GstRemuxer),
ConnectionMethod="OverrideError")]
+ [GLib.DefaultSignalHandler (Type = typeof(LongoMatch.Video.Remuxer.GstRemuxer),
ConnectionMethod = "OverrideError")]
protected virtual void OnError (string message)
{
GLib.Value ret = GLib.Value.Empty;
@@ -115,7 +116,7 @@ namespace LongoMatch.Video.Remuxer
v.Dispose ();
}
- [GLib.Signal("error")]
+ [GLib.Signal ("error")]
public event GlibErrorHandler GstError {
add {
GLib.Signal sig = GLib.Signal.Lookup (this, "error", new ErrorSignalDelegate
(ErrorSignalCallback));
@@ -126,8 +127,11 @@ namespace LongoMatch.Video.Remuxer
sig.RemoveDelegate (value);
}
}
+
#endregion
+
#region Percent-completed
+
[UnmanagedFunctionPointer (CallingConvention.Cdecl)]
delegate void PercentCompletedVMDelegate (IntPtr gvc,float percent);
@@ -150,7 +154,7 @@ namespace LongoMatch.Video.Remuxer
OverrideVirtualMethod (gtype, "percent_completed", PercentCompletedVMCallback);
}
- [GLib.DefaultSignalHandler(Type=typeof(LongoMatch.Video.Remuxer.GstRemuxer),
ConnectionMethod="OverridePercentCompleted")]
+ [GLib.DefaultSignalHandler (Type = typeof(LongoMatch.Video.Remuxer.GstRemuxer),
ConnectionMethod = "OverridePercentCompleted")]
protected virtual void OnPercentCompleted (float percent)
{
GLib.Value ret = GLib.Value.Empty;
@@ -165,7 +169,7 @@ namespace LongoMatch.Video.Remuxer
v.Dispose ();
}
- [GLib.Signal("percent_completed")]
+ [GLib.Signal ("percent_completed")]
public event GlibPercentCompletedHandler PercentCompleted {
add {
GLib.Signal sig = GLib.Signal.Lookup (this, "percent_completed",
typeof(PercentCompletedArgs));
@@ -176,8 +180,10 @@ namespace LongoMatch.Video.Remuxer
sig.RemoveDelegate (value);
}
}
+
#endregion
- [DllImport("libcesarplayer.dll")]
+
+ [DllImport ("libcesarplayer.dll")]
static extern void gst_remuxer_cancel (IntPtr raw);
public void Cancel ()
@@ -185,7 +191,7 @@ namespace LongoMatch.Video.Remuxer
gst_remuxer_cancel (Handle);
}
- [DllImport("libcesarplayer.dll")]
+ [DllImport ("libcesarplayer.dll")]
static extern void gst_remuxer_start (IntPtr raw);
public void Start ()
@@ -197,6 +203,7 @@ namespace LongoMatch.Video.Remuxer
{
LongoMatch.GtkSharp.Remuxer.ObjectManager.Initialize ();
}
+
#endregion
}
}
diff --git a/LongoMatch.Multimedia/Utils/Devices.cs b/LongoMatch.Multimedia/Utils/Devices.cs
index 348c8c5..1ce7b51 100644
--- a/LongoMatch.Multimedia/Utils/Devices.cs
+++ b/LongoMatch.Multimedia/Utils/Devices.cs
@@ -26,22 +26,26 @@ namespace LongoMatch.Multimedia.Utils
{
public class Devices
{
- [DllImport("libcesarplayer.dll")]
+ [DllImport ("libcesarplayer.dll")]
static extern IntPtr lgm_device_enum_video_devices (string source);
- [DllImport("libcesarplayer.dll")]
+
+ [DllImport ("libcesarplayer.dll")]
static extern IntPtr lgm_device_get_formats (IntPtr raw);
- [DllImport("libcesarplayer.dll")]
+
+ [DllImport ("libcesarplayer.dll")]
static extern IntPtr lgm_device_get_device_name (IntPtr raw);
- [DllImport("libcesarplayer.dll")]
+
+ [DllImport ("libcesarplayer.dll")]
static extern void lgm_device_free (IntPtr raw);
- [DllImport("libcesarplayer.dll")]
+
+ [DllImport ("libcesarplayer.dll")]
static extern IntPtr lgm_device_video_format_get_info (IntPtr raw, out int width, out int
height,
out int fps_n, out int fps_d);
- static readonly string[] devices_osx = new string[1] {"avfvideosrc"};
- static readonly string[] devices_win = new string[2] {"ksvideosrc", "dshowvideosrc"};
+ static readonly string[] devices_osx = new string[1] { "avfvideosrc" };
+ static readonly string[] devices_win = new string[2] { "ksvideosrc", "dshowvideosrc" };
static readonly string[] devices_lin = new string[2] { "v4l2src", "dv1394src" };
-
+
static public List<Device> ListVideoDevices ()
{
string[] devices;
@@ -56,14 +60,14 @@ namespace LongoMatch.Multimedia.Utils
foreach (string source in devices) {
GLib.List devices_raw = new GLib.List (lgm_device_enum_video_devices (source),
- typeof (IntPtr), true, false);
+ typeof(IntPtr), true, false);
foreach (IntPtr device_raw in devices_raw) {
/* The Direct Show GStreamer element seems to have problems with the
* BlackMagic DeckLink cards, so filter them out. They are also
* available through the ksvideosrc element. */
if (source == "dshowvideosrc" &&
- Regex.Match (source, ".*blackmagic.*|.*decklink.*",
RegexOptions.IgnoreCase).Success) {
+ Regex.Match (source, ".*blackmagic.*|.*decklink.*",
RegexOptions.IgnoreCase).Success) {
continue;
}
@@ -72,11 +76,11 @@ namespace LongoMatch.Multimedia.Utils
device.SourceElement = source;
device.ID = GLib.Marshaller.PtrToStringGFree
(lgm_device_get_device_name (device_raw));
GLib.List formats_raw = new GLib.List (lgm_device_get_formats
(device_raw),
- typeof (IntPtr), false, false);
+ typeof(IntPtr), false, false);
foreach (IntPtr format_raw in formats_raw) {
DeviceVideoFormat format = new DeviceVideoFormat ();
lgm_device_video_format_get_info (format_raw, out
format.width, out format.height,
- out format.fps_n, out
format.fps_d);
+ out format.fps_n, out format.fps_d);
device.Formats.Add (format);
}
devicesList.Add (device);
diff --git a/LongoMatch.Multimedia/Utils/GStreamer.cs b/LongoMatch.Multimedia/Utils/GStreamer.cs
index 6bec072..86dfeac 100644
--- a/LongoMatch.Multimedia/Utils/GStreamer.cs
+++ b/LongoMatch.Multimedia/Utils/GStreamer.cs
@@ -27,13 +27,13 @@ namespace LongoMatch.Multimedia.Utils
public class GStreamer
{
- [DllImport("libgstreamer-0.10.dll") /* willfully unmapped */ ]
+ [DllImport ("libgstreamer-0.10.dll") /* willfully unmapped */]
static extern IntPtr gst_registry_get_default ();
- [DllImport("libgstreamer-0.10.dll") /* willfully unmapped */ ]
+ [DllImport ("libgstreamer-0.10.dll") /* willfully unmapped */]
static extern IntPtr gst_registry_lookup_feature (IntPtr raw, string name);
- [DllImport("libgstreamer-0.10.dll") /* willfully unmapped */ ]
+ [DllImport ("libgstreamer-0.10.dll") /* willfully unmapped */]
static extern void gst_object_unref (IntPtr raw);
public const string MPEG1_PS = "MPEG-1 System Stream";
@@ -65,8 +65,8 @@ namespace LongoMatch.Multimedia.Utils
public static bool FileNeedsRemux (MediaFile file)
{
if (file.Container == MPEG1_PS || file.Container == MPEG2_PS ||
- file.Container == MPEG2_TS || file.Container == FLV ||
- file.Container == ASF)
+ file.Container == MPEG2_TS || file.Container == FLV ||
+ file.Container == ASF)
return true;
return false;
}
@@ -76,7 +76,7 @@ namespace LongoMatch.Multimedia.Utils
/* Use a custom path for the registry in Windows */
Environment.SetEnvironmentVariable ("GST_REGISTRY", GetRegistryPath ());
Environment.SetEnvironmentVariable ("GST_PLUGIN_PATH",
- Config.RelativeToPrefix (Path.Combine("lib",
"gstreamer-0.10")));
+ Config.RelativeToPrefix (Path.Combine ("lib", "gstreamer-0.10")));
}
private static string GetRegistryPath ()
diff --git a/LongoMatch.Multimedia/Utils/GstDiscoverer.cs b/LongoMatch.Multimedia/Utils/GstDiscoverer.cs
index c7e6d81..5133749 100644
--- a/LongoMatch.Multimedia/Utils/GstDiscoverer.cs
+++ b/LongoMatch.Multimedia/Utils/GstDiscoverer.cs
@@ -29,7 +29,7 @@ namespace LongoMatch.Video.Utils
const int THUMBNAIL_MAX_HEIGHT = 72;
const int THUMBNAIL_MAX_WIDTH = 96;
- [DllImport("libcesarplayer.dll")]
+ [DllImport ("libcesarplayer.dll")]
static extern unsafe uint lgm_discover_uri (string uri, out long duration,
out uint width, out uint height,
out uint fps_n, out uint fps_d,
@@ -53,8 +53,8 @@ namespace LongoMatch.Video.Utils
IFramesCapturer thumbnailer;
ret = lgm_discover_uri (filePath, out duration, out width, out height, out fps_n,
- out fps_d, out par_n, out par_d, out container_ptr,
- out video_codec_ptr, out audio_codec_ptr, out error);
+ out fps_d, out par_n, out par_d, out container_ptr,
+ out video_codec_ptr, out audio_codec_ptr, out error);
if (error != IntPtr.Zero)
throw new GLib.GException (error);
if (ret != 0) {
@@ -77,14 +77,14 @@ namespace LongoMatch.Video.Utils
thumbnailer = factory.GetFramesCapturer ();
thumbnailer.Open (filePath);
preview = thumbnailer.GetFrame (new Time { TotalSeconds = 2 }, false,
- THUMBNAIL_MAX_WIDTH, THUMBNAIL_MAX_HEIGHT);
+ THUMBNAIL_MAX_WIDTH, THUMBNAIL_MAX_HEIGHT);
thumbnailer.Dispose ();
}
}
return new LongoMatch.Core.Store.MediaFile (filePath, duration, (ushort)fps,
has_audio, has_video,
- container, video_codec, audio_codec, width,
height,
- par, preview, null);
+ container, video_codec, audio_codec, width, height,
+ par, preview, null);
}
}
}
diff --git a/LongoMatch.Multimedia/Utils/MultimediaFactory.cs
b/LongoMatch.Multimedia/Utils/MultimediaFactory.cs
index 1cc5144..8ba8de6 100644
--- a/LongoMatch.Multimedia/Utils/MultimediaFactory.cs
+++ b/LongoMatch.Multimedia/Utils/MultimediaFactory.cs
@@ -40,7 +40,7 @@ namespace LongoMatch.Video
public MultimediaFactory ()
{
- registry = new Registry ("Multimedia Factory");
+ registry = new Registry ("Multimedia backend");
/* Register default elements */
Register (0, typeof(IPlayer), typeof(GstPlayer));
Register (0, typeof(IFramesCapturer), typeof(GstFramesCapturer));
diff --git a/LongoMatch.Multimedia/Utils/Seeker.cs b/LongoMatch.Multimedia/Utils/Seeker.cs
index 90529a3..424c96b 100644
--- a/LongoMatch.Multimedia/Utils/Seeker.cs
+++ b/LongoMatch.Multimedia/Utils/Seeker.cs
@@ -30,14 +30,14 @@ namespace LongoMatch.Video.Utils
float rate;
SeekType seekType;
- public Seeker (uint timeoutMS=80)
+ public Seeker (uint timeoutMS = 80)
{
timeout = timeoutMS;
pendingSeekId = -1;
seekType = SeekType.None;
}
- public void Seek (SeekType seekType, Time start=null, float rate=1)
+ public void Seek (SeekType seekType, Time start = null, float rate = 1)
{
this.seekType = seekType;
this.start = start;
diff --git a/LongoMatch.Multimedia/Utils/TimeString.cs b/LongoMatch.Multimedia/Utils/TimeString.cs
index 128cba4..5065f71 100644
--- a/LongoMatch.Multimedia/Utils/TimeString.cs
+++ b/LongoMatch.Multimedia/Utils/TimeString.cs
@@ -38,7 +38,7 @@ namespace LongoMatch.Video.Utils
if (_h > 0)
return String.Format ("{0}:{1}:{2}", _h, _m.ToString ("d2"),
- _s.ToString ("d2"));
+ _s.ToString ("d2"));
return String.Format ("{0}:{1}", _m, _s.ToString ("d2"));
}
@@ -54,7 +54,7 @@ namespace LongoMatch.Video.Utils
if (_h > 0)
return String.Format ("{0}:{1}:{2},{3}", _h, _m.ToString ("d2"),
- _s.ToString ("d2"), _ms.ToString ("d3"));
+ _s.ToString ("d2"), _ms.ToString ("d3"));
return String.Format ("{0}:{1},{2}", _m, _s.ToString ("d2"), _ms.ToString ("d3"));
}
@@ -69,7 +69,7 @@ namespace LongoMatch.Video.Utils
if (_h > 0)
return String.Format ("{0}:{1}:{2}", _h, _m.ToString ("d2"),
- _s.ToString ("d2"));
+ _s.ToString ("d2"));
return String.Format ("{0}:{1}", _m, _s.ToString ("d2"));
}
diff --git a/LongoMatch.Multimedia/Utils/WindowHandle.cs b/LongoMatch.Multimedia/Utils/WindowHandle.cs
index d394f2e..b51665f 100644
--- a/LongoMatch.Multimedia/Utils/WindowHandle.cs
+++ b/LongoMatch.Multimedia/Utils/WindowHandle.cs
@@ -22,7 +22,7 @@ namespace LongoMatch.Multimedia.Utils
{
public class WindowHandle
{
- [DllImport("libcesarplayer.dll")]
+ [DllImport ("libcesarplayer.dll")]
static extern IntPtr lgm_get_window_handle (IntPtr window);
public static IntPtr GetWindowHandle (Gdk.Window window)
diff --git a/LongoMatch.Plugins.GStreamer/GStreamerRestricted.cs
b/LongoMatch.Plugins.GStreamer/GStreamerRestricted.cs
index 9927d6f..1ea02ed 100644
--- a/LongoMatch.Plugins.GStreamer/GStreamerRestricted.cs
+++ b/LongoMatch.Plugins.GStreamer/GStreamerRestricted.cs
@@ -28,10 +28,10 @@ namespace LongoMatch.Plugins.GStreamer
[Extension]
public class GStreamerRestricted: IGStreamerPluginsProvider
{
- [DllImport("libgstreamer-0.10.dll")]
+ [DllImport ("libgstreamer-0.10.dll")]
static extern bool gst_registry_scan_path (IntPtr registry, IntPtr path);
- [DllImport("libgstreamer-0.10.dll")]
+ [DllImport ("libgstreamer-0.10.dll")]
static extern IntPtr gst_registry_get_default ();
public string Name {
@@ -51,7 +51,7 @@ namespace LongoMatch.Plugins.GStreamer
string gstdir = Path.Combine (Config.PluginsDir, "gstreamer-0.10");
if (Environment.OSVersion.Platform == PlatformID.Win32NT) {
Environment.SetEnvironmentVariable ("PATH",
- Environment.GetEnvironmentVariable
("PATH") + ";" + gstdir);
+ Environment.GetEnvironmentVariable ("PATH") + ";" + gstdir);
}
Log.Information ("Registering plugins in directory " + gstdir);
IntPtr p = GLib.Marshaller.StringToPtrGStrdup (gstdir);
diff --git a/LongoMatch.Services/Services/HotKeysManager.cs b/LongoMatch.Services/Services/HotKeysManager.cs
index d75a097..c834284 100644
--- a/LongoMatch.Services/Services/HotKeysManager.cs
+++ b/LongoMatch.Services/Services/HotKeysManager.cs
@@ -68,7 +68,7 @@ namespace LongoMatch.Services
inPlayerTagging = false;
this.playerNumber = "";
}
-
+
void ReloadHotkeys ()
{
dashboardHotkeys.Clear ();
@@ -148,8 +148,8 @@ namespace LongoMatch.Services
}
if (projectType == ProjectType.CaptureProject ||
- projectType == ProjectType.FakeCaptureProject ||
- projectType == ProjectType.URICaptureProject) {
+ projectType == ProjectType.FakeCaptureProject ||
+ projectType == ProjectType.URICaptureProject) {
switch (action) {
case KeyAction.PauseClock:
if (capturer.Capturing) {
diff --git a/LongoMatch.Services/Services/PlaylistManager.cs b/LongoMatch.Services/Services/PlaylistManager.cs
index 2423181..f3aefb6 100644
--- a/LongoMatch.Services/Services/PlaylistManager.cs
+++ b/LongoMatch.Services/Services/PlaylistManager.cs
@@ -104,7 +104,7 @@ namespace LongoMatch.Services
filter.Update ();
}
}
-
+
void HandleOpenedProjectChanged (Project project, ProjectType projectType,
EventsFilter filter, IAnalysisWindow analysisWindow)
{
@@ -146,10 +146,10 @@ namespace LongoMatch.Services
void HandleNext (Playlist playlist)
{
if (playlist != null && playlist.HasNext ()) {
- Config.EventsBroker.EmitPlaylistElementSelected (playlist, playlist.Next());
+ Config.EventsBroker.EmitPlaylistElementSelected (playlist, playlist.Next ());
}
}
-
+
void HandlePrev (Playlist playlist)
{
/* Select the previous element if it's a regular play */
@@ -169,11 +169,11 @@ namespace LongoMatch.Services
}
/* Load the next playlist element */
if (playlist.HasPrev ()) {
- Config.EventsBroker.EmitPlaylistElementSelected (playlist,
playlist.Prev());
+ Config.EventsBroker.EmitPlaylistElementSelected (playlist,
playlist.Prev ());
}
}
}
-
+
void HandlePlaybackRateChanged (float rate)
{
if (loadedElement != null && loadedElement is PlaylistPlayElement) {
@@ -201,9 +201,9 @@ namespace LongoMatch.Services
Playlist playlist = null;
name = Config.GUIToolkit.QueryMessage (Catalog.GetString ("Playlist name:"), null,
- Catalog.GetString ("New playlist"));
+ Catalog.GetString ("New playlist"));
if (name != null) {
- playlist = new Playlist {Name = name};
+ playlist = new Playlist { Name = name };
project.Playlists.Add (playlist);
Config.EventsBroker.EmitPlaylistsChanged (this);
}
@@ -218,14 +218,14 @@ namespace LongoMatch.Services
foreach (Job job in jobs)
videoRenderer.AddJob (job);
}
-
+
void HandleSeekEvent (Time pos, bool accurate)
{
if (player != null) {
player.Seek (pos, accurate);
}
}
-
+
void HandleTogglePlayEvent (bool playing)
{
if (player != null) {
@@ -236,15 +236,15 @@ namespace LongoMatch.Services
}
}
}
-
+
void HandleKeyPressed (object sender, HotKey key)
{
if (openedProject == null)
return;
if (openedProjectType != ProjectType.CaptureProject &&
- openedProjectType != ProjectType.URICaptureProject &&
- openedProjectType != ProjectType.FakeCaptureProject) {
+ openedProjectType != ProjectType.URICaptureProject &&
+ openedProjectType != ProjectType.FakeCaptureProject) {
KeyAction action;
if (player == null)
return;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
