completed renaming source to input

jasonm-unity · jasonm-unity · commit 07fb9d2ecd10 · 2017-05-31T16:16:15.000-04:00
diff --git a/source/Core/FrameRecorder/Core/Engine/Recorder.cs b/source/Core/FrameRecorder/Core/Engine/Recorder.cs
@@ -20,7 +20,7 @@ public abstract class Recorder : ScriptableObject
 
         public int recordedFramesCount { get; set; }
         
-        protected List<RecorderInput> m_Sources;
+        protected List<RecorderInput> m_Inputs;
 
         public virtual void Reset()
         {
@@ -55,12 +55,12 @@ public virtual bool BeginRecording(RecordingSession session)
                     Debug.Log("Frame recorder set fixed frame rate to " + fixedRate);
             }
 
-            m_Sources = new List<RecorderInput>();
-            foreach (var sourceSettings in settings.m_SourceSettings)
+            m_Inputs = new List<RecorderInput>();
+            foreach (var inputSettings in settings.m_SourceSettings)
             {
-                var source = Activator.CreateInstance(sourceSettings.inputType) as RecorderInput;
-                source.settings = sourceSettings;
-                m_Sources.Add(source);
+                var input = Activator.CreateInstance(inputSettings.inputType) as RecorderInput;
+                input.settings = inputSettings;
+                m_Inputs.Add(input);
             }
             return recording = true;
         }
@@ -78,10 +78,10 @@ public virtual void EndRecording(RecordingSession ctx)
                     Debug.Log("Frame recorder resetting fixed frame rate to original value of " + m_OriginalCaptureFrameRate);
             }
 
-            foreach (var source in m_Sources)
+            foreach (var input in m_Inputs)
             {
-                if (source is IDisposable)
-                    (source as IDisposable).Dispose();
+                if (input is IDisposable)
+                    (input as IDisposable).Dispose();
             }
 
             Debug.Log(string.Format("{0} recording stopped, total frame count: {1}", GetType().Name, recordedFramesCount));
