From ed40267b9d22a818396632f2035199dfb848c8aa Mon Sep 17 00:00:00 2001 From: BuddyFriendGuy Date: Fri, 15 May 2015 23:36:13 -0400 Subject: [PATCH 1/3] fix volume value preservation bug --- misc/tools/NexuizDemoRecorder/main/pom.xml | 2 +- .../application/democutter/DemoCutter.java | 52 ++++++++----------- .../demorecorder/ui/swinggui/SwingGUI.java | 2 +- 3 files changed, 25 insertions(+), 31 deletions(-) diff --git a/misc/tools/NexuizDemoRecorder/main/pom.xml b/misc/tools/NexuizDemoRecorder/main/pom.xml index 0390194..821f0e0 100644 --- a/misc/tools/NexuizDemoRecorder/main/pom.xml +++ b/misc/tools/NexuizDemoRecorder/main/pom.xml @@ -4,7 +4,7 @@ NexuizDemoRecorder NexuizDemoRecorder jar - 0.3 + 0.3.1 NexuizDemoRecorder http://maven.apache.org diff --git a/misc/tools/NexuizDemoRecorder/main/src/main/java/com/nexuiz/demorecorder/application/democutter/DemoCutter.java b/misc/tools/NexuizDemoRecorder/main/src/main/java/com/nexuiz/demorecorder/application/democutter/DemoCutter.java index a1174e6..21d19b9 100644 --- a/misc/tools/NexuizDemoRecorder/main/src/main/java/com/nexuiz/demorecorder/application/democutter/DemoCutter.java +++ b/misc/tools/NexuizDemoRecorder/main/src/main/java/com/nexuiz/demorecorder/application/democutter/DemoCutter.java @@ -99,37 +99,31 @@ public class DemoCutter { if (firstLoop) { injectBuffer = "\011\n" + injectAtStart + ";slowmo " + ffwSpeedFirstStage + "\n\000"; firstLoop = false; - } - if (demoStarted < 1 && svctime > (startTime - 50)) { - if (svcLoops == 0) { - //make sure that for short demos (duration less than 50 sec) - //the injectAtStart is still honored - injectBuffer = "\011\n" + injectAtStart + ";slowmo " + ffwSpeedSecondStage + "\n\000"; - } else { + } else { + if (demoStarted < 1 && svctime > (startTime - 50)) { injectBuffer = "\011\nslowmo " + ffwSpeedSecondStage + "\n\000"; + demoStarted = 1; + } + if (demoStarted < 2 && svctime > (startTime - 5)) { + injectBuffer = "\011\nslowmo 1;" + injectBeforeCap +"\n\000"; + demoStarted = 2; + } + if (demoStarted < 3 && svctime > startTime) { + injectBuffer = "\011\ncl_capturevideo 1\n\000"; + demoStarted = 3; + } + if (!endIsReached && svctime > endTime) { + injectBuffer = "\011\ncl_capturevideo 0\n\000"; + endIsReached = true; + } + if (endIsReached && !finalInjectionDone && svctime > (endTime + 1)) { + injectBuffer = "\011\n" + injectAfterCap + "\n\000"; + finalInjectionDone = true; + } + if (finalInjectionDone && !disconnectIssued && svctime > (endTime + 2)) { + injectBuffer = "\011\ndisconnect\n\000"; + disconnectIssued = true; } - - demoStarted = 1; - } - if (demoStarted < 2 && svctime > (startTime - 5)) { - injectBuffer = "\011\nslowmo 1;" + injectBeforeCap +"\n\000"; - demoStarted = 2; - } - if (demoStarted < 3 && svctime > startTime) { - injectBuffer = "\011\ncl_capturevideo 1\n\000"; - demoStarted = 3; - } - if (!endIsReached && svctime > endTime) { - injectBuffer = "\011\ncl_capturevideo 0\n\000"; - endIsReached = true; - } - if (endIsReached && !finalInjectionDone && svctime > (endTime + 1)) { - injectBuffer = "\011\n" + injectAfterCap + "\n\000"; - finalInjectionDone = true; - } - if (finalInjectionDone && !disconnectIssued && svctime > (endTime + 2)) { - injectBuffer = "\011\ndisconnect\n\000"; - disconnectIssued = true; } svcLoops++; } diff --git a/misc/tools/NexuizDemoRecorder/main/src/main/java/com/nexuiz/demorecorder/ui/swinggui/SwingGUI.java b/misc/tools/NexuizDemoRecorder/main/src/main/java/com/nexuiz/demorecorder/ui/swinggui/SwingGUI.java index bb662c7..a00de35 100644 --- a/misc/tools/NexuizDemoRecorder/main/src/main/java/com/nexuiz/demorecorder/ui/swinggui/SwingGUI.java +++ b/misc/tools/NexuizDemoRecorder/main/src/main/java/com/nexuiz/demorecorder/ui/swinggui/SwingGUI.java @@ -144,7 +144,7 @@ public class SwingGUI extends JFrame implements WindowListener, DemoRecorderUI { private static final String mainHelpSetName = "help/DemoRecorderHelp.hs"; public SwingGUI(DemoRecorderApplication appLayer) { - super("Nexuiz Demo Recorder v0.3"); + super("Nexuiz Demo Recorder v0.3.1"); addWindowListener(this); this.appLayer = appLayer; From df3c06690c381222eca93566c3fab899c124d53d Mon Sep 17 00:00:00 2001 From: BuddyFriendGuy Date: Fri, 15 May 2015 23:40:23 -0400 Subject: [PATCH 2/3] remove unnecessary variable --- .../nexuiz/demorecorder/application/democutter/DemoCutter.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/misc/tools/NexuizDemoRecorder/main/src/main/java/com/nexuiz/demorecorder/application/democutter/DemoCutter.java b/misc/tools/NexuizDemoRecorder/main/src/main/java/com/nexuiz/demorecorder/application/democutter/DemoCutter.java index 21d19b9..397a03b 100644 --- a/misc/tools/NexuizDemoRecorder/main/src/main/java/com/nexuiz/demorecorder/application/democutter/DemoCutter.java +++ b/misc/tools/NexuizDemoRecorder/main/src/main/java/com/nexuiz/demorecorder/application/democutter/DemoCutter.java @@ -63,7 +63,6 @@ public class DemoCutter { boolean endIsReached = false; boolean finalInjectionDone = false; boolean disconnectIssued = false; - int svcLoops = 0; float firstSvcTime = -1; float lastSvcTime = -1; @@ -125,7 +124,6 @@ public class DemoCutter { disconnectIssued = true; } } - svcLoops++; } byte[] injectBufferAsBytes = null; From 01e628f1e0d7a2e6bdbe976ea8dc859024008469 Mon Sep 17 00:00:00 2001 From: BuddyFriendGuy Date: Sat, 16 May 2015 00:19:54 -0400 Subject: [PATCH 3/3] fix previous commit's bug; now the loop logic is the same as the original version, except for injectAtStart is surely to run once --- .../application/democutter/DemoCutter.java | 56 ++++++++++--------- 1 file changed, 30 insertions(+), 26 deletions(-) diff --git a/misc/tools/NexuizDemoRecorder/main/src/main/java/com/nexuiz/demorecorder/application/democutter/DemoCutter.java b/misc/tools/NexuizDemoRecorder/main/src/main/java/com/nexuiz/demorecorder/application/democutter/DemoCutter.java index 397a03b..105ae12 100644 --- a/misc/tools/NexuizDemoRecorder/main/src/main/java/com/nexuiz/demorecorder/application/democutter/DemoCutter.java +++ b/misc/tools/NexuizDemoRecorder/main/src/main/java/com/nexuiz/demorecorder/application/democutter/DemoCutter.java @@ -95,34 +95,38 @@ public class DemoCutter { } lastSvcTime = svctime; + if (demoStarted < 1 && svctime > (startTime - 50)) { + injectBuffer = "slowmo " + ffwSpeedSecondStage; + demoStarted = 1; + } + if (demoStarted < 2 && svctime > (startTime - 5)) { + injectBuffer = "slowmo 1;" + injectBeforeCap; + demoStarted = 2; + } + if (demoStarted < 3 && svctime > startTime) { + injectBuffer = "cl_capturevideo 1"; + demoStarted = 3; + } + if (!endIsReached && svctime > endTime) { + injectBuffer = "cl_capturevideo 0"; + endIsReached = true; + } + if (endIsReached && !finalInjectionDone && svctime > (endTime + 1)) { + injectBuffer = injectAfterCap; + finalInjectionDone = true; + } + if (finalInjectionDone && !disconnectIssued && svctime > (endTime + 2)) { + injectBuffer = "disconnect"; + disconnectIssued = true; + } + // ensure injectAtStart runs exactly once, before everything else if (firstLoop) { - injectBuffer = "\011\n" + injectAtStart + ";slowmo " + ffwSpeedFirstStage + "\n\000"; + injectBuffer = injectAtStart + ";slowmo " + ffwSpeedFirstStage + ";" + injectBuffer; firstLoop = false; - } else { - if (demoStarted < 1 && svctime > (startTime - 50)) { - injectBuffer = "\011\nslowmo " + ffwSpeedSecondStage + "\n\000"; - demoStarted = 1; - } - if (demoStarted < 2 && svctime > (startTime - 5)) { - injectBuffer = "\011\nslowmo 1;" + injectBeforeCap +"\n\000"; - demoStarted = 2; - } - if (demoStarted < 3 && svctime > startTime) { - injectBuffer = "\011\ncl_capturevideo 1\n\000"; - demoStarted = 3; - } - if (!endIsReached && svctime > endTime) { - injectBuffer = "\011\ncl_capturevideo 0\n\000"; - endIsReached = true; - } - if (endIsReached && !finalInjectionDone && svctime > (endTime + 1)) { - injectBuffer = "\011\n" + injectAfterCap + "\n\000"; - finalInjectionDone = true; - } - if (finalInjectionDone && !disconnectIssued && svctime > (endTime + 2)) { - injectBuffer = "\011\ndisconnect\n\000"; - disconnectIssued = true; - } + } + // add Buffer head and tail + if (injectAtStart.length() > 0) { + injectBuffer = "\011\n" + checkInjectString(injectBuffer) + "\n\000"; } }