mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-30 11:19:48 +02:00
Code Issues Projects Releases Wiki Activity

- fixed build on windows

Browse Source
This commit is contained in:
Mark Vejvoda
2012-05-12 23:59:40 +00:00
parent 69c1de284c
commit e3c2719458
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/shared_lib/sources/graphics/video_player.cpp
View File

@@ -14,6 +14,9 @@
#include <SDL.h> #include <SDL.h>
#include <SDL_mutex.h> #include <SDL_mutex.h>
#include <vector> #include <vector>
#if defined(WIN32)
#include <windows.h>
#endif
#ifdef HAS_LIBVLC #ifdef HAS_LIBVLC
#include <vlc/vlc.h> #include <vlc/vlc.h>
@@ -154,26 +157,19 @@ void VideoPlayer::PlayVideo() {
*/ */
libvlc = libvlc_new(vlc_argc, &vlc_argv[0]); libvlc = libvlc_new(vlc_argc, &vlc_argv[0]);
if(libvlc == NULL) { if(libvlc == NULL) {
// For windows check registry for install path // For windows check registry for install path
#if defined(WIN32) && !defined(__MINGW32__) #if defined(WIN32) && !defined(__MINGW32__)
// example from: http://stackoverflow.com/questions/1387769/create-registry-entry-to-associate-file-extension-with-application-in-c
//[HKEY_CURRENT_USER\Software\Classes\blergcorp.blergapp.v1\shell\open\command]
//@="c:\path\to\app.exe \"%1\""
//[HKEY_CURRENT_USER\Software\Classes\.blerg]
//@="blergcorp.blergapp.v1"
//Open the registry key. //Open the registry key.
wstring subKey = L"Software\\VideoLAN\\VLC"; wstring subKey = L"Software\\VideoLAN\\VLC";
HKEY keyHandle; HKEY keyHandle;
DWORD dwDisposition; //DWORD dwDisposition;
LONG lres = RegOpenKeyEx(HKEY_LOCAL_MACHINE,subKey.c_str(),0, KEY_READ, &keyHandle); LONG lres = RegOpenKeyEx(HKEY_LOCAL_MACHINE,subKey.c_str(),0, KEY_READ, &keyHandle);
if(lres == ERROR_SUCCESS) { if(lres == ERROR_SUCCESS) {
std::string strValue; std::string strValue;
//GetStringRegKey(keyHandle, L"", strValue, L""); //GetStringRegKey(keyHandle, L"", strValue, L"");
WCHAR szBuffer[4096]; char szBuffer[4096];
DWORD dwBufferSize = sizeof(szBuffer); DWORD dwBufferSize = sizeof(szBuffer);
ULONG nError = RegQueryValueEx(keyHandle, "", 0, NULL, (LPBYTE)szBuffer, &dwBufferSize); ULONG nError = RegQueryValueEx(keyHandle, L"", 0, NULL, (LPBYTE)szBuffer, &dwBufferSize);
if (ERROR_SUCCESS == nError) { if (ERROR_SUCCESS == nError) {
strValue = szBuffer; strValue = szBuffer;
} }
@@ -182,10 +178,10 @@ void VideoPlayer::PlayVideo() {
if(strValue != "") { if(strValue != "") {
#if defined(WIN32) #if defined(WIN32)
strValue = "VLC_PLUGIN_PATH="strValue; strValue = "VLC_PLUGIN_PATH=" + strValue;
_putenv(strValue.c_str()); _putenv(strValue.c_str());
#else #else
setenv("VLC_PLUGIN_PATH","c:\\program files\\videolan\\vlc\\plugins",1); setenv("VLC_PLUGIN_PATH",strValue.c_str(),1);
#endif #endif
libvlc = libvlc_new(vlc_argc, &vlc_argv[0]); libvlc = libvlc_new(vlc_argc, &vlc_argv[0]);
} }