From 67c9ed20fdbb072799f09cc0ea018ac197575e22 Mon Sep 17 00:00:00 2001
From: shinydoofy <shinydoofy@users.sf.net>
Date: Sat, 11 Apr 2009 03:26:36 +0000
Subject: [PATCH] SDL - hotkey Q for toggling read-only/read+write

---
 changelog.txt              | 1 +
 src/drivers/sdl/config.cpp | 1 +
 src/drivers/sdl/input.cpp  | 6 ++++++
 src/utils/SConscript       | 1 -
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/changelog.txt b/changelog.txt
index c17a7e89..78c52b19 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,4 @@
+11-apr-2009 - shinydoofy - sdl - dropped UTFConverter.c from SDL build and added hotkey Q for toggling read-only/read+write movie playback
 04-apr-2009 - shinydoofy - fixed fcm->fm2 code once again (this time for good, hopefully). Thanks to Bisqwit!
 04-apr-2009 - shinydoofy - Reverted UTF8<->UTF32 code changes to fix up the win32 build for now
 01-apr-2009 - adelikat - Beginning 2.1.1
diff --git a/src/drivers/sdl/config.cpp b/src/drivers/sdl/config.cpp
index 88a4578b..69bd73d3 100644
--- a/src/drivers/sdl/config.cpp
+++ b/src/drivers/sdl/config.cpp
@@ -303,6 +303,7 @@ InitConfig()
     config->addOption(prefix + "IncreaseSpeed", SDLK_EQUALS);
     config->addOption(prefix + "FrameAdvance", SDLK_BACKSLASH);
     config->addOption(prefix + "InputDisplay", SDLK_i);
+    config->addOption(prefix + "MovieToggleReadWrite", SDLK_q);
     #ifdef CREATE_AVI
     config->addOption(prefix + "MuteCapture", SDLK_DELETE);
     #endif
diff --git a/src/drivers/sdl/input.cpp b/src/drivers/sdl/input.cpp
index df27eea8..4a3b5a29 100644
--- a/src/drivers/sdl/input.cpp
+++ b/src/drivers/sdl/input.cpp
@@ -168,6 +168,7 @@ int movieToggleFrameDisplayKey;
 int lagCounterDisplayKey;
 int SubtitleDisplayKey;
 int InputDisplayKey;
+int movieToggleReadWriteKey;
 #ifdef CREATE_AVI
 int MuteCaptureKey;
 #endif
@@ -208,6 +209,7 @@ void setHotKeys()
 	g_config->getOption("SDL.Hotkeys.MovieToggleFrameDisplay", &movieToggleFrameDisplayKey);
 	g_config->getOption("SDL.Hotkeys.SubtitleDisplay", &SubtitleDisplayKey);
 	g_config->getOption("SDL.Hotkeys.InputDisplay", &InputDisplayKey);
+	g_config->getOption("SDL.Hotkeys.MovieToggleReadWrite", &movieToggleReadWriteKey);
 	#ifdef CREATE_AVI
 	g_config->getOption("SDL.Hotkeys.MuteCapture", &MuteCaptureKey);
 	#endif
@@ -423,6 +425,10 @@ KeyboardCommands()
         g_config->setOption("SDL.InputDisplay", input_display);
     }
     
+    if(_keyonly(movieToggleReadWriteKey)) {
+        FCEUI_SetMovieToggleReadOnly(!FCEUI_GetMovieToggleReadOnly());
+    }
+    
     #ifdef CREATE_AVI
     if(_keyonly(MuteCaptureKey)) {
         extern int mutecapture;
diff --git a/src/utils/SConscript b/src/utils/SConscript
index c45ebe8a..2520f070 100644
--- a/src/utils/SConscript
+++ b/src/utils/SConscript
@@ -1,5 +1,4 @@
 my_list =   Split("""
-ConvertUTF.c
 crc32.cpp
 endian.cpp
 general.cpp