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

- video player now displays 'please wait' while loading the video

Browse Source
This commit is contained in:
Mark Vejvoda
2012-05-23 19:59:52 +00:00
parent e61a17972e
commit 0fac755a5e
7 changed files with 112 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/shared_lib/include/graphics/video_player.h
View File

@@ -20,6 +20,12 @@ using namespace std;
namespace Shared{ namespace Graphics{
class VideoLoadingCallbackInterface {
public:
/** a value from 1 to 100 representing % done */
virtual void renderVideoLoading(int progressPercent) = 0;
};
class VideoPlayer {
protected:
@@ -38,12 +44,13 @@ protected:
bool stop;
bool finished;
VideoLoadingCallbackInterface *loadingCB;
ctx *ctxPtr;
void init();
public:
VideoPlayer(string filename, SDL_Surface *surface, int x, int y,
VideoPlayer(VideoLoadingCallbackInterface *loadingCB, string filename, SDL_Surface *surface, int x, int y,
int width, int height, int colorBits,
string pluginsPath,bool verboseEnabled=false);
virtual ~VideoPlayer();

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

@@ -70,6 +70,7 @@ std::string getRegKey(const std::string& location, const std::string& name){
class ctx {
public:
ctx() {
loadingCB = NULL;
empty = NULL;
textureId = 0; // Texture ID
surf = NULL;
@@ -99,6 +100,7 @@ public:
#endif
}
Shared::Graphics::VideoLoadingCallbackInterface *loadingCB;
SDL_Surface *empty;
GLuint textureId; // Texture ID
SDL_Surface *surf;
@@ -399,9 +401,10 @@ void callbacks( const libvlc_event_t* event, void* data ) {
#endif
VideoPlayer::VideoPlayer(string filename, SDL_Surface *surface,
VideoPlayer::VideoPlayer(VideoLoadingCallbackInterface *loadingCB, string filename, SDL_Surface *surface,
int x, int y,int width, int height,int colorBits,string pluginsPath,
bool verboseEnabled) : ctxPtr(NULL) {
this->loadingCB = loadingCB;
this->filename = filename;
this->surface = surface;
this->x = x;
@@ -421,6 +424,7 @@ VideoPlayer::VideoPlayer(string filename, SDL_Surface *surface,
void VideoPlayer::init() {
ctxPtr = new ctx();
ctxPtr->loadingCB = loadingCB;
ctxPtr->x = x;
ctxPtr->y = y;
ctxPtr->width = width;
@@ -605,7 +609,7 @@ bool VideoPlayer::initPlayer() {
*/
const string HTTP_PREFIX = "http";
const double MAX_VIDEO_START_MILLISECONDS = 20;
const double MAX_VIDEO_START_MILLISECONDS = 20.0;
if(ctxPtr->libvlc != NULL) {
#if defined(LIBVLC_VERSION_PRE_2) && defined(LIBVLC_VERSION_PRE_1_1_13)
@@ -906,7 +910,11 @@ bool VideoPlayer::initPlayer() {
if(ctxPtr->started == true) {
break;
}
SDL_Delay(10);
if(this->loadingCB != NULL) {
int progress = ((difftime(time(NULL),waitStart) / MAX_VIDEO_START_MILLISECONDS) * 100.0);
this->loadingCB->renderVideoLoading(progress);
}
SDL_Delay(1);
}
//SDL_Delay(5000);