From d1fc426e48c13a258f06ac10b264215a8d785a26 Mon Sep 17 00:00:00 2001 From: Mathieu Schroeter Date: Tue, 24 Jul 2018 23:58:49 +0200 Subject: [PATCH] Pass the pixmap to the movie class --- src/blupi.cxx | 2 +- src/movie.cxx | 4 +++- src/movie.h | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/blupi.cxx b/src/blupi.cxx index 62e88ef..207a5d3 100644 --- a/src/blupi.cxx +++ b/src/blupi.cxx @@ -1061,7 +1061,7 @@ DoInit (int argc, char * argv[], bool & exit) g_pSound->SetState (true); // Create the movie manager. - g_pMovie = new CMovie; + g_pMovie = new CMovie (g_pPixmap); if (g_pMovie == nullptr) { InitFail ("New movie"); diff --git a/src/movie.cxx b/src/movie.cxx index cc9d312..5d841f0 100644 --- a/src/movie.cxx +++ b/src/movie.cxx @@ -163,8 +163,10 @@ CMovie::playMovie () Kit_PlayerPause (m_player); } -CMovie::CMovie () +CMovie::CMovie (CPixmap * pixmap) { + this->pixmap = pixmap; + m_bEnable = false; m_fPlaying = false; m_fMovieOpen = false; diff --git a/src/movie.h b/src/movie.h index ca06974..86dc21c 100644 --- a/src/movie.h +++ b/src/movie.h @@ -26,13 +26,14 @@ struct Kit_Source; struct Kit_Player; struct Kit_PlayerInfo; struct SDL_Texture; +class CPixmap; #define AUDIOBUFFER_SIZE (32768) class CMovie { public: - CMovie (); + CMovie (CPixmap * pixmap); ~CMovie (); bool Create (); @@ -52,6 +53,7 @@ protected: bool initAVI (); protected: + CPixmap * pixmap; Kit_Source * m_movie; Kit_Player * m_player; SDL_Texture * m_videoTex;