From d7ee576c1b3efa2be131aa6ea2de1b7c766a3c0d Mon Sep 17 00:00:00 2001
From: punkrockguy318 <punkrockguy318@users.sf.net>
Date: Wed, 3 Mar 2010 21:10:28 +0000
Subject: [PATCH] SDL: implemented disableMovieMessage

---
 src/drivers/sdl/config.cpp    |  1 +
 src/drivers/sdl/sdl-video.cpp | 17 +++++++++++++----
 src/drivers/sdl/sdl-video.h   |  2 ++
 src/drivers/sdl/sdl.cpp       |  9 +++++++++
 4 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/drivers/sdl/config.cpp b/src/drivers/sdl/config.cpp
index b791f967..cdb98843 100644
--- a/src/drivers/sdl/config.cpp
+++ b/src/drivers/sdl/config.cpp
@@ -189,6 +189,7 @@ InitConfig()
     
     // pause movie playback at frame x
     config->addOption("pauseframe", "SDL.PauseFrame", 0);
+    config->addOption("moviemsg", "SDL.MovieMsg", 1);
     
     // overwrite the config file?
     config->addOption("no-config", "SDL.NoConfig", 0);
diff --git a/src/drivers/sdl/sdl-video.cpp b/src/drivers/sdl/sdl-video.cpp
index 5433f246..cc0a6882 100644
--- a/src/drivers/sdl/sdl-video.cpp
+++ b/src/drivers/sdl/sdl-video.cpp
@@ -75,10 +75,6 @@ static int s_paletterefresh;
 
 extern bool MaxSpeed;
 
-bool FCEUI_AviDisableMovieMessages()
-{
-	return false;
-}
 /**
  * Attempts to destroy the graphical video display.  Returns 0 on
  * success, -1 on failure.
@@ -724,3 +720,16 @@ PtoV(uint16 x,
     y += s_srendline;
     return (x | (y << 16));
 }
+bool disableMovieMessages = false;
+bool FCEUI_AviDisableMovieMessages()
+{
+	if (disableMovieMessages)
+		return true;
+
+	return false;
+}
+
+void FCEUI_SetAviDisableMovieMessages(bool disable)
+{
+	disableMovieMessages = disable;
+}
diff --git a/src/drivers/sdl/sdl-video.h b/src/drivers/sdl/sdl-video.h
index 75e5e4a4..6a61d952 100644
--- a/src/drivers/sdl/sdl-video.h
+++ b/src/drivers/sdl/sdl-video.h
@@ -4,5 +4,7 @@ uint32 PtoV(uint16 x, uint16 y);
 bool FCEUD_ShouldDrawInputAids();
 bool FCEUI_AviDisableMovieMessages();
 static SDL_Surface *s_screen;
+bool FCEUI_AviDisableMovieMessages();
+void FCEUI_SetAviDisableMovieMessages(bool disable);
 
 #endif
diff --git a/src/drivers/sdl/sdl.cpp b/src/drivers/sdl/sdl.cpp
index 528220b9..53c8579f 100644
--- a/src/drivers/sdl/sdl.cpp
+++ b/src/drivers/sdl/sdl.cpp
@@ -606,6 +606,15 @@ SDL_GL_LoadLibrary(0);
       return 0;
     }
     
+    // check to see if movie messages are disabled
+    int mm;
+    g_config->getOption("SDL.MovieMsg", &mm);
+    if( mm == 0)
+		FCEUI_SetAviDisableMovieMessages(true);
+	else
+		FCEUI_SetAviDisableMovieMessages(false);
+	
+	
     // check for a .fm2 file to rip the subtitles
     g_config->getOption("SDL.RipSubs", &s);
     g_config->setOption("SDL.RipSubs", "");