1.8.2.7: Added missing file.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/trunk@445 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/casparcg.sln b/casparcg.sln
index 9267fc4e0931910be8d9dd34ad8f8236085a971d..77ed8b99e2aed255ad20c356ef172545ad589e79 100644 (file)
--- a/casparcg.sln
+++ b/casparcg.sln
@@ -3,6 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Server", "server\Server.vcxproj", "{79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}"\r
 EndProject\r
+Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Server Setup", "server setup\Server Setup.vdproj", "{A4200A1B-B458-4EBD-ACEC-F0E6B0FAA906}"\r
+EndProject\r
 Global\r
        GlobalSection(SubversionScc) = preSolution\r
                Svn-Managed = True\r
@@ -10,16 +12,32 @@ Global
        EndGlobalSection\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug|Win32 = Debug|Win32\r
+               FFMPEG 0.5|Win32 = FFMPEG 0.5|Win32\r
                no bluefish|Win32 = no bluefish|Win32\r
                Release|Win32 = Release|Win32\r
+               WO Bluefish|Win32 = WO Bluefish|Win32\r
        EndGlobalSection\r
        GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
                {79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}.Debug|Win32.Build.0 = Debug|Win32\r
+               {79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}.FFMPEG 0.5|Win32.ActiveCfg = Release|Win32\r
+               {79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}.FFMPEG 0.5|Win32.Build.0 = Release|Win32\r
                {79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}.no bluefish|Win32.ActiveCfg = no bluefish|Win32\r
                {79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}.no bluefish|Win32.Build.0 = no bluefish|Win32\r
                {79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}.Release|Win32.ActiveCfg = Release|Win32\r
                {79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}.Release|Win32.Build.0 = Release|Win32\r
+               {79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}.WO Bluefish|Win32.ActiveCfg = Release|Win32\r
+               {79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}.WO Bluefish|Win32.Build.0 = Release|Win32\r
+               {A4200A1B-B458-4EBD-ACEC-F0E6B0FAA906}.Debug|Win32.ActiveCfg = Debug\r
+               {A4200A1B-B458-4EBD-ACEC-F0E6B0FAA906}.Debug|Win32.Build.0 = Debug\r
+               {A4200A1B-B458-4EBD-ACEC-F0E6B0FAA906}.FFMPEG 0.5|Win32.ActiveCfg = FFMPEG 0.5\r
+               {A4200A1B-B458-4EBD-ACEC-F0E6B0FAA906}.FFMPEG 0.5|Win32.Build.0 = FFMPEG 0.5\r
+               {A4200A1B-B458-4EBD-ACEC-F0E6B0FAA906}.no bluefish|Win32.ActiveCfg = WO Bluefish\r
+               {A4200A1B-B458-4EBD-ACEC-F0E6B0FAA906}.no bluefish|Win32.Build.0 = WO Bluefish\r
+               {A4200A1B-B458-4EBD-ACEC-F0E6B0FAA906}.Release|Win32.ActiveCfg = Release\r
+               {A4200A1B-B458-4EBD-ACEC-F0E6B0FAA906}.Release|Win32.Build.0 = Release\r
+               {A4200A1B-B458-4EBD-ACEC-F0E6B0FAA906}.WO Bluefish|Win32.ActiveCfg = WO Bluefish\r
+               {A4200A1B-B458-4EBD-ACEC-F0E6B0FAA906}.WO Bluefish|Win32.Build.0 = WO Bluefish\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r

diff --git a/server/utils/timer.h b/server/utils/timer.h
new file mode 100644 (file)
index 0000000..b683d7d
--- /dev/null
+++ b/server/utils/timer.h
@@ -0,0 +1,64 @@
+#pragma once\r
+\r
+#include <windows.h>\r
+\r
+namespace caspar {\r
+       \r
+class timer\r
+{\r
+public:\r
+       timer()\r
+       {\r
+               QueryPerformanceFrequency(&freq_);\r
+               QueryPerformanceCounter(&time_);\r
+       }\r
+\r
+       // Author: Ryan M. Geiss\r
+       // http://www.geisswerks.com/ryan/FAQS/timing.html\r
+       void tick(double interval)\r
+       {       \r
+               LARGE_INTEGER t;\r
+               QueryPerformanceCounter(&t);\r
+\r
+               if (time_.QuadPart != 0)\r
+               {\r
+                       int ticks_to_wait = static_cast<int>(static_cast<double>(freq_.QuadPart) * interval);\r
+                       int done = 0;\r
+                       do\r
+                       {\r
+                               QueryPerformanceCounter(&t);\r
+                               \r
+                               int ticks_passed = static_cast<int>(static_cast<__int64>(t.QuadPart) - static_cast<__int64>(time_.QuadPart));\r
+                               int ticks_left = ticks_to_wait - ticks_passed;\r
+\r
+                               if (t.QuadPart < time_.QuadPart)    // time wrap\r
+                                       done = 1;\r
+                               if (ticks_passed >= ticks_to_wait)\r
+                                       done = 1;\r
+                               \r
+                               if (!done)\r
+                               {\r
+                                       // if > 0.002s left, do Sleep(1), which will actually sleep some \r
+                                       //   steady amount, probably 1-2 ms,\r
+                                       //   and do so in a nice way (cpu meter drops; laptop battery spared).\r
+                                       // otherwise, do a few Sleep(0)'s, which just give up the timeslice,\r
+                                       //   but don't really save cpu or battery, but do pass a tiny\r
+                                       //   amount of time.\r
+                                       if (ticks_left > static_cast<int>((freq_.QuadPart*2)/1000))\r
+                                               Sleep(1);\r
+                                       else                        \r
+                                               for (int i = 0; i < 10; ++i) \r
+                                                       Sleep(0);  // causes thread to give up its timeslice\r
+                               }\r
+                       }\r
+                       while (!done);            \r
+               }\r
+\r
+               time_ = t;\r
+       }               \r
+private:       \r
+       LARGE_INTEGER freq_;\r
+       LARGE_INTEGER time_;\r
+};\r
+\r
+}
\ No newline at end of file