- added a simplified input splice command

- some minor playback status flag bugfixes - added some code (which is currently disabled due to not yet being configurable) which could be used for multitrack recording and autofire
TASEmulators · Oct 10, 2011 · c02edb2 · c02edb2
1 parent efcaa11
commit c02edb2
Show file tree

Hide file tree

Showing 4 changed files with 341 additions and 33 deletions.
diff --git a/src/wintaser/inputsetup.cpp b/src/wintaser/inputsetup.cpp
@@ -220,6 +220,7 @@ static InputButton s_hotkeyButtons [] =
 	{MOD_CONTROL,           'R',       ID_FILES_RECORDMOV,        0, NULL, "Start Recording To", "RecordNewMovieKey"},
 	{MOD_NONE,          VK_NONE,       ID_FILES_RESUMERECORDING,  0, NULL, "Resume Recording From Now", "ResumeRecordingKey"},
 	{MOD_NONE,          VK_NONE,       ID_FILES_RESUMEMOVAS,      0, NULL, "Resume Recording To", "ResumeToKey"},
+	{MOD_NONE,          VK_NONE,       ID_FILES_SPLICE,           0, NULL, "Splice Movie", "SpliceMovieKey"},
 	{MOD_CONTROL|MOD_SHIFT, 'C',       ID_FILES_STOP_RELAY,       0, NULL, "Stop Running", "StopRunningKey"},
 	{MOD_NONE,          VK_NONE,       ID_FILES_QUIT,             0, NULL, "Exit " /*"winTASer"*/ "Hourglass", "ExitKey"},
 	{MOD_NONE,        VK_ESCAPE,       ID_TIME_TOGGLE_PAUSE,      0, NULL, "Pause/Unpause", "PauseKey0"},
@@ -2234,6 +2235,7 @@ void Build_Main_Menu(HMENU& MainMenu, HWND hWnd)
 	MENU_L(Files, i++, Flags | ((started||!exeFileExists)?MF_GRAYED:0), ID_FILES_RECORDMOV, "\tCtrl+R", "&Record New Movie...", started ? "must stop running first" : "must open an executable first");
 	MENU_L(Files, i++, Flags | (!started?MF_GRAYED:0), ID_FILES_RESUMEMOVAS, "", (playback||!started) ? "Resume Recording to &Different File..." : "Continue Recording to &Different File...", "must be running");
 	MENU_L(Files, i++, Flags | ((!started||!playback||finished)?MF_GRAYED:0), ID_FILES_RESUMERECORDING, "", "Resume Recording from Now", "movie must be playing");
+	MENU_L(Files, i++, Flags | ((!started||finished)?MF_GRAYED:0), ID_FILES_SPLICE, "", "Splice...", "movie must be playing or recording");
 
 	InsertMenu(Files, i++, MF_SEPARATOR, NULL, NULL);
 	//MENU_L(Files, i++, Flags, ID_FILES_SAVECONFIG, "", "Save Config", 0);

diff --git a/src/wintaser/resource.h b/src/wintaser/resource.h
@@ -17,6 +17,7 @@
 #define IDD_RAMWATCH                    132
 #define IDD_PROMPT                      140
 #define IDD_HOTKEYS                     141
+#define IDD_SPLICE                      142
 #define IDC_RADIO_READONLY              1003
 #define IDC_RADIO_READWRITE             1004
 #define IDC_EDIT_MOVIE                  1005
@@ -63,7 +64,8 @@
 #define IDC_HOTKEYLIST                  1044
 #define ID_TOGGLE_MOVIE_READONLY        1045
 #define IDC_TOPLEFTCONTROL              1046
-#define IDC_CHECK_MUTE                        1047
+#define IDC_CHECK_MUTE                  1047
+#define IDC_EDIT_SPLICESOURCESTART      1048
 #define RAMMENU_FILE_AUTOLOAD           1218
 #define RAMMENU_FILE_APPEND             1220
 #define RAMMENU_FILE_SAVEWINDOW         3001
@@ -287,6 +289,7 @@
 #define ID_FILES_RESUMEMOVAS            40313
 #define ID_FILES_OPENMOV                40314
 #define ID_FILES_RESUMERECORDING        40315
+#define ID_FILES_SPLICE                 40316
 #define ID_AVI_NONE                     40330
 #define ID_AVI_BOTH                     40331
 #define ID_AVI_VIDEO                    40332