Applied p-static's video playback timing patch, and fixed a few things for eventual dynamic wx linking.

Originally committed to SVN as r1786.

aegisub/setup.cpp

@@ -120,6 +120,7 @@
 #pragma comment(lib, "winmm.lib")
 #pragma comment(lib, "advapi32.lib")
 #pragma comment(lib, "wsock32.lib")
+#pragma comment(lib, "opengl32.lib")
 
 
 //////////////

aegisub/stdwx.h

@@ -55,6 +55,9 @@
 #define WIN32_LEAN_AND_MEAN
 
 
+#include "config.h"
+
+
 /////////////////////
 // wxWidgets headers
 #include <wx/wxprec.h>

aegisub/video_context.cpp

@@ -724,10 +724,9 @@ void VideoContext::Play() {
 	isPlaying = true;
 
 	// Start timer
-	startTime = clock();
+	playTime.Start();
-	playTime = startTime;
 	playback.SetOwner(this,VIDEO_PLAY_TIMER);
-	playback.Start(1);
+	playback.Start(10);
 }
 
 
@@ -751,12 +750,11 @@ void VideoContext::PlayLine() {
 	JumpToFrame(startFrame);
 
 	// Set other variables
-	startTime = clock();
+	playTime.Start(curline->Start.GetMS());
-	playTime = startTime;
 
 	// Start timer
 	playback.SetOwner(this,VIDEO_PLAY_TIMER);
-	playback.Start(1);
+	playback.Start(10);
 }
 
 
@@ -781,9 +779,7 @@ void VideoContext::OnPlayTimer(wxTimerEvent &event) {
 	wxMutexLocker lock(playMutex);
 
 	// Get time difference
-	clock_t cur = clock();
+	int dif = playTime.Time();
-	clock_t dif = (clock() - startTime)*1000/CLOCKS_PER_SEC;
-	playTime = cur;
 
 	// Find next frame
 	int startMs = VFR_Output.GetTimeAtFrame(startFrame);

aegisub/video_context.h

@@ -43,6 +43,7 @@
 #include <wx/wxprec.h>
 #include <wx/glcanvas.h>
 #include <wx/timer.h>
+#include <wx/stopwatch.h>
 #ifndef wxUSE_GLCANVAS
 #error "Aegisub requires wxWidgets to be compiled with OpenGL support."
 #endif
@@ -100,8 +101,7 @@ private:
 
 	wxMutex playMutex;
 	wxTimer playback;
-	clock_t playTime;
+	wxStopWatch playTime;
-	clock_t startTime;
 	int startFrame;
 	int endFrame;
 	int playNextFrame;