From ed2a3196614d8b8ab86651e72319366fd32883cd Mon Sep 17 00:00:00 2001 From: adelikat Date: Wed, 26 May 2010 02:26:31 +0000 Subject: [PATCH] Win32 - TASEDit - more mapping out logic & structure. --- src/drivers/win/tasedit.cpp | 4 ++++ src/drivers/win/tasedit.h | 3 +++ src/movie.cpp | 22 +++++++++++++++------- 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/src/drivers/win/tasedit.cpp b/src/drivers/win/tasedit.cpp index c3772655..3c3ac071 100644 --- a/src/drivers/win/tasedit.cpp +++ b/src/drivers/win/tasedit.cpp @@ -119,6 +119,10 @@ static LONG CustomDraw(NMLVCUSTOMDRAW* msg) } } +void CreateProject(MovieData data) +{ +} + // called from the rest of the emulator when things happen and the tasedit should change to reflect it void UpdateTasEdit() { diff --git a/src/drivers/win/tasedit.h b/src/drivers/win/tasedit.h index 3aea264d..fcf25ac8 100644 --- a/src/drivers/win/tasedit.h +++ b/src/drivers/win/tasedit.h @@ -1,2 +1,5 @@ +#include "movie.h" + void DoTasEdit(); void UpdateTasEdit(); +void CreateProject(MovieData data); diff --git a/src/movie.cpp b/src/movie.cpp index 89c48152..0a9fcb50 100644 --- a/src/movie.cpp +++ b/src/movie.cpp @@ -37,6 +37,7 @@ #ifdef WIN32 #include #include "./drivers/win/common.h" +#include "./drivers/win/tasedit.h" extern void AddRecentMovieFile(const char *filename); #endif @@ -818,11 +819,16 @@ void poweron(bool shouldDisableBatteryLoading) void FCEUMOV_EnterTasEdit() { + //If no movie, start a new project, currMovieData will serve as the "main branch" file, so give it a filename and save that into the project + //Dump all header info int ot the project file + + //Else use the currentmovie to create a new project + + //BIG TODO: Why is this tasedit stuff in movie.cpp? Let's movie it out, it is win32 only anyway if (movieMode == MOVIEMODE_INACTIVE) { //stop any current movie activity FCEUI_StopMovie(); - //clear the current movie currFrameCounter = 0; currMovieData = MovieData(); @@ -833,9 +839,10 @@ void FCEUMOV_EnterTasEdit() //reset the rom poweron(false); - } else { + } + else + { FCEUI_StopMovie(); - currMovieData.greenZoneCount=currFrameCounter; } @@ -843,15 +850,16 @@ void FCEUMOV_EnterTasEdit() //ResetInputTypes(); //todo - maybe this instead //FCEUD_SetInput(currMovieData.fourscore,currMovieData.microphone,(ESI)currMovieData.ports[0],(ESI)currMovieData.ports[1],(ESIFC)currMovieData.ports[2]); + +#ifdef WIN32 + CreateProject(currMovieData); +#endif - //pause the emulator - FCEUI_SetEmulationPaused(1); + FCEUI_SetEmulationPaused(1); //pause the emulator //and enter tasedit mode movieMode = MOVIEMODE_TASEDIT; - currMovieData.TryDumpIncremental(); - FCEU_DispMessage("Tasedit engaged",0); }