@@ -103,24 +103,24 @@ public void SignalSourcesOfStage(ERecordingSessionStage stage, RecordingSession
             switch (stage)
             {
                 case ERecordingSessionStage.BeginRecording:
-                    foreach( var source in m_Sources )
-                        source.BeginRecording(session);
+                    foreach( var input in m_Inputs )
+                        input.BeginRecording(session);
                     break;
                 case ERecordingSessionStage.NewFrameStarting:
-                    foreach( var source in m_Sources )
-                        source.NewFrameStarting(session);
+                    foreach( var input in m_Inputs )
+                        input.NewFrameStarting(session);
                     break;
                 case ERecordingSessionStage.NewFrameReady:
-                    foreach( var source in m_Sources )
-                        source.NewFrameReady(session);
+                    foreach( var input in m_Inputs )
+                        input.NewFrameReady(session);
                     break;
                 case ERecordingSessionStage.FrameDone:
-                    foreach( var source in m_Sources )
-                        source.FrameDone(session);
+                    foreach( var input in m_Inputs )
+                        input.FrameDone(session);
                     break;
                 case ERecordingSessionStage.EndRecording:
-                    foreach( var source in m_Sources )
-                        source.EndRecording(session);
+                    foreach( var input in m_Inputs )
+                        input.EndRecording(session);
                     break;
                 default:
                     throw new ArgumentOutOfRangeException("stage", stage, null);
diff --git a/source/Core/FrameRecorder/Recorders/PNG/Engine/PNGRecorder.cs b/source/Core/FrameRecorder/Recorders/PNG/Engine/PNGRecorder.cs
@@ -17,16 +17,16 @@ string MakeFileName(RecordingSession session)
 
         public override void RecordFrame(RecordingSession session)
         {
-            if (m_Sources.Count != 1)
+            if (m_Inputs.Count != 1)
                 throw new Exception("Unsupported number of sources");
 
-            var source = (RenderTextureInput)m_Sources[0];
+            var input = (RenderTextureInput)m_Inputs[0];
 
-            var width = source.outputRT.width;
-            var height = source.outputRT.height;
+            var width = input.outputRT.width;
+            var height = input.outputRT.height;
             var tex = new Texture2D(width, height, TextureFormat.RGB24, false);
             var backupActive = RenderTexture.active;
-            RenderTexture.active = source.outputRT;
+            RenderTexture.active = input.outputRT;
             tex.ReadPixels(new Rect(0, 0, width, height), 0, 0);
             tex.Apply();
             RenderTexture.active = backupActive;
diff --git a/source/FrameCapturer/Recorders/EXR/EXRRecorder.cs b/source/FrameCapturer/Recorders/EXR/EXRRecorder.cs
@@ -36,12 +36,12 @@ public override void EndRecording(RecordingSession session)
 
         public override void RecordFrame(RecordingSession session)
         {
-            if (m_Sources.Count != 1)
+            if (m_Inputs.Count != 1)
                 throw new Exception("Unsupported number of sources");
 
             var path = BuildOutputPath(session);
-            var source = (RenderTextureInput)m_Sources[0];
-            var frame = source.outputRT;
+            var input = (RenderTextureInput)m_Inputs[0];
+            var frame = input.outputRT;
 
             fcAPI.fcLock(frame, (data, fmt) =>
             {
diff --git a/source/FrameCapturer/Recorders/GIF/GIFRecorder.cs b/source/FrameCapturer/Recorders/GIF/GIFRecorder.cs
@@ -31,11 +31,11 @@ public override void EndRecording(RecordingSession session)
 
         public override void RecordFrame(RecordingSession session)
         {
-            if (m_Sources.Count != 1)
+            if (m_Inputs.Count != 1)
                 throw new Exception("Unsupported number of sources");
 
-            var source = (RenderTextureInput)m_Sources[0];
-            var frame = source.outputRT;
+            var input = (RenderTextureInput)m_Inputs[0];
+            var frame = input.outputRT;
 
             if(!m_ctx)
             {
diff --git a/source/FrameCapturer/Recorders/MP4/MP4Recorder.cs b/source/FrameCapturer/Recorders/MP4/MP4Recorder.cs
@@ -29,11 +29,11 @@ public override void EndRecording(RecordingSession session)
 
         public override void RecordFrame(RecordingSession session)
         {
-            if (m_Sources.Count != 1)
+            if (m_Inputs.Count != 1)
                 throw new Exception("Unsupported number of sources");
 
-            var source = (RenderTextureInput)m_Sources[0];
-            var frame = source.outputRT;
+            var input = (RenderTextureInput)m_Inputs[0];
+            var frame = input.outputRT;
 
             if(!m_ctx)
             {
diff --git a/source/FrameCapturer/Recorders/PNG/PNGRecorder.cs b/source/FrameCapturer/Recorders/PNG/PNGRecorder.cs
@@ -29,12 +29,12 @@ public override void EndRecording(RecordingSession session)
 
         public override void RecordFrame(RecordingSession session)
         {
-            if (m_Sources.Count != 1)
+            if (m_Inputs.Count != 1)
                 throw new Exception("Unsupported number of sources");
 
             var path = BuildOutputPath(session);
-            var source = (RenderTextureInput)m_Sources[0];
-            var frame = source.outputRT;
+            var input = (RenderTextureInput)m_Inputs[0];
+            var frame = input.outputRT;
 
             fcAPI.fcLock(frame, (data, fmt) =>
             {
diff --git a/source/FrameCapturer/Recorders/WEBM/WEBMRecorder.cs b/source/FrameCapturer/Recorders/WEBM/WEBMRecorder.cs
@@ -31,11 +31,11 @@ public override void EndRecording(RecordingSession session)
 
         public override void RecordFrame(RecordingSession session)
         {
-            if (m_Sources.Count != 1)
+            if (m_Inputs.Count != 1)
                 throw new Exception("Unsupported number of sources");
 
-            var source = (RenderTextureInput)m_Sources[0];
-            var frame = source.outputRT;
+            var input = (RenderTextureInput)m_Inputs[0];
+            var frame = input.outputRT;
 
             if (!m_ctx)
             {

Original file line number	Diff line number	Diff line change
`@@ -36,12 +36,12 @@ public override void EndRecording(RecordingSession session)`
`36`	`36`
`37`	`37`	`public override void RecordFrame(RecordingSession session)`
`38`	`38`	`{`
`39`		`- if (m_Sources.Count != 1)`
	`39`	`+ if (m_Inputs.Count != 1)`
`40`	`40`	`throw new Exception("Unsupported number of sources");`
`41`	`41`
`42`	`42`	`var path = BuildOutputPath(session);`
`43`		`- var source = (RenderTextureInput)m_Sources[0];`
`44`		`- var frame = source.outputRT;`
	`43`	`+ var input = (RenderTextureInput)m_Inputs[0];`
	`44`	`+ var frame = input.outputRT;`
`45`	`45`
`46`	`46`	`fcAPI.fcLock(frame, (data, fmt) =>`
`47`	`47`	`{`
Original file line number	Diff line number	Diff line change
`@@ -31,11 +31,11 @@ public override void EndRecording(RecordingSession session)`
`31`	`31`
`32`	`32`	`public override void RecordFrame(RecordingSession session)`
`33`	`33`	`{`
`34`		`- if (m_Sources.Count != 1)`
	`34`	`+ if (m_Inputs.Count != 1)`
`35`	`35`	`throw new Exception("Unsupported number of sources");`
`36`	`36`
`37`		`- var source = (RenderTextureInput)m_Sources[0];`
`38`		`- var frame = source.outputRT;`
	`37`	`+ var input = (RenderTextureInput)m_Inputs[0];`
	`38`	`+ var frame = input.outputRT;`
`39`	`39`
`40`	`40`	`if(!m_ctx)`
`41`	`41`	`{`
Original file line number	Diff line number	Diff line change
`@@ -29,11 +29,11 @@ public override void EndRecording(RecordingSession session)`
`29`	`29`
`30`	`30`	`public override void RecordFrame(RecordingSession session)`
`31`	`31`	`{`
`32`		`- if (m_Sources.Count != 1)`
	`32`	`+ if (m_Inputs.Count != 1)`
`33`	`33`	`throw new Exception("Unsupported number of sources");`
`34`	`34`
`35`		`- var source = (RenderTextureInput)m_Sources[0];`
`36`		`- var frame = source.outputRT;`
	`35`	`+ var input = (RenderTextureInput)m_Inputs[0];`
	`36`	`+ var frame = input.outputRT;`
`37`	`37`
`38`	`38`	`if(!m_ctx)`
`39`	`39`	`{`
Original file line number	Diff line number	Diff line change
`@@ -29,12 +29,12 @@ public override void EndRecording(RecordingSession session)`
`29`	`29`
`30`	`30`	`public override void RecordFrame(RecordingSession session)`
`31`	`31`	`{`
`32`		`- if (m_Sources.Count != 1)`
	`32`	`+ if (m_Inputs.Count != 1)`
`33`	`33`	`throw new Exception("Unsupported number of sources");`
`34`	`34`
`35`	`35`	`var path = BuildOutputPath(session);`
`36`		`- var source = (RenderTextureInput)m_Sources[0];`
`37`		`- var frame = source.outputRT;`
	`36`	`+ var input = (RenderTextureInput)m_Inputs[0];`
	`37`	`+ var frame = input.outputRT;`
`38`	`38`
`39`	`39`	`fcAPI.fcLock(frame, (data, fmt) =>`
`40`	`40`	`{`