From eadea2481e87dd0a9780beaa3e3dc7621fb45419 Mon Sep 17 00:00:00 2001
From: "J.D. Purcell" <jdpurcell@gmail.com>
Date: Sun, 2 Apr 2017 19:39:13 -0400
Subject: [PATCH] Rewind: Re-order some methods (no code change).

---
 BizHawk.Client.Common/rewind/Rewinder.cs | 120 +++++++++++------------
 1 file changed, 60 insertions(+), 60 deletions(-)

diff --git a/BizHawk.Client.Common/rewind/Rewinder.cs b/BizHawk.Client.Common/rewind/Rewinder.cs
index 2ac4380923..b5b72ebe77 100644
--- a/BizHawk.Client.Common/rewind/Rewinder.cs
+++ b/BizHawk.Client.Common/rewind/Rewinder.cs
@@ -57,26 +57,6 @@ namespace BizHawk.Client.Common
 			get { return Global.Config.RewindEnabledLarge || Global.Config.RewindEnabledMedium || Global.Config.RewindEnabledSmall; }
 		}
 
-		public void Capture()
-		{
-			if (!IsRewindEnabledAtAll || !Global.Emulator.HasSavestates())
-			{
-				return;
-			}
-
-			if (_rewindThread == null)
-			{
-				Initialize();
-			}
-
-			if (_rewindThread == null || Global.Emulator.Frame % _rewindFrequency != 0)
-			{
-				return;
-			}
-
-			_rewindThread.Capture(Global.Emulator.AsStatable().SaveStateBinary());
-		}
-
 		public void Initialize()
 		{
 			Clear();
@@ -121,46 +101,6 @@ namespace BizHawk.Client.Common
 			}
 		}
 
-		public bool Rewind(int frames)
-		{
-			if (!Global.Emulator.HasSavestates() || _rewindThread == null)
-			{
-				return false;
-			}
-
-			_rewindThread.Rewind(frames);
-
-			return _lastRewindLoadedState;
-		}
-
-		private void RewindInternal(int frames)
-		{
-			_lastRewindLoadedState = false;
-
-			for (int i = 0; i < frames; i++)
-			{
-				if (_rewindBuffer.Count <= 1 || (Global.MovieSession.Movie.IsActive && Global.MovieSession.Movie.InputLogLength == 0))
-				{
-					break;
-				}
-
-				LoadPreviousState();
-				_lastRewindLoadedState = true;
-			}
-		}
-
-		private void CaptureInternal(byte[] coreSavestate)
-		{
-			if (_rewindDeltaEnable)
-			{
-				CaptureStateDelta(coreSavestate);
-			}
-			else
-			{
-				CaptureStateNonDelta(coreSavestate);
-			}
-		}
-
 		public void Clear()
 		{
 			if (_rewindThread != null)
@@ -254,6 +194,38 @@ namespace BizHawk.Client.Common
 			}
 		}
 
+		public void Capture()
+		{
+			if (!IsRewindEnabledAtAll || !Global.Emulator.HasSavestates())
+			{
+				return;
+			}
+
+			if (_rewindThread == null)
+			{
+				Initialize();
+			}
+
+			if (_rewindThread == null || Global.Emulator.Frame % _rewindFrequency != 0)
+			{
+				return;
+			}
+
+			_rewindThread.Capture(Global.Emulator.AsStatable().SaveStateBinary());
+		}
+
+		private void CaptureInternal(byte[] coreSavestate)
+		{
+			if (_rewindDeltaEnable)
+			{
+				CaptureStateDelta(coreSavestate);
+			}
+			else
+			{
+				CaptureStateNonDelta(coreSavestate);
+			}
+		}
+
 		private void CaptureStateNonDelta(byte[] state)
 		{
 			long offset = _rewindBuffer.Enqueue(0, state.Length + 1);
@@ -352,6 +324,34 @@ namespace BizHawk.Client.Common
 			UpdateLastState(currentState);
 		}
 
+		public bool Rewind(int frames)
+		{
+			if (!Global.Emulator.HasSavestates() || _rewindThread == null)
+			{
+				return false;
+			}
+
+			_rewindThread.Rewind(frames);
+
+			return _lastRewindLoadedState;
+		}
+
+		private void RewindInternal(int frames)
+		{
+			_lastRewindLoadedState = false;
+
+			for (int i = 0; i < frames; i++)
+			{
+				if (_rewindBuffer.Count <= 1 || (Global.MovieSession.Movie.IsActive && Global.MovieSession.Movie.InputLogLength == 0))
+				{
+					break;
+				}
+
+				LoadPreviousState();
+				_lastRewindLoadedState = true;
+			}
+		}
+
 		private MemoryStream GetPreviousStateMemoryStream()
 		{
 			if (_rewindDeltaEnable)