Skip to content

Commit

Permalink
Removes Camera Server Code
Browse files Browse the repository at this point in the history
Its not going to work well anyway. Just like Java its going to be slow
and cause too much strain on the GC. I'm going to recommend using
mjpeg-streamer, which robotpy say they are going to upload soon to their
servers.
  • Loading branch information
ThadHouse committed Jan 5, 2016
1 parent 2180fe5 commit 52bc6bc
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 7 deletions.
6 changes: 5 additions & 1 deletion WPILib/CameraServer.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System;
/*
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
Expand All @@ -12,6 +13,7 @@
namespace WPILib
{
public class CameraServer
{
private const int Port = 1180;
Expand Down Expand Up @@ -403,4 +405,6 @@ protected void Serve()
}
}
}
}
*/
10 changes: 8 additions & 2 deletions WPILib/Vision/USBCamera.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System;
/*
using System;
using System.Runtime.InteropServices;
using System.Threading;
using NIVision;
Expand All @@ -10,6 +11,7 @@
namespace WPILib.Vision
{
public class USBCamera
{
Expand Down Expand Up @@ -222,7 +224,11 @@ public static uint GetJpegSize(IntPtr image, uint size)
}
return 0;
}
}
}
#pragma warning restore 1591
#pragma warning restore 169
#pragma warning restore 169
*/
4 changes: 0 additions & 4 deletions WPILib/WPILib.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -181,10 +181,6 @@
<Name>HAL</Name>
<Private>True</Private>
</ProjectReference>
<ProjectReference Include="..\NIVision\NIVision.csproj">
<Project>{d461ad43-b66d-4c66-925d-9759bf1e4654}</Project>
<Name>NIVision</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
Expand Down

0 comments on commit 52bc6bc

Please sign in to comment.