[chronojump] CopyTempVideo instead of MoveTempVideo
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] CopyTempVideo instead of MoveTempVideo
- Date: Sun, 5 May 2013 13:05:08 +0000 (UTC)
commit 44bb4f237ec210d706fbb7abc91b0fab9bafdf8b
Author: Xavier de Blas <xaviblas gmail com>
Date: Sun May 5 14:45:34 2013 +0200
CopyTempVideo instead of MoveTempVideo
src/gui/chronojump.cs | 14 +++++++-------
src/gui/encoder.cs | 2 +-
src/util.cs | 11 +++++++----
3 files changed, 15 insertions(+), 12 deletions(-)
---
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index 87b2e7e..1104004 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -3385,7 +3385,7 @@ Log.WriteLine("DDD 1");
//move video file if exists
if(videoOn)
- if (! Util.MoveTempVideo(currentSession.UniqueID, Constants.TestTypes.JUMP,
currentJump.UniqueID))
+ if (! Util.CopyTempVideo(currentSession.UniqueID, Constants.TestTypes.JUMP,
currentJump.UniqueID))
new DialogMessage(Constants.MessageTypes.WARNING,
Catalog.GetString("Sorry, video cannot be stored."));
@@ -3516,7 +3516,7 @@ Log.WriteLine("DDD 2");
//move video file if exists
if(videoOn)
- if(! Util.MoveTempVideo(currentSession.UniqueID, Constants.TestTypes.JUMP_RJ,
currentJumpRj.UniqueID))
+ if(! Util.CopyTempVideo(currentSession.UniqueID, Constants.TestTypes.JUMP_RJ,
currentJumpRj.UniqueID))
new DialogMessage(Constants.MessageTypes.WARNING,
Catalog.GetString("Sorry, video cannot be stored."));
//if user clicked in finish earlier
@@ -3672,7 +3672,7 @@ Log.WriteLine("DDD 2");
//move video file if exists
if(videoOn)
- if(! Util.MoveTempVideo(currentSession.UniqueID, Constants.TestTypes.RUN,
currentRun.UniqueID))
+ if(! Util.CopyTempVideo(currentSession.UniqueID, Constants.TestTypes.RUN,
currentRun.UniqueID))
new DialogMessage(Constants.MessageTypes.WARNING,
Catalog.GetString("Sorry, video cannot be stored."));
currentRun.MetersSecondsPreferred = metersSecondsPreferred;
@@ -3799,7 +3799,7 @@ Log.WriteLine("DDD 2");
//move video file if exists
if(videoOn)
- if(! Util.MoveTempVideo(currentSession.UniqueID, Constants.TestTypes.RUN_I,
currentRunInterval.UniqueID))
+ if(! Util.CopyTempVideo(currentSession.UniqueID, Constants.TestTypes.RUN_I,
currentRunInterval.UniqueID))
new DialogMessage(Constants.MessageTypes.WARNING,
Catalog.GetString("Sorry, video cannot be stored."));
currentRunInterval.MetersSecondsPreferred = metersSecondsPreferred;
@@ -3913,7 +3913,7 @@ Log.WriteLine("DDD 2");
//move video file if exists
if(videoOn)
- if(! Util.MoveTempVideo(currentSession.UniqueID, Constants.TestTypes.RT,
currentReactionTime.UniqueID))
+ if(! Util.CopyTempVideo(currentSession.UniqueID, Constants.TestTypes.RT,
currentReactionTime.UniqueID))
new DialogMessage(Constants.MessageTypes.WARNING,
Catalog.GetString("Sorry, video cannot be stored."));
myTreeViewReactionTimes.Add(currentPerson.Name, currentReactionTime);
@@ -4033,7 +4033,7 @@ Log.WriteLine("DDD 2");
//move video file if exists
if(videoOn)
- if(! Util.MoveTempVideo(currentSession.UniqueID, Constants.TestTypes.PULSE,
currentPulse.UniqueID))
+ if(! Util.CopyTempVideo(currentSession.UniqueID, Constants.TestTypes.PULSE,
currentPulse.UniqueID))
new DialogMessage(Constants.MessageTypes.WARNING,
Catalog.GetString("Sorry, video cannot be stored."));
myTreeViewPulses.Add(currentPerson.Name, currentPulse);
@@ -4261,7 +4261,7 @@ Console.WriteLine("V");
Console.WriteLine("W");
//move video file if exists
if(videoOn)
- if(! Util.MoveTempVideo(currentSession.UniqueID,
+ if(! Util.CopyTempVideo(currentSession.UniqueID,
Constants.TestTypes.MULTICHRONOPIC,
currentMultiChronopic.UniqueID))
new DialogMessage(Constants.MessageTypes.WARNING,
Catalog.GetString("Sorry, video cannot be stored."));
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index 8c8b8fb..4e86f4f 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -1282,7 +1282,7 @@ public partial class ChronoJumpWindow
button_video_play_this_test_encoder.Sensitive = false;
//move video
if(videoOn) {
- if(Util.MoveTempVideo(currentSession.UniqueID,
+ if(Util.CopyTempVideo(currentSession.UniqueID,
Constants.TestTypes.ENCODER,
Convert.ToInt32(encoderSignalUniqueID))) {
eSQL.future2 = Util.GetVideoFileName(currentSession.UniqueID,
diff --git a/src/util.cs b/src/util.cs
index c60ddeb..c09b296 100644
--- a/src/util.cs
+++ b/src/util.cs
@@ -804,16 +804,19 @@ public class Util
return Constants.ExtensionPhoto;
}
- public static bool MoveTempVideo(int sessionID, Constants.TestTypes type, int uniqueID) {
+ public static bool CopyTempVideo(int sessionID, Constants.TestTypes type, int uniqueID) {
string origin = GetVideoTempFileName();
string destination = GetVideoFileName(sessionID, type, uniqueID);
- if(File.Exists(origin) && ! File.Exists(destination)) {
+ if(File.Exists(origin)) {
CreateVideoSessionDirIfNeeded(sessionID);
+ /*
+ * no more move it, just copy it, because maybe is still being recorded
try {
File.Move(origin, destination);
} catch {
- File.Copy(origin, destination);
- }
+ */
+ File.Copy(origin, destination, true); //can be overwritten
+ //}
return true;
} else
return false;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]