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

- plugin fix on windows

Browse Source
This commit is contained in:
Mark Vejvoda
2012-05-12 23:23:24 +00:00
parent 7d8aee2f78
commit ec2a708603
1 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -101,15 +101,15 @@ void VideoPlayer::PlayVideo() {
libvlc_media_t *m = NULL; libvlc_media_t *m = NULL;
libvlc_media_player_t *mp = NULL; libvlc_media_player_t *mp = NULL;
string pluginParam = ""; // string pluginParam = "";
if(pluginsPath != "") { // if(pluginsPath != "") {
pluginParam = "--plugin-path=" + pluginsPath; // pluginParam = "--plugin-path=" + pluginsPath;
} // }
std::vector<const char *> vlc_argv; std::vector<const char *> vlc_argv;
vlc_argv.push_back("--no-xlib" /* tell VLC to not use Xlib */); vlc_argv.push_back("--no-xlib" /* tell VLC to not use Xlib */);
vlc_argv.push_back("--no-video-title-show"); vlc_argv.push_back("--no-video-title-show");
vlc_argv.push_back(pluginParam.c_str()); // vlc_argv.push_back(pluginParam.c_str());
int vlc_argc = vlc_argv.size(); int vlc_argc = vlc_argv.size();
// char const *vlc_argv[] = // char const *vlc_argv[] =
@@ -153,22 +153,37 @@ void VideoPlayer::PlayVideo() {
* Initialise libVLC * Initialise libVLC
*/ */
libvlc = libvlc_new(vlc_argc, &vlc_argv[0]); libvlc = libvlc_new(vlc_argc, &vlc_argv[0]);
if(libvlc == NULL && pluginParam == "") { if(libvlc == NULL) {
pluginParam = "--plugin-path=c:\\program files\\videolan\\plugins"; #if defined(WIN32)
vlc_argv[2] = pluginParam.c_str(); _putenv("VLC_PLUGIN_PATH=c:\\program files\\videolan\\plugins");
#else
setenv("VLC_PLUGIN_PATH","c:\\program files\\videolan\\plugins",1);
#endif
libvlc = libvlc_new(vlc_argc, &vlc_argv[0]);
if(libvlc == NULL) {
#if defined(WIN32)
_putenv("VLC_PLUGIN_PATH=\\program files\\videolan\\plugins");
#else
setenv("VLC_PLUGIN_PATH","\\program files\\videolan\\plugins",1);
#endif
libvlc = libvlc_new(vlc_argc, &vlc_argv[0]); libvlc = libvlc_new(vlc_argc, &vlc_argv[0]);
if(libvlc == NULL) { if(libvlc == NULL) {
pluginParam = "--plugin-path=\\program files\\videolan\\plugins"; #if defined(WIN32)
vlc_argv[2] = pluginParam.c_str(); _putenv("VLC_PLUGIN_PATH=c:\\program files (x86)\\videolan\\plugins");
#else
pluginParam = "--plugin-path=c:\\program files (x86)\\videolan\\plugins"; setenv("VLC_PLUGIN_PATH","c:\\program files (x86)\\videolan\\plugins",1);
vlc_argv[2] = pluginParam.c_str(); #endif
libvlc = libvlc_new(vlc_argc, &vlc_argv[0]); libvlc = libvlc_new(vlc_argc, &vlc_argv[0]);
if(libvlc == NULL) { if(libvlc == NULL) {
pluginParam = "--plugin-path=\\program files (x86)\\videolan\\plugins"; #if defined(WIN32)
vlc_argv[2] = pluginParam.c_str(); _putenv("VLC_PLUGIN_PATH=\\program files (x86)\\videolan\\plugins");
#else
setenv("VLC_PLUGIN_PATH","\\program files (x86)\\videolan\\plugins",1);
#endif
libvlc = libvlc_new(vlc_argc, &vlc_argv[0]);
}
} }
} }
} }