Modified SwapBufferCollection to swap handles directly instead of the silly indices thing I had.

Signed-off-by: Aditya Gaddam <adityagaddam@gmail.com> (LostInCake)

Author: lostinspacebar

wrappers/csharp/src/lib/SwapBufferCollection.cs

@@ -39,22 +39,12 @@ namespace freenect
 /// 
 public class SwapBufferCollection<T> : IDisposable
 {
-/// <summary>
-/// This small array takes care of mapping 
-/// where the data is and where their swapped indices are
-/// </summary>
-private int[] bufferIndicesMap;
-
+
 /// <summary>
 /// GC handles for each of the buffers in this collection
 /// </summary>
 private GCHandle[] bufferHandles;
 
-/// <summary>
-/// Buffers for data
-/// </summary>
-private T[][] buffers;
-
 /// <summary>
 /// Gets the buffer at the specified index
 /// </summary>
@@ -65,7 +55,7 @@ public T[] this[int index]
 {
 get
 {
-return this.buffers[this.bufferIndicesMap[index]];
+return (T[])this.bufferHandles[index].Target;
 }
 }
 
@@ -104,14 +94,11 @@ public SwapBufferCollection(int numBuffers, int bufferSize)
 this.Count = numBuffers;
 
 // Allocate buffers and save pinned handles to them
-this.bufferIndicesMap = new int[numBuffers];
 this.bufferHandles = new GCHandle[numBuffers];
-this.buffers = new T[numBuffers][];
 for(int i = 0; i < numBuffers; i++)
 {
-this.bufferIndicesMap[i] = i;
-this.buffers[i] = new T[bufferSize];
-this.bufferHandles[i] = GCHandle.Alloc(this.buffers[i], GCHandleType.Pinned);
+var buffer = new T[bufferSize];
+this.bufferHandles[i] = GCHandle.Alloc(buffer, GCHandleType.Pinned);
 }
 }
 
@@ -127,7 +114,7 @@ public SwapBufferCollection(int numBuffers, int bufferSize)
 /// </returns>
 public IntPtr GetHandle(int index)
 {
-return this.bufferHandles[this.bufferIndicesMap[index]].AddrOfPinnedObject();
+return this.bufferHandles[index].AddrOfPinnedObject();
 }
 
 /// <summary>
@@ -154,9 +141,9 @@ public void Swap(int index1, int index2)
 }
 
 // Swap
-int tmp = this.bufferIndicesMap[index1];
-this.bufferIndicesMap[index1] = this.bufferIndicesMap[index2];
-this.bufferIndicesMap[index2] = tmp;
+var tmp = this.bufferHandles[index1];
+this.bufferHandles[index1] = this.bufferHandles[index2];
+this.bufferHandles[index2] = tmp;
 }
 
 /// <summary>