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 libvlc on windows (timing problem when loading videos)

Browse Source 
- commented out retarded environment variable code since we just ship the plugins folder now
This commit is contained in:
Mark Vejvoda
2012-05-19 02:47:53 +00:00
parent 1ffc0a3fc4
commit 3187252936
2 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -189,6 +189,7 @@ bool VideoPlayer::hasBackEndVideoPlayer() {
return false;
}
void VideoPlayer::PlayVideo() {
//verboseEnabled = true;
struct ctx ctx;
ctx.width = width;
ctx.height = height;
@@ -206,8 +207,7 @@ void VideoPlayer::PlayVideo() {
// }
std::vector<const char *> vlc_argv;
vlc_argv.push_back("-I");
vlc_argv.push_back("dummy"); /* Don't use any interface */
vlc_argv.push_back("--intf=dummy");
vlc_argv.push_back("--no-media-library");
vlc_argv.push_back("--ignore-config"); /* Don't use VLC's config */
vlc_argv.push_back("--no-xlib"); /* tell VLC to not use Xlib */
@@ -391,15 +391,17 @@ void VideoPlayer::PlayVideo() {
}
#endif
ctx.isPlaying = true;
#if defined(LIBVLC_VERSION_PRE_2) && defined(LIBVLC_VERSION_PRE_1_1_13)
int play_result = libvlc_media_player_play(mp,&ex);
#else
int play_result = libvlc_media_player_play(mp);
#endif
//SDL_Delay(5);
if(verboseEnabled) printf("In [%s] Line: %d, play_result [%d]\n",__FUNCTION__,__LINE__,play_result);
successLoadingVLC = true;
successLoadingVLC = (play_result == 0);
}
#endif