[chronojump] Renamed some webcam methods
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Renamed some webcam methods
- Date: Fri, 27 Jul 2018 16:02:59 +0000 (UTC)
commit b884d826d00b7d85f06fdd10d92db9a6026a7fc8
Author: Xavier de Blas <xaviblas gmail com>
Date: Fri Jul 27 18:02:30 2018 +0200
Renamed some webcam methods
src/gui/chronojump.cs | 8 ++++----
src/gui/event.cs | 2 +-
src/gui/person.cs | 2 +-
src/webcam.cs | 8 ++++----
4 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index 0b45fb6a..306a0faf 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -4270,7 +4270,7 @@ public partial class ChronoJumpWindow
LogB.Information("wRS at gui chronojump.cs 0, videoDevice: " + videoDevice);
w = new Webcam(videoDevice);
- Webcam.Result result = w.MplayerCapture(Webcam.CaptureTypes.VIDEO);
+ Webcam.Result result = w.CapturePrepare (Webcam.CaptureTypes.VIDEO);
LogB.Information("wRS at gui chronojump.cs 1, videoDevice: " + videoDevice);
if(! result.success)
@@ -4290,7 +4290,7 @@ public partial class ChronoJumpWindow
}
private void webcamRecordStart(ref Webcam w)
{
- w.RecordStart();
+ w.VideoCaptureStart();
label_video_feedback.Text = "Rec."; //note: don't need to display this message on both cameras
}
@@ -4301,7 +4301,7 @@ public partial class ChronoJumpWindow
private bool webcamRecordEnd (ref Webcam w)
{
LogB.Information("webcamRecordEnd call 0");
- Webcam.Result result = w.RecordEnd ();
+ Webcam.Result result = w.VideoCaptureEnd ();
LogB.Information("webcamRecordEnd call 1");
if(! result.success)
@@ -6087,7 +6087,7 @@ LogB.Debug("mc finished 5");
private bool playVideo(string fileName, bool play)
{
webcam = new Webcam();
- Webcam.Result result = webcam.MplayerPlay(fileName);
+ Webcam.Result result = webcam.Play(fileName);
/*
* TODO: reimplement this with ffmpeg
diff --git a/src/gui/event.cs b/src/gui/event.cs
index e408d030..6473d4a3 100644
--- a/src/gui/event.cs
+++ b/src/gui/event.cs
@@ -316,7 +316,7 @@ public class EditEventWindow
LogB.Information("Exists and clicked " + videoFileName);
Webcam webcam = new Webcam();
- Webcam.Result result = webcam.MplayerPlay(videoFileName);
+ Webcam.Result result = webcam.Play(videoFileName);
}
}
diff --git a/src/gui/person.cs b/src/gui/person.cs
index 119e8383..da0cfd0b 100644
--- a/src/gui/person.cs
+++ b/src/gui/person.cs
@@ -1082,7 +1082,7 @@ public class PersonAddModifyWindow
// B) start if it's not running
webcam = new Webcam(videoDevice);
- Webcam.Result result = webcam.MplayerCapture(Webcam.CaptureTypes.PHOTO);
+ Webcam.Result result = webcam.CapturePrepare (Webcam.CaptureTypes.PHOTO);
if (! result.success)
{
LogB.Debug ("Webcam Mplayer error: ", result.error);
diff --git a/src/webcam.cs b/src/webcam.cs
index 97fd2d04..49df2db6 100644
--- a/src/webcam.cs
+++ b/src/webcam.cs
@@ -71,7 +71,7 @@ class Webcam
public enum CaptureTypes { PHOTO, VIDEO }
- public Result MplayerCapture(CaptureTypes captureType)
+ public Result CapturePrepare (CaptureTypes captureType)
{
if(process != null)
return new Result (false, "");
@@ -132,7 +132,7 @@ class Webcam
return new Result (true, "");
}
- public Result MplayerPlay(string filename)
+ public Result Play(string filename)
{
if(process != null || filename == "")
return new Result (false, "");
@@ -181,7 +181,7 @@ class Webcam
return true;
}
- public Result RecordStart()
+ public Result VideoCaptureStart()
{
if(process == null || streamWriter == null)
return new Result (false, "", Constants.MplayerClosed);
@@ -193,7 +193,7 @@ class Webcam
}
//short process, to do end capture (good if there's more than one camera to end capture all at same
time)
- public Result RecordEnd()
+ public Result VideoCaptureEnd()
{
if(process == null || streamWriter == null)
return new Result (false, "", Constants.MplayerClosed);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]