all this to make stop work without message passing

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@744 8ced0084-cf51-0410-be5f-012b33b47a6e

Source/Core/Core/Src/Core.cpp

@@ -184,7 +184,7 @@ void Stop() // - Hammertime!
 #ifdef _WIN32
 	PostMessage((HWND)g_pWindowHandle, WM_QUIT, 0, 0);
 #else
-	// TODO(ector) : post message exit
+        PluginVideo::Video_Stop();
 #endif
 
 	delete g_pThread; //Wait for emuthread to close

Source/Core/Core/Src/Plugins/Plugin_Video.cpp

@@ -35,6 +35,7 @@ TVideo_Screenshot   Video_Screenshot      = 0;
 TVideo_EnterLoop    Video_EnterLoop       = 0;
 TVideo_AddMessage   Video_AddMessage      = 0;
 TVideo_DoState      Video_DoState         = 0;
+TVideo_Stop         Video_Stop            = 0;
     
 // Library Instance
 DynamicLibrary plugin;
@@ -57,6 +58,7 @@ void UnloadPlugin()
     Video_UpdateXFB = 0;
     Video_AddMessage = 0;
     Video_DoState = 0;
+    Video_Stop = 0;
 
     plugin.Unload();
 }
@@ -77,6 +79,7 @@ bool LoadPlugin(const char *_Filename)
 		Video_EnterLoop    = reinterpret_cast<TVideo_EnterLoop>    (plugin.Get("Video_EnterLoop"));
 		Video_AddMessage   = reinterpret_cast<TVideo_AddMessage>   (plugin.Get("Video_AddMessage"));
 		Video_DoState      = reinterpret_cast<TVideo_DoState>      (plugin.Get("Video_DoState"));
+                Video_Stop         = reinterpret_cast<TVideo_Stop>         (plugin.Get("Video_Stop"));
 		if ((GetDllInfo != 0) &&
 			(DllAbout != 0) &&
 			(DllConfig != 0) &&
@@ -88,7 +91,8 @@ bool LoadPlugin(const char *_Filename)
 			(Video_EnterLoop != 0) &&
 			(Video_Screenshot != 0) &&
 			(Video_AddMessage != 0) &&
-			(Video_DoState != 0) )
+			(Video_DoState != 0) && 
+                        (Video_Stop != 0))
 		{
 			return true;
 		}

Source/Core/Core/Src/Plugins/Plugin_Video.h

@@ -43,6 +43,7 @@ typedef BOOL (__cdecl* TVideo_Screenshot)(TCHAR*);
 typedef void (__cdecl* TVideo_EnterLoop)();
 typedef void (__cdecl* TVideo_AddMessage)(const char* pstr, unsigned int milliseconds);
 typedef void (__cdecl* TVideo_DoState)(unsigned char **ptr, int mode);
+typedef void (__cdecl* TVideo_Stop)();
  
 // Function Pointers
 extern TGetDllInfo         GetDllInfo;
@@ -57,6 +58,7 @@ extern TVideo_Screenshot   Video_Screenshot;
 extern TVideo_EnterLoop    Video_EnterLoop;
 extern TVideo_AddMessage   Video_AddMessage;
 extern TVideo_DoState      Video_DoState;
+extern TVideo_Stop         Video_Stop;
 
 } // end of namespace PluginVideo
 

Source/Core/VideoCommon/Src/Fifo.cpp

@@ -29,6 +29,8 @@ extern u32 g_pVideoData;
 FifoReader fifo;
 #endif
 
+bool fifoStateRun = true;
+
 // STATE_TO_SAVE
 static u8 *videoBuffer;
 static int size = 0;
@@ -46,11 +48,17 @@ void Fifo_Init()
 #ifndef DATAREADER_INLINE
     fifo.Init(videoBuffer, videoBuffer);  //zero length. there is no data yet.
 #endif
+    fifoStateRun = true;
 }
 
 void Fifo_Shutdown()
 {
     FreeMemoryPages(videoBuffer, FIFO_SIZE);
+    fifoStateRun = false;
+}
+
+void Fifo_Stop() {
+    fifoStateRun = false;
 }
 
 u32 FAKE_GetFifoStartPtr()
@@ -161,7 +169,7 @@ void Fifo_EnterLoop(const SVideoInitialize &video_initialize)
 #endif
 
     // TODO(ector): Don't peek so often!
-    while (video_initialize.pPeekMessages())
+    while (fifoStateRun || video_initialize.pPeekMessages())
     {
 #if defined(THREAD_VIDEO_WAKEUP_ONIDLE) && defined(_WIN32)
 	if (MsgWaitForMultipleObjects(1, &hEventOnIdle, FALSE, 1L, QS_ALLEVENTS) == WAIT_ABANDONED)

Source/Core/VideoCommon/Src/Fifo.h

@@ -71,6 +71,7 @@ void Fifo_Init();
 void Fifo_Shutdown();
 void Fifo_EnterLoop(const SVideoInitialize &video_initialize);
 void Fifo_DoState(PointerWrap &f);
+void Fifo_Stop();
 
 #endif
 

Source/PluginSpecs/pluginspecs_video.h

@@ -182,5 +182,13 @@ EXPORT void CALL Video_AddMessage(const char* pstr, unsigned int milliseconds);
 //
 EXPORT void CALL Video_DoState(unsigned char **ptr, int mode);
 
+// __________________________________________________________________________________________________
+// Function: Video_Stop
+// Purpose:  Stop the video plugin before shutdown
+// input/output: 
+// input: 
+//
+EXPORT void CALL Video_Stop();
+
 #include "ExportEpilog.h"
 #endif

Source/Plugins/Plugin_VideoDX9/Src/main.cpp

@@ -192,6 +192,7 @@ void Video_DoState(unsigned char **ptr, int mode) {
 	//PanicAlert("Saving/Loading state from DirectX9");
 }
 
+
 void Video_EnterLoop()
 {
 	Fifo_EnterLoop(g_VideoInitialize);
@@ -219,6 +220,10 @@ void Video_Shutdown(void)
 	DeInit();
 }
 
+void Video_Stop(void) 
+{
+}
+
 void Video_UpdateXFB(u8* /*_pXFB*/, u32 /*_dwWidth*/, u32 /*_dwHeight*/)
 {
 	/*

Source/Plugins/Plugin_VideoOGL/Src/GLInit.cpp

@@ -79,7 +79,7 @@ BOOL Callback_PeekMessages()
 	// TODO: There is no documentation of this function and the calling code
 	//       ignores the return value, so I have no idea what would be the
 	//       proper value to return.
-    return TRUE;
+    return FALSE;
 #elif defined(_WIN32)
     //TODO: peekmessage
     MSG msg;
@@ -94,7 +94,7 @@ BOOL Callback_PeekMessages()
 #else // GLX
     // This is called from Outside of our video thread, from EmuThread
     // The calls are NOT thread safe, so it breaks everything
-    return TRUE;
+        return FALSE;
 #endif
 }
 

Source/Plugins/Plugin_VideoOGL/Src/main.cpp

@@ -221,6 +221,10 @@ void Video_Shutdown(void)
     OpenGL_Shutdown();
 }
 
+void Video_Stop(void) 
+{
+    Fifo_Stop();
+}
 
 void Video_EnterLoop()
 {