From 8fa380903dffac33deb168a8ba0f358b690afadc Mon Sep 17 00:00:00 2001 From: adelikat Date: Mon, 1 Dec 2008 18:39:58 +0000 Subject: [PATCH] attempt to add features "add comment" and "add subtitle". Buggy atm. --- src/drivers/win/res.rc | 52 +++++++++++++++++++++++--------------- src/drivers/win/resource.h | 10 +++++--- src/drivers/win/window.cpp | 19 +++++++++----- 3 files changed, 51 insertions(+), 30 deletions(-) diff --git a/src/drivers/win/res.rc b/src/drivers/win/res.rc index 1e4a5411..d4b56bfc 100644 --- a/src/drivers/win/res.rc +++ b/src/drivers/win/res.rc @@ -46,21 +46,28 @@ BEGIN MENUITEM "Load State From...", MENU_LOAD_STATE MENUITEM "Save State As...", MENU_SAVE_STATE MENUITEM SEPARATOR - MENUITEM "Record Movie...", MENU_RECORD_MOVIE - MENUITEM "Replay Movie...", MENU_REPLAY_MOVIE - MENUITEM "Stop Movie", MENU_STOP_MOVIE - MENUITEM "Play from beginning", ID_FILE_PLAYMOVIEFROMBEGINNING + POPUP "Movie" + BEGIN + MENUITEM "Record Movie...", MENU_RECORD_MOVIE + MENUITEM "Replay Movie...", MENU_REPLAY_MOVIE + MENUITEM "Stop Movie", MENU_STOP_MOVIE + MENUITEM "Play from beginning", ID_FILE_PLAYMOVIEFROMBEGINNING + END + POPUP "Record AVI/Wav" + BEGIN + MENUITEM "Record AVI...", MENU_RECORD_AVI + MENUITEM "Stop AVI", MENU_STOP_AVI + MENUITEM "Record WAV...", MENU_RECORD_WAV + MENUITEM "Stop WAV", MENU_STOP_WAV + END MENUITEM SEPARATOR MENUITEM "Screenshot", ID_FILE_SCREENSHOT MENUITEM SEPARATOR - MENUITEM "Record AVI...", MENU_RECORD_AVI - MENUITEM "Stop AVI", MENU_STOP_AVI - MENUITEM SEPARATOR - MENUITEM "Record WAV...", MENU_RECORD_WAV - MENUITEM "Stop WAV", MENU_STOP_WAV - MENUITEM SEPARATOR - MENUITEM "Run Lua Script...", ID_FILE_RUNLUASCRIPT - MENUITEM "Stop Lua Script", ID_FILE_STOPLUASCRIPT + POPUP "Lua" + BEGIN + MENUITEM "Run Lua Script...", ID_FILE_RUNLUASCRIPT + MENUITEM "Stop Lua Script", ID_FILE_STOPLUASCRIPT + END MENUITEM SEPARATOR MENUITEM "E&xit\tAlt+F4", MENU_EXIT END @@ -74,9 +81,12 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Insert Coin", MENU_INSERT_COIN MENUITEM SEPARATOR - MENUITEM "Pause", ID_NES_PAUSE - MENUITEM "Frame Advance", ID_NES_FRAMEADVANCE - MENUITEM "Turbo", ID_NES_TURBO + POPUP "Emulation" + BEGIN + MENUITEM "Pause", ID_NES_PAUSE + MENUITEM "Frame Advance", ID_NES_FRAMEADVANCE + MENUITEM "Turbo", ID_NES_TURBO + END POPUP "Emulation Speed" BEGIN MENUITEM "Speed Up", ID_NES_SPEEDUP @@ -316,8 +326,8 @@ FCEUCONTEXTMENUS MENU BEGIN POPUP "Game+Movie" BEGIN - MENUITEM "Insert Subtitle", FCEU_CONTEXT_INSERTSUBTITLE, GRAYED - MENUITEM "Insert Comment", FCEU_CONTEXT_INSERTCOMMENT, GRAYED + MENUITEM "Insert Subtitle", FCEU_CONTEXT_INSERTSUBTITLE + MENUITEM "Insert Comment", FCEU_CONTEXT_INSERTCOMMENT MENUITEM SEPARATOR MENUITEM "&Help....", FCEU_CONTEXT_MOVIEHELP END @@ -1601,13 +1611,13 @@ END INSERTCOMMENTSUBTITLE DIALOGEX 0, 0, 147, 82 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Insert Comment" +CAPTION "Insert Comment / Subtitle" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "OK",INSERTCS_IDOK,7,55,50,14 - PUSHBUTTON "Cancel",INSERTCS_IDCANCEL,84,55,50,14 - EDITTEXT INSERTCS_MESSAGE,15,30,125,14,ES_AUTOHSCROLL - LTEXT "Insert:",IDC_STATIC,7,11,23,8 + PUSHBUTTON "Cancel",INSERTCS_IDCANCEL,89,55,50,14 + EDITTEXT INSERTCS_MESSAGE,7,30,133,14,ES_AUTOHSCROLL + LTEXT "Insert Message:",INSERTCS_STATIC,39,14,53,8 END diff --git a/src/drivers/win/resource.h b/src/drivers/win/resource.h index f0ff13dd..47c0df53 100644 --- a/src/drivers/win/resource.h +++ b/src/drivers/win/resource.h @@ -133,7 +133,6 @@ #define CHECK_SOUND_8BIT 122 #define IDD_DIALOG3 123 #define CHECK_SOUND_GLOBAL_FOCUS 124 -#define IDD_DIALOG4 124 #define INSERTCOMMENTSUBTITLE 124 #define CHECK_SOUND_ENABLED 126 #define CTL_LATENCY_TRACKBAR 128 @@ -381,6 +380,7 @@ #define MEMW_EDIT01RMADDRESS 1189 #define INSERTCS_IDCANCEL 1189 #define MEMW_EDIT02RMADDRESS 1190 +#define INSERTCS_STATIC 1190 #define MEMW_EDIT03RMADDRESS 1191 #define MEMW_EDIT04RMADDRESS 1192 #define EDIT00_RESULTS 1193 @@ -596,6 +596,10 @@ #define FCEU_CONTEXT_OPENROM 40286 #define FCEU_CONTEXT_FCEUHELP 40287 #define FCEU_CONTEXT_INSERTCOMMENT 40288 +#define ID_FILE_MOVIE 40289 +#define ID_FILE_RECORDAVI 40290 +#define ID_FILE_LUA 40291 +#define ID_NES_EMULATION 40292 #define IDC_DEBUGGER_ICONTRAY 55535 #define MW_ValueLabel2 65423 #define MW_ValueLabel1 65426 @@ -605,8 +609,8 @@ #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 125 -#define _APS_NEXT_COMMAND_VALUE 40289 -#define _APS_NEXT_CONTROL_VALUE 1190 +#define _APS_NEXT_COMMAND_VALUE 40293 +#define _APS_NEXT_CONTROL_VALUE 1191 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif diff --git a/src/drivers/win/window.cpp b/src/drivers/win/window.cpp index 876113f0..55ea9c83 100644 --- a/src/drivers/win/window.cpp +++ b/src/drivers/win/window.cpp @@ -2083,6 +2083,9 @@ void UpdateMenuHotkeys() LRESULT CALLBACK InsertCommentSubtitleProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { + + + static int *success; //string message; char message[128]; @@ -2093,7 +2096,10 @@ LRESULT CALLBACK InsertCommentSubtitleProc(HWND hDlg, UINT uMsg, WPARAM wParam, { case WM_INITDIALOG: { - + if (lParam) + SetDlgItemText(hDlg,INSERTCS_STATIC, "Insert Comment:"); + else + SetDlgItemText(hDlg, INSERTCS_STATIC, "Insert Subtitle:"); // Nothing very useful to do success = (int*)lParam; return true; @@ -2134,13 +2140,14 @@ LRESULT CALLBACK InsertCommentSubtitleProc(HWND hDlg, UINT uMsg, WPARAM wParam, } void InsertSubtitle(HWND main) { - //DialogBoxParam(fceu_hInstance, MAKEINTRESOURCE(INSERTCOMMENTSUBTITLE), main, (DLGPROC) InsertCommentSubtitleProc,(LPARAM) 0); - string Subtitle = "1000 Poop"; - currMovieData.subtitles.push_back(Subtitle); + DialogBoxParam(fceu_hInstance, MAKEINTRESOURCE(INSERTCOMMENTSUBTITLE), main, (DLGPROC) InsertCommentSubtitleProc,(LPARAM) 0); + //string Subtitle = "1000 Poop"; + //currMovieData.subtitles.push_back(Subtitle); } void InsertComment(HWND main) { - wstring adelikat = mbstowcs("adelikat"); - currMovieData.comments.push_back(L"author " + adelikat); + DialogBoxParam(fceu_hInstance, MAKEINTRESOURCE(INSERTCOMMENTSUBTITLE), main, (DLGPROC) InsertCommentSubtitleProc,(LPARAM) 1); + //wstring adelikat = mbstowcs("adelikat"); + //currMovieData.comments.push_back(L"author " + adelikat); } \ No newline at end of file