From 3000e29bafb6c138270f23e9b881b52b76460841 Mon Sep 17 00:00:00 2001 From: ipher <> Date: Wed, 15 Feb 2006 04:48:59 +0000 Subject: [PATCH] Revamped the Movie window, If there are problems, ill fix them tomarrow --- zsnes/src/cfgparse.psr | 4 +- zsnes/src/gui/gui.asm | 9 ++-- zsnes/src/gui/guikeys.inc | 7 +++ zsnes/src/gui/guimouse.inc | 58 +++++++++++---------- zsnes/src/gui/guiwindp.inc | 103 ++++++++++++++++++++++--------------- 5 files changed, 109 insertions(+), 72 deletions(-) diff --git a/zsnes/src/cfgparse.psr b/zsnes/src/cfgparse.psr index 1c86578f..b8432b59 100644 --- a/zsnes/src/cfgparse.psr +++ b/zsnes/src/cfgparse.psr @@ -349,4 +349,6 @@ NEWSYM KeyDisplayBatt, dd 0 NEWSYM PrevBuildNum, dd 0 NEWSYM PauseFocusChange, db 0 NEWSYM KeyIncreaseGamma, dd 0 -NEWSYM KeyDecreaseGamma, dd 0 \ No newline at end of file +NEWSYM KeyDecreaseGamma, dd 0 +NEWSYM MovieVideoMode, db 1 +NEWSYM MovieAudioMode, db 1 \ No newline at end of file diff --git a/zsnes/src/gui/gui.asm b/zsnes/src/gui/gui.asm index 81470569..88ac09e9 100644 --- a/zsnes/src/gui/gui.asm +++ b/zsnes/src/gui/gui.asm @@ -143,6 +143,7 @@ EXTSYM GUIwinposy2,GUIwinposx2,AllowMultipleInst,Surround,SoundBufEn,SPCDisable EXTSYM GUIEnableTransp,FilteredGUI,MouseWheel,TrapMouseCursor,AlwaysOnTop EXTSYM pl1p209,pl1p209b,SaveMainWindowPos,FastFwdToggle,SidewinderFix,RaisePitch EXTSYM KeyDisplayBatt,PauseFocusChange,KeyIncreaseGamma,KeyDecreaseGamma +EXTSYM MovieVideoMode, MovieAudioMode %ifdef __UNIXSDL__ EXTSYM numlockptr @@ -303,10 +304,10 @@ ViewBuffer resb 50*32 SECTION .data ; Window sizes and positions ; LOAD STAT INPT OPT VID SND CHT NET GMKEY GUIOP ABT RSET SRC STCN MOVE CMBO ADDO CHIP PATH SAVE SPED -GUIwinposxo dd 0,6 ,65 ,33 ,42 ,38 ,34 ,6 ,64 ,8 ,8 ,33 ,56 ,64 ,56 ,38 ,3 ,48 ,48 ,6 ,28 ,53 -GUIwinposyo dd 0,20 ,70 ,30 ,20 ,20 ,20 ,20 ,30 ,30 ,20 ,20 ,60 ,30 ,65 ,35 ,19 ,60 ,60 ,20 ,30 ,25 -GUIwinsizex dd 0,244 ,126 ,189 ,172 ,180 ,188 ,244 ,8*16,240 ,240 ,190 ,9*16,8*16,9*16,180 ,250 ,160 ,160 ,244 ,200 ,150 -GUIwinsizey dd 0,190 ,3*16,166 ,190 ,192 ,188 ,191 ,40 ,170 ,150 ,190 ,42 ,40 ,42 ,160 ,190 ,100 ,100 ,190 ,160 ,180 +GUIwinposxo dd 0,6 ,65 ,33 ,42 ,38 ,34 ,6 ,64 ,8 ,8 ,33 ,56 ,64 ,56 ,5 ,3 ,48 ,48 ,6 ,28 ,53 +GUIwinposyo dd 0,20 ,70 ,30 ,20 ,20 ,20 ,20 ,30 ,30 ,20 ,20 ,60 ,30 ,65 ,25 ,19 ,60 ,60 ,20 ,30 ,25 +GUIwinsizex dd 0,244 ,126 ,189 ,172 ,180 ,188 ,244 ,8*16,240 ,240 ,190 ,9*16,8*16,9*16,246 ,250 ,160 ,160 ,244 ,200 ,150 +GUIwinsizey dd 0,190 ,3*16,166 ,190 ,192 ,188 ,191 ,40 ,170 ,150 ,190 ,42 ,40 ,42 ,180 ,190 ,100 ,100 ,190 ,160 ,180 GUIwinptr db 0 SECTION .bss diff --git a/zsnes/src/gui/guikeys.inc b/zsnes/src/gui/guikeys.inc index bc2d1534..fece8626 100644 --- a/zsnes/src/gui/guikeys.inc +++ b/zsnes/src/gui/guikeys.inc @@ -1546,6 +1546,13 @@ GUIMovieKeys: GUIKeyButtonHole MovieStartMethod,2,'R' GUIKeyButtonHole MovieStartMethod,3,'S' + GUIKeyButtonHole MovieVideoMode,0,'O' + GUIKeyButtonHole MovieVideoMode,1,'W' + GUIKeyButtonHole MovieVideoMode,2,'U' + + GUIKeyButtonHole MovieAudioMode,0,'I' + GUIKeyButtonHole MovieAudioMode,1,'A' + GUIKeyCheckbox MovieDisplayFrame,'D' ; Checkbox ret diff --git a/zsnes/src/gui/guimouse.inc b/zsnes/src/gui/guimouse.inc index a6978332..b1e5ebec 100644 --- a/zsnes/src/gui/guimouse.inc +++ b/zsnes/src/gui/guimouse.inc @@ -2080,37 +2080,43 @@ DisplayGUIMovieClick: ret .displayboxa ; Main Window - GUIPHoldbutton 7,17,49,28,16 ; Buttons - GUIPHoldbutton 7,33,49,44,17 - GUIPHoldbutton 7,49,49,60,18 - GUIPHoldbutton 7,81,109,92,29 - GUIPHoldbutton 7,97,109,108,30 - GUIPHoldbutton 7,113,109,124,31 - GUIPHoldbutton 7,65,49,76,32 - GUIPHoldbutton 61,65,155,76,34 + GUIPHoldbutton 9,36,50,47,16 ; Buttons + GUIPHoldbutton 55,36,96,47,17 + GUIPHoldbutton 103,36,146,47,18 + GUIPHoldbutton 8,56,111,67,29 + GUIPHoldbutton 8,70,111,81,30 + GUIPHoldbutton 8,84,111,95,31 + GUIPHoldbutton 153,36,196,47,32 + GUIPHoldbutton 61,150,155,161,34 ; Ratios - GUIPButtonHole 60,25,byte[CMovieExt],'v' ; Select - GUIPButtonHole 80,25,byte[CMovieExt],'1' - GUIPButtonHole 100,25,byte[CMovieExt],'2' - GUIPButtonHole 120,25,byte[CMovieExt],'3' - GUIPButtonHole 140,25,byte[CMovieExt],'4' - GUIPButtonHole 60,40,byte[CMovieExt],'5' - GUIPButtonHole 80,40,byte[CMovieExt],'6' - GUIPButtonHole 100,40,byte[CMovieExt],'7' - GUIPButtonHole 120,40,byte[CMovieExt],'8' - GUIPButtonHole 140,40,byte[CMovieExt],'9' + GUIPButtonHole 12,25,byte[CMovieExt],'v' ; Select + GUIPButtonHole 32,25,byte[CMovieExt],'1' + GUIPButtonHole 52,25,byte[CMovieExt],'2' + GUIPButtonHole 72,25,byte[CMovieExt],'3' + GUIPButtonHole 92,25,byte[CMovieExt],'4' + GUIPButtonHole 112,25,byte[CMovieExt],'5' + GUIPButtonHole 132,25,byte[CMovieExt],'6' + GUIPButtonHole 152,25,byte[CMovieExt],'7' + GUIPButtonHole 172,25,byte[CMovieExt],'8' + GUIPButtonHole 192,25,byte[CMovieExt],'9' - GUIPButtonHole 8,137,byte[MovieStartMethod],0 ; Start From - GUIPButtonHole 43,137,byte[MovieStartMethod],1 - GUIPButtonHole 88,137,byte[MovieStartMethod],2 - GUIPButtonHole 8,147,byte[MovieStartMethod],3 + GUIPButtonHole 211,57,byte[MovieStartMethod],0 ; Start From + GUIPButtonHole 145,67,byte[MovieStartMethod],1 + GUIPButtonHole 191,67,byte[MovieStartMethod],2 + GUIPButtonHole 145,77,byte[MovieStartMethod],3 + + GUIPButtonHole 9,117,byte[MovieVideoMode],0 ; Movie Options + GUIPButtonHole 9,127,byte[MovieVideoMode],1 + GUIPButtonHole 9,137,byte[MovieVideoMode],2 + GUIPButtonHole 130,117,byte[MovieAudioMode],0 + GUIPButtonHole 130,127,byte[MovieAudioMode],1 - DGOptnsProcBox 116,84,[KeyInsrtChap] ; Keyboard Shortcut Boxes - DGOptnsProcBox 116,100,[KeyPrevChap] - DGOptnsProcBox 116,116,[KeyNextChap] + DGOptnsProcBox 118,59,[KeyInsrtChap] ; Keyboard Shortcut Boxes + DGOptnsProcBox 118,73,[KeyPrevChap] + DGOptnsProcBox 118,87,[KeyNextChap] - GUIClickCButton 60,50,byte[MovieDisplayFrame] ; Checkbox + GUIClickCButton 60,12,byte[MovieDisplayFrame] ; Checkbox ret diff --git a/zsnes/src/gui/guiwindp.inc b/zsnes/src/gui/guiwindp.inc index 93aeb141..972ce55e 100644 --- a/zsnes/src/gui/guiwindp.inc +++ b/zsnes/src/gui/guiwindp.inc @@ -3147,42 +3147,54 @@ DisplayGUIMovies: ; Movie Record/Playback options je .zero mov byte[GUItextcolor],211 .zero - DrawGUIButton 15,7,17,49,28,GUIMovieTextA1,16,0,0 ; Draw Buttons - DrawGUIButton 15,7,33,49,44,GUIMovieTextA2,17,0,0 - DrawGUIButton 15,7,49,49,60,GUIMovieTextA3,18,0,0 - DrawGUIButton 15,7,65,49,76,GUIMovieTextA4,32,0,0 - DrawGUIButton 15,7,81,109,92,GUIMovieTextA5,29,0,0 - DrawGUIButton 15,7,97,109,108,GUIMovieTextA6,30,0,0 - DrawGUIButton 15,7,113,109,124,GUIMovieTextA7,31,0,0 - DrawGUIButton 15,61,65,155,76,GUIMovieTextA8,34,0,0 + DrawGUIButton 15,7,36,49,47,GUIMovieTextA1,16,0,0 ; Draw Buttons + DrawGUIButton 15,53,36,95,47,GUIMovieTextA2,17,0,0 + DrawGUIButton 15,101,36,145,47,GUIMovieTextA3,18,0,0 + DrawGUIButton 15,151,36,195,47,GUIMovieTextA4,32,0,0 + DrawGUIButton 15,7,56,109,67,GUIMovieTextA5,29,0,0 + DrawGUIButton 15,7,70,109,81,GUIMovieTextA6,30,0,0 + DrawGUIButton 15,7,84,109,95,GUIMovieTextA7,31,0,0 + DrawGUIButton 15,61,150,155,161,GUIMovieTextA8,34,0,0 - GUIDisplayTextY 15,61,16,GUIMovieTextB ; Save Select Shadow + GUIDisplayTextY 15,12,16,GUIMovieTextB ; Save Select mov byte[GUIMovieTextB1],'0' - GUIDisplayText 15,71,28,GUIMovieTextB1 + GUIDisplayText 15,22,28,GUIMovieTextB1 mov byte[GUIMovieTextB1],'1' - GUIDisplayText 15,91,28,GUIMovieTextB1 + GUIDisplayText 15,42,28,GUIMovieTextB1 mov byte[GUIMovieTextB1],'2' - GUIDisplayText 15,111,28,GUIMovieTextB1 + GUIDisplayText 15,62,28,GUIMovieTextB1 mov byte[GUIMovieTextB1],'3' - GUIDisplayText 15,131,28,GUIMovieTextB1 + GUIDisplayText 15,82,28,GUIMovieTextB1 mov byte[GUIMovieTextB1],'4' - GUIDisplayText 15,151,28,GUIMovieTextB1 + GUIDisplayText 15,102,28,GUIMovieTextB1 mov byte[GUIMovieTextB1],'5' - GUIDisplayText 15,71,43,GUIMovieTextB1 + GUIDisplayText 15,122,28,GUIMovieTextB1 mov byte[GUIMovieTextB1],'6' - GUIDisplayText 15,91,43,GUIMovieTextB1 + GUIDisplayText 15,142,28,GUIMovieTextB1 mov byte[GUIMovieTextB1],'7' - GUIDisplayText 15,111,43,GUIMovieTextB1 + GUIDisplayText 15,162,28,GUIMovieTextB1 mov byte[GUIMovieTextB1],'8' - GUIDisplayText 15,131,43,GUIMovieTextB1 + GUIDisplayText 15,182,28,GUIMovieTextB1 mov byte[GUIMovieTextB1],'9' - GUIDisplayText 15,151,43,GUIMovieTextB1 + GUIDisplayText 15,202,28,GUIMovieTextB1 + + GUIDisplayTextY 15,145,60,GUIMovieTextC ; "Start From" Section + GUIDisplayButtonHoleTu 15,210,57,byte[MovieStartMethod],0,GUIMovieTextC1,0 + GUIDisplayButtonHoleTu 15,144,67,byte[MovieStartMethod],1,GUIMovieTextC2,0 + GUIDisplayButtonHoleTu 15,190,67,byte[MovieStartMethod],2,GUIMovieTextC3,0 + GUIDisplayButtonHoleTu 15,144,77,byte[MovieStartMethod],3,GUIMovieTextC4,6 + + + GUIDisplayTextY 15,8,105,GUIMovieTextD ; Video Section + GUIDisplayButtonHoleTu 15,9,115,byte[MovieVideoMode],0,GUIMovieTextD1,1 + GUIDisplayButtonHoleTu 15,9,125,byte[MovieVideoMode],1,GUIMovieTextD2,2 + GUIDisplayButtonHoleTu 15,9,135,byte[MovieVideoMode],2,GUIMovieTextD3,0 + + GUIDisplayTextY 15,129,105,GUIMovieTextE ; Audio Section + GUIDisplayButtonHoleTu 15,130,115,byte[MovieAudioMode],0,GUIMovieTextE1,6 + GUIDisplayButtonHoleTu 15,130,125,byte[MovieAudioMode],1,GUIMovieTextE2,0 + - GUIDisplayTextY 15,9,130,GUIMovieTextC ; "Start From" Section Shadow - GUIDisplayButtonHoleTu 15,8,137,byte[MovieStartMethod],0,GUIMovieTextC1,0 - GUIDisplayButtonHoleTu 15,43,137,byte[MovieStartMethod],1,GUIMovieTextC2,0 - GUIDisplayButtonHoleTu 15,88,137,byte[MovieStartMethod],2,GUIMovieTextC3,0 - GUIDisplayButtonHoleTu 15,8,147,byte[MovieStartMethod],3,GUIMovieTextC4,8 mov dword[GUIMovieTextZ+9],'INAC' ; Determine and Display Status mov dword[GUIMovieTextZ+13],'TIVE' @@ -3205,25 +3217,25 @@ DisplayGUIMovies: ; Movie Record/Playback options mov dword[GUIMovieTextZ+13],'PLAY' mov dword[GUIMovieTextZ+17],'ING ' .nooldplay - GUIDisplayTextY 15,6,162,GUIMovieTextZ + GUIDisplayTextY 15,6,182,GUIMovieTextZ ; Display Radio buttons - GUIDisplayButtonHole 15,60,25,byte[CMovieExt],'v' ; Select: - GUIDisplayButtonHole 15,80,25,byte[CMovieExt],'1' - GUIDisplayButtonHole 15,100,25,byte[CMovieExt],'2' - GUIDisplayButtonHole 15,120,25,byte[CMovieExt],'3' - GUIDisplayButtonHole 15,140,25,byte[CMovieExt],'4' - GUIDisplayButtonHole 15,60,40,byte[CMovieExt],'5' - GUIDisplayButtonHole 15,80,40,byte[CMovieExt],'6' - GUIDisplayButtonHole 15,100,40,byte[CMovieExt],'7' - GUIDisplayButtonHole 15,120,40,byte[CMovieExt],'8' - GUIDisplayButtonHole 15,140,40,byte[CMovieExt],'9' + GUIDisplayButtonHole 15,10,25,byte[CMovieExt],'v' ; Select: + GUIDisplayButtonHole 15,30,25,byte[CMovieExt],'1' + GUIDisplayButtonHole 15,50,25,byte[CMovieExt],'2' + GUIDisplayButtonHole 15,70,25,byte[CMovieExt],'3' + GUIDisplayButtonHole 15,90,25,byte[CMovieExt],'4' + GUIDisplayButtonHole 15,110,25,byte[CMovieExt],'5' + GUIDisplayButtonHole 15,130,25,byte[CMovieExt],'6' + GUIDisplayButtonHole 15,150,25,byte[CMovieExt],'7' + GUIDisplayButtonHole 15,170,25,byte[CMovieExt],'8' + GUIDisplayButtonHole 15,190,25,byte[CMovieExt],'9' - DDrawBox 15,115,83,[KeyInsrtChap] ; Chapter Keyboard Shortcut Boxes - DDrawBox 15,115,99,[KeyPrevChap] - DDrawBox 15,115,115,[KeyNextChap] + DDrawBox 15,115,58,[KeyInsrtChap] ; Chapter Keyboard Shortcut Boxes + DDrawBox 15,115,72,[KeyPrevChap] + DDrawBox 15,115,86,[KeyNextChap] - GUIDisplayCheckboxu 15,60,50,MovieDisplayFrame,GUIMovieTextB2,0 ; Checkbox + GUIDisplayCheckboxu 15,60,12,MovieDisplayFrame,GUIMovieTextB2,0 ; Checkbox ret SECTION .data @@ -3234,7 +3246,7 @@ GUIMovieTextA4 db 'APPEND',0 GUIMovieTextA5 db 'INSERT CHAPTER',0 GUIMovieTextA6 db 'PREVIOUS CHAPTER',0 GUIMovieTextA7 db 'NEXT CHAPTER',0 -GUIMovieTextA8 db 'DUMP RAW MOVIE',0 +GUIMovieTextA8 db 'DUMP MOVIE',0 GUIMovieTextB db 'SELECT :',0 GUIMovieTextB1 db ' ',0 @@ -3244,7 +3256,16 @@ GUIMovieTextC db 'START FROM:',0 GUIMovieTextC1 db 'NOW',0 GUIMovieTextC2 db 'POWER',0 GUIMovieTextC3 db 'RESET',0 -GUIMovieTextC4 db 'POWER + SRAM CLEAR',0 +GUIMovieTextC4 db 'POWER+SRAM CLR',0 + +GUIMovieTextD db 'MOVIE VIDEO OPTIONS',0 +GUIMovieTextD1 db 'NO VIDEO',0 +GUIMovieTextD2 db 'RAW VIDEO',0 +GUIMovieTextD3 db 'UNCOMPRESSED AVI',0 + +GUIMovieTextE db 'MOVIE AUDIO OPTIONS',0 +GUIMovieTextE1 db 'NO AUDIO',0 +GUIMovieTextE2 db 'AUDIO',0 GUIMovieTextX1 db 'WARNING : THIS MOVIE',0 ; Overwrite Window GUIMovieTextX2 db ' FILE ALREADY EXISTS',0