[longomatch] Add the sender as the first parameter in multimedia events
- From: Andoni Morales Alastruey <amorales src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [longomatch] Add the sender as the first parameter in multimedia events
- Date: Tue, 31 Mar 2015 17:37:06 +0000 (UTC)
commit def1d20447d2fe49b1d3beede2f890da05f1d121
Author: Andoni Morales Alastruey <ylatuya gmail com>
Date: Fri Mar 27 23:38:28 2015 +0100
Add the sender as the first parameter in multimedia events
LongoMatch.Core/Common/EventsBroker.cs | 8 +++---
LongoMatch.Core/Handlers/Multimedia.cs | 9 +++---
LongoMatch.GUI.Multimedia/Gui/CapturerBin.cs | 4 +-
LongoMatch.GUI.Multimedia/Gui/PlayerView.cs | 2 +-
LongoMatch.GUI.Multimedia/Gui/Utils/Remuxer.cs | 2 +-
LongoMatch.GUI/Gui/Component/ProjectPeriods.cs | 2 +-
.../Capturer/GstCameraCapturer.cs | 2 +-
.../Converter/GstVideoConverter.cs | 2 +-
LongoMatch.Multimedia/Editor/GstVideoSplitter.cs | 4 ++-
LongoMatch.Multimedia/Player/GstPlayer.cs | 8 +++---
LongoMatch.Multimedia/Remuxer/GstRemuxer.cs | 2 +-
LongoMatch.Services/Services/PlayerController.cs | 28 ++++++++++---------
LongoMatch.Services/Services/ProjectsManager.cs | 4 +-
.../Services/RenderingJobsManager.cs | 2 +-
14 files changed, 42 insertions(+), 37 deletions(-)
---
diff --git a/LongoMatch.Core/Common/EventsBroker.cs b/LongoMatch.Core/Common/EventsBroker.cs
index c36ea64..ece96a7 100644
--- a/LongoMatch.Core/Common/EventsBroker.cs
+++ b/LongoMatch.Core/Common/EventsBroker.cs
@@ -350,17 +350,17 @@ namespace LongoMatch.Core.Common
}
}
- public void EmitCaptureError (string message)
+ public void EmitCaptureError (object sender, string message)
{
if (CaptureError != null) {
- CaptureError (message);
+ CaptureError (sender, message);
}
}
- public void EmitMultimediaError (string message)
+ public void EmitMultimediaError (object sender, string message)
{
if (MultimediaError != null) {
- MultimediaError (message);
+ MultimediaError (sender, message);
}
}
diff --git a/LongoMatch.Core/Handlers/Multimedia.cs b/LongoMatch.Core/Handlers/Multimedia.cs
index 9f1282d..33de06f 100644
--- a/LongoMatch.Core/Handlers/Multimedia.cs
+++ b/LongoMatch.Core/Handlers/Multimedia.cs
@@ -40,16 +40,17 @@ namespace LongoMatch.Core.Handlers
public delegate void DeviceChangeHandler (int deviceID);
public delegate void CaptureFinishedHandler (bool close);
- public delegate void ErrorHandler (string message);
public delegate void PercentCompletedHandler (float percent);
- public delegate void StateChangeHandler (bool playing);
public delegate void TickHandler (Time currentTime);
public delegate void TimeChangedHandler (Time currentTime,Time duration,bool seekable);
public delegate void MediaInfoHandler (int width,int height,int parN,int parD);
- public delegate void EosHandler ();
- public delegate void ReadyToSeekHandler ();
public delegate void LoadDrawingsHandler (FrameDrawing frameDrawing);
public delegate void ElementLoadedHandler (object element,bool hasNext);
public delegate void PARChangedHandler (IntPtr windowHandle,float par);
public delegate void MediaFileSetLoadedHandler (MediaFileSet fileset);
+
+ public delegate void ErrorHandler (object sender,string message);
+ public delegate void EosHandler (object sender);
+ public delegate void ReadyToSeekHandler (object sender);
+ public delegate void StateChangeHandler (object sender,bool playing);
}
diff --git a/LongoMatch.GUI.Multimedia/Gui/CapturerBin.cs b/LongoMatch.GUI.Multimedia/Gui/CapturerBin.cs
index 3b2a4df..5c393aa 100644
--- a/LongoMatch.GUI.Multimedia/Gui/CapturerBin.cs
+++ b/LongoMatch.GUI.Multimedia/Gui/CapturerBin.cs
@@ -440,10 +440,10 @@ namespace LongoMatch.Gui
}
}
- void OnError (string message)
+ void OnError (object sender, string message)
{
Application.Invoke (delegate {
- Config.EventsBroker.EmitCaptureError (message);
+ Config.EventsBroker.EmitCaptureError (sender, message);
});
}
diff --git a/LongoMatch.GUI.Multimedia/Gui/PlayerView.cs b/LongoMatch.GUI.Multimedia/Gui/PlayerView.cs
index caa4760..4d1a6d7 100644
--- a/LongoMatch.GUI.Multimedia/Gui/PlayerView.cs
+++ b/LongoMatch.GUI.Multimedia/Gui/PlayerView.cs
@@ -307,7 +307,7 @@ namespace LongoMatch.Gui
timescale.Sensitive = seekable;
}
- void HandlePlaybackStateChangedEvent (bool playing)
+ void HandlePlaybackStateChangedEvent (object sender, bool playing)
{
if (playing) {
playbutton.Hide ();
diff --git a/LongoMatch.GUI.Multimedia/Gui/Utils/Remuxer.cs b/LongoMatch.GUI.Multimedia/Gui/Utils/Remuxer.cs
index ed8eb4d..874c419 100644
--- a/LongoMatch.GUI.Multimedia/Gui/Utils/Remuxer.cs
+++ b/LongoMatch.GUI.Multimedia/Gui/Utils/Remuxer.cs
@@ -122,7 +122,7 @@ namespace LongoMatch.Video.Utils
Cancel ();
}
- void HandleRemuxerError (string error)
+ void HandleRemuxerError (object sender, string error)
{
Application.Invoke (delegate {
Error (error);
diff --git a/LongoMatch.GUI/Gui/Component/ProjectPeriods.cs b/LongoMatch.GUI/Gui/Component/ProjectPeriods.cs
index 72eeded..2951b59 100644
--- a/LongoMatch.GUI/Gui/Component/ProjectPeriods.cs
+++ b/LongoMatch.GUI/Gui/Component/ProjectPeriods.cs
@@ -304,7 +304,7 @@ namespace LongoMatch.Gui.Component
/// Try to slave the secondary player to the first
/// </summary>
/// <param name="playing">If set to <c>true</c> playing.</param>
- void HandleStateChanged (bool playing)
+ void HandleStateChanged (object sender, bool playing)
{
if (playing) {
if (sec_cam_playerbin.Player.Opened) {
diff --git a/LongoMatch.Multimedia/Capturer/GstCameraCapturer.cs
b/LongoMatch.Multimedia/Capturer/GstCameraCapturer.cs
index af78c81..d505e8b 100644
--- a/LongoMatch.Multimedia/Capturer/GstCameraCapturer.cs
+++ b/LongoMatch.Multimedia/Capturer/GstCameraCapturer.cs
@@ -106,7 +106,7 @@ namespace LongoMatch.Video.Capturer
this.GlibError += (o, args) => {
if (Error != null) {
- Error (args.Message);
+ Error (this, args.Message);
}
};
diff --git a/LongoMatch.Multimedia/Converter/GstVideoConverter.cs
b/LongoMatch.Multimedia/Converter/GstVideoConverter.cs
index 4a160f2..fd97c1d 100644
--- a/LongoMatch.Multimedia/Converter/GstVideoConverter.cs
+++ b/LongoMatch.Multimedia/Converter/GstVideoConverter.cs
@@ -61,7 +61,7 @@ namespace LongoMatch.Video.Converter
};
InternalError += delegate(object o, ErrorArgs args) {
if (Error != null)
- Error (args.Message);
+ Error (this, args.Message);
};
}
diff --git a/LongoMatch.Multimedia/Editor/GstVideoSplitter.cs
b/LongoMatch.Multimedia/Editor/GstVideoSplitter.cs
index 17751fb..c5630b6 100644
--- a/LongoMatch.Multimedia/Editor/GstVideoSplitter.cs
+++ b/LongoMatch.Multimedia/Editor/GstVideoSplitter.cs
@@ -51,10 +51,12 @@ namespace LongoMatch.Video.Editor
};
InternalError += delegate(object o, ErrorArgs args) {
if (Error != null)
- Error (args.Message);
+ Error (this, args.Message);
};
}
+
#region GSignals
+
#pragma warning disable 0169
[GLib.CDeclCallback]
delegate void ErrorVMDelegate (IntPtr gvc,IntPtr message);
diff --git a/LongoMatch.Multimedia/Player/GstPlayer.cs b/LongoMatch.Multimedia/Player/GstPlayer.cs
index ee6e7eb..444a5a3 100644
--- a/LongoMatch.Multimedia/Player/GstPlayer.cs
+++ b/LongoMatch.Multimedia/Player/GstPlayer.cs
@@ -124,22 +124,22 @@ namespace LongoMatch.Video.Player
this.GlibError += (o, args) => {
if (Error != null)
- Error (args.Message);
+ Error (this, args.Message);
};
this.GlibStateChange += (o, args) => {
if (StateChange != null)
- StateChange (args.Playing);
+ StateChange (this, args.Playing);
};
this.GlibReadyToSeek += (sender, e) => {
if (ReadyToSeek != null)
- ReadyToSeek ();
+ ReadyToSeek (this);
};
this.GlibEos += (sender, e) => {
if (Eos != null)
- Eos ();
+ Eos (this);
};
}
#pragma warning disable 0169
diff --git a/LongoMatch.Multimedia/Remuxer/GstRemuxer.cs b/LongoMatch.Multimedia/Remuxer/GstRemuxer.cs
index f525cdd..42ccbac 100644
--- a/LongoMatch.Multimedia/Remuxer/GstRemuxer.cs
+++ b/LongoMatch.Multimedia/Remuxer/GstRemuxer.cs
@@ -53,7 +53,7 @@ namespace LongoMatch.Video.Remuxer
GstError += delegate(object o, ErrorArgs args) {
if (Error != null)
- Error (args.Message);
+ Error (this, args.Message);
};
}
#pragma warning disable 0169
diff --git a/LongoMatch.Services/Services/PlayerController.cs
b/LongoMatch.Services/Services/PlayerController.cs
index 0dc0f18..b96d6f2 100644
--- a/LongoMatch.Services/Services/PlayerController.cs
+++ b/LongoMatch.Services/Services/PlayerController.cs
@@ -268,7 +268,7 @@ namespace LongoMatch.Services
Log.Debug ("Play");
if (StillImageLoaded) {
ReconfigureTimeout (TIMEOUT_MS);
- EmitPlaybackStateChanged (true);
+ EmitPlaybackStateChanged (this, true);
} else {
EmitLoadDrawings (null);
player.Play ();
@@ -281,7 +281,7 @@ namespace LongoMatch.Services
Log.Debug ("Pause");
if (StillImageLoaded) {
ReconfigureTimeout (0);
- EmitPlaybackStateChanged (false);
+ EmitPlaybackStateChanged (this, false);
} else {
player.Pause ();
}
@@ -559,10 +559,10 @@ namespace LongoMatch.Services
}
}
- void EmitPlaybackStateChanged (bool playing)
+ void EmitPlaybackStateChanged (object sender, bool playing)
{
if (PlaybackStateChangedEvent != null) {
- PlaybackStateChangedEvent (playing);
+ PlaybackStateChangedEvent (sender, playing);
}
}
@@ -589,7 +589,7 @@ namespace LongoMatch.Services
set {
stillimageLoaded = value;
if (stillimageLoaded) {
- EmitPlaybackStateChanged (true);
+ EmitPlaybackStateChanged (this, true);
player.Pause ();
imageLoadedTS = new Time (0);
ReconfigureTimeout (TIMEOUT_MS);
@@ -642,7 +642,8 @@ namespace LongoMatch.Services
if (fileSet != this.FileSet || force) {
readyToSeek = false;
if (CamerasVisible == null) {
- Config.EventsBroker.EmitMultimediaError (Catalog.GetString ("Invalid
camera configuration"));
+ Config.EventsBroker.EmitMultimediaError (this,
+ Catalog.GetString ("Invalid camera configuration"));
FileSet = null;
return;
}
@@ -658,7 +659,8 @@ namespace LongoMatch.Services
EmitPARChanged (windowHandle, 1);
}
} catch (Exception ex) {
- Config.EventsBroker.EmitMultimediaError (Catalog.GetString
("Invalid camera configuration"));
+ Config.EventsBroker.EmitMultimediaError (this,
+ Catalog.GetString ("Invalid camera configuration"));
FileSet = null;
Log.Exception (ex);
return;
@@ -889,7 +891,7 @@ namespace LongoMatch.Services
/* These callbacks are triggered by the multimedia backend and need to
* be deferred to the UI main thread */
- void HandleStateChange (bool playing)
+ void HandleStateChange (object sender, bool playing)
{
Config.GUIToolkit.Invoke (delegate {
if (playing) {
@@ -899,11 +901,11 @@ namespace LongoMatch.Services
ReconfigureTimeout (0);
}
}
- EmitPlaybackStateChanged (playing);
+ EmitPlaybackStateChanged (this, playing);
});
}
- void HandleReadyToSeek ()
+ void HandleReadyToSeek (object sender)
{
Config.GUIToolkit.Invoke (delegate {
readyToSeek = true;
@@ -921,7 +923,7 @@ namespace LongoMatch.Services
});
}
- void HandleEndOfStream ()
+ void HandleEndOfStream (object sender)
{
Config.GUIToolkit.Invoke (delegate {
if (loadedPlaylistElement is PlaylistVideo) {
@@ -933,10 +935,10 @@ namespace LongoMatch.Services
});
}
- void HandleError (string message)
+ void HandleError (object sender, string message)
{
Config.GUIToolkit.Invoke (delegate {
- Config.EventsBroker.EmitMultimediaError (message);
+ Config.EventsBroker.EmitMultimediaError (sender, message);
});
}
diff --git a/LongoMatch.Services/Services/ProjectsManager.cs b/LongoMatch.Services/Services/ProjectsManager.cs
index 0ecb7df..e5c8a2f 100644
--- a/LongoMatch.Services/Services/ProjectsManager.cs
+++ b/LongoMatch.Services/Services/ProjectsManager.cs
@@ -371,7 +371,7 @@ namespace LongoMatch.Services
SetProject (project, ProjectType.FileProject, new CaptureSettings ());
}
- void HandleMultimediaError (string message)
+ void HandleMultimediaError (object sender, string message)
{
guiToolkit.ErrorMessage (Catalog.GetString ("The following error happened and" +
" the current project will be closed:") + "\n" + message);
@@ -395,7 +395,7 @@ namespace LongoMatch.Services
}
}
- void HandleCaptureError (string message)
+ void HandleCaptureError (object sender, string message)
{
guiToolkit.ErrorMessage (Catalog.GetString ("The following error happened and" +
" the current capture will be closed:") + "\n" + message);
diff --git a/LongoMatch.Services/Services/RenderingJobsManager.cs
b/LongoMatch.Services/Services/RenderingJobsManager.cs
index 2cc3456..1882e31 100644
--- a/LongoMatch.Services/Services/RenderingJobsManager.cs
+++ b/LongoMatch.Services/Services/RenderingJobsManager.cs
@@ -400,7 +400,7 @@ namespace LongoMatch.Services
}
}
- protected void OnError (string message)
+ protected void OnError (object sender, string message)
{
HandleError ();
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
