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

first steps for sdl2 ( still many compile errors )

Browse Source
This commit is contained in:
titiger
2015-09-29 01:30:28 +02:00
parent c84e7f5443
commit 23ea9f6201
11 changed files with 386 additions and 684 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -416,7 +416,7 @@ void callbacks( const libvlc_event_t* event, void* data ) {
VideoPlayer::VideoPlayer(VideoLoadingCallbackInterface *loadingCB,
string filename,
string filenameFallback,
SDL_Surface *surface,
SDL_Window *window,
int x, int y,int width, int height,int colorBits,
bool loop, string pluginsPath, bool verboseEnabled)
: ctxPtr(NULL) {
@@ -424,7 +424,7 @@ VideoPlayer::VideoPlayer(VideoLoadingCallbackInterface *loadingCB,
this->loadingCB = loadingCB;
this->filename = filename;
this->filenameFallback = filenameFallback;
this->surface = surface;
this->window = window;
this->x = x;
this->y = y;
this->width = width;
@@ -919,7 +919,7 @@ bool VideoPlayer::initPlayer(string mediaURL) {
#if !defined(LIBVLC_VERSION_PRE_2) && !defined(LIBVLC_VERSION_PRE_1_1_0)
libvlc_video_set_callbacks(ctxPtr->mp, lock, unlock, display, ctxPtr);
libvlc_video_set_format(ctxPtr->mp, "RV16", width, height, this->surface->pitch);
libvlc_video_set_format(ctxPtr->mp, "RV16", width, height, this->window->pitch);
#endif
@@ -1229,7 +1229,7 @@ void VideoPlayer::PlayVideo() {
#if !defined(LIBVLC_VERSION_PRE_2) && !defined(LIBVLC_VERSION_PRE_1_1_0)
libvlc_video_set_callbacks(mp, lock, unlock, display, ctxPtr);
libvlc_video_set_format(mp, "RV16", width, height, this->surface->pitch);
libvlc_video_set_format(mp, "RV16", width, height, this->window->pitch);
// Get an event manager for the media player.
//libvlc_event_manager_t *eventManager = libvlc_media_player_event_manager(mp, &ex);
@@ -1355,7 +1355,7 @@ bool VideoPlayer::playFrame(bool swapBuffers) {
finished = true;
break;
case SDLK_RETURN:
//options ^= SDL_FULLSCREEN;
//options ^= SDL_WINDOW_FULLSCREEN;
//screen = SDL_SetVideoMode(WIDTH, HEIGHT, 0, options);
finished = true;
break;
@@ -1416,7 +1416,7 @@ bool VideoPlayer::playFrame(bool swapBuffers) {
glPopAttrib();
if(swapBuffers == true) {
SDL_GL_SwapBuffers();
SDL_GL_SwapWindow(window);
}
}
}