From 217a4592e68405b07d357cfd891350e72cf4003b Mon Sep 17 00:00:00 2001 From: ipher <> Date: Thu, 2 Mar 2006 01:10:03 +0000 Subject: [PATCH] more options added to the Movie window --- zsnes/src/cfg.psr | 5 ++++- zsnes/src/gui/gui.asm | 6 +++--- zsnes/src/gui/guikeys.inc | 10 +++++++--- zsnes/src/gui/guimouse.inc | 11 +++++++---- zsnes/src/gui/guiwindp.inc | 28 ++++++++++++++++------------ 5 files changed, 37 insertions(+), 23 deletions(-) diff --git a/zsnes/src/cfg.psr b/zsnes/src/cfg.psr index b8432b59..69b9635a 100644 --- a/zsnes/src/cfg.psr +++ b/zsnes/src/cfg.psr @@ -351,4 +351,7 @@ NEWSYM PauseFocusChange, db 0 NEWSYM KeyIncreaseGamma, dd 0 NEWSYM KeyDecreaseGamma, dd 0 NEWSYM MovieVideoMode, db 1 -NEWSYM MovieAudioMode, db 1 \ No newline at end of file +NEWSYM MovieAudioMode, db 0 +NEWSYM MovieAudio, db 1 +NEWSYM MovieVideoAudio, db 1 +NEWSYM MovieAudioCompress, db 1 diff --git a/zsnes/src/gui/gui.asm b/zsnes/src/gui/gui.asm index 74f90ca8..f2c98eb7 100644 --- a/zsnes/src/gui/gui.asm +++ b/zsnes/src/gui/gui.asm @@ -143,7 +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 +EXTSYM MovieVideoMode, MovieAudio, MovieVideoAudio, MovieAudioCompress %ifdef __UNIXSDL__ EXTSYM numlockptr @@ -309,9 +309,9 @@ 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 ,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 +GUIwinposyo dd 0,20 ,70 ,30 ,20 ,20 ,20 ,20 ,30 ,30 ,20 ,20 ,60 ,30 ,65 ,20 ,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 +GUIwinsizey dd 0,190 ,3*16,166 ,190 ,192 ,188 ,191 ,40 ,170 ,150 ,190 ,42 ,40 ,42 ,190 ,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 eb762cda..85f38f23 100644 --- a/zsnes/src/gui/guikeys.inc +++ b/zsnes/src/gui/guikeys.inc @@ -1561,11 +1561,15 @@ GUIMovieKeys: GUIKeyButtonHole MovieVideoMode,2,'F' GUIKeyButtonHole MovieVideoMode,3,'X' - GUIKeyButtonHole MovieAudioMode,0,'I' - GUIKeyButtonHole MovieAudioMode,1,'A' - GUIKeyButtonHole MovieAudioMode,2,'U' + GUIKeyCheckbox MovieAudio,'A' + GUIKeyCheckbox MovieAudioCompress,'V' + GUIKeyCheckbox MovieVideoAudio,'M' GUIKeyCheckbox MovieDisplayFrame,'D' ; Checkbox +; GUIKeyCheckbox MovieDisplayFrame,'D' +; GUIKeyCheckbox MovieDisplayFrame,'D' +; GUIKeyCheckbox MovieDisplayFrame,'D' + ret GUIComboKeys: diff --git a/zsnes/src/gui/guimouse.inc b/zsnes/src/gui/guimouse.inc index dcb0c199..5913d7ac 100644 --- a/zsnes/src/gui/guimouse.inc +++ b/zsnes/src/gui/guimouse.inc @@ -2083,7 +2083,7 @@ DisplayGUIMovieClick: GUIPHoldbutton 9,68,112,79,29 GUIPHoldbutton 9,84,112,95,30 GUIPHoldbutton 9,100,112,111,31 - GUIPHoldbutton 132,155,197,166,34 + GUIPHoldbutton 132,165,197,176,34 ; Ratios GUIPButtonHole 10,25,byte[CMovieExt],'v' ; Select @@ -2106,9 +2106,12 @@ DisplayGUIMovieClick: GUIPButtonHole 9,138,byte[MovieVideoMode],1 GUIPButtonHole 9,148,byte[MovieVideoMode],2 GUIPButtonHole 9,158,byte[MovieVideoMode],3 - GUIPButtonHole 130,128,byte[MovieAudioMode],0 - GUIPButtonHole 197,128,byte[MovieAudioMode],1 - GUIPButtonHole 130,138,byte[MovieAudioMode],2 + GUIPButtonHole 9,168,byte[MovieVideoMode],4 + GUIPButtonHole 9,178,byte[MovieVideoMode],5 + + GUIClickCButton 130,128,byte[MovieAudio] + GUIClickCButton 130,138,byte[MovieAudioCompress] + GUIClickCButton 130,148,byte[MovieVideoAudio] DGOptnsProcBox 116,71,[KeyInsrtChap] ; Keyboard Shortcut Boxes DGOptnsProcBox 116,87,[KeyPrevChap] diff --git a/zsnes/src/gui/guiwindp.inc b/zsnes/src/gui/guiwindp.inc index c38451bf..b5256cb6 100644 --- a/zsnes/src/gui/guiwindp.inc +++ b/zsnes/src/gui/guiwindp.inc @@ -3166,7 +3166,7 @@ DisplayGUIMovies: ; Movie Record/Playback options DrawGUIButton 15,7,68,109,79,GUIMovieTextA5,29,0,0 DrawGUIButton 15,7,84,109,95,GUIMovieTextA6,30,0,0 DrawGUIButton 15,7,100,109,111,GUIMovieTextA7,31,0,0 - DrawGUIButton 15,130,155,198,166,GUIMovieTextA8,34,0,0 + DrawGUIButton 15,130,165,198,176,GUIMovieTextA8,34,0,0 GUIDisplayTextY 15,8,16,GUIMovieTextB ; Save Select mov byte[GUIMovieTextB1],'0' @@ -3201,14 +3201,15 @@ DisplayGUIMovies: ; Movie Record/Playback options GUIDisplayButtonHoleTu 15,9,128,byte[MovieVideoMode],0,GUIMovieTextD1,1 GUIDisplayButtonHoleTu 15,9,138,byte[MovieVideoMode],1,GUIMovieTextD2,2 GUIDisplayButtonHoleTu 15,9,148,byte[MovieVideoMode],2,GUIMovieTextD3,0 - GUIDisplayButtonHoleTu 15,9,158,byte[MovieVideoMode],3,GUIMovieTextD4,0 + GUIDisplayButtonHoleTu 15,9,158,byte[MovieVideoMode],3,GUIMovieTextD4,7 + GUIDisplayButtonHoleTu 15,9,168,byte[MovieVideoMode],4,GUIMovieTextD5,0 + GUIDisplayButtonHoleTu 15,9,178,byte[MovieVideoMode],5,GUIMovieTextD6,0 GUIDisplayTextY 15,129,120,GUIMovieTextE ; Audio Section - GUIDisplayButtonHoleTu 15,130,128,byte[MovieAudioMode],0,GUIMovieTextE1,6 - GUIDisplayButtonHoleTu 15,197,128,byte[MovieAudioMode],1,GUIMovieTextE2,0 - GUIDisplayButtonHoleTu 15,130,138,byte[MovieAudioMode],2,GUIMovieTextE3,1 - - + GUIDisplayCheckboxu 15,130,128,MovieAudio,GUIMovieTextE1,0 + GUIDisplayCheckboxu 15,130,138,MovieAudioCompress,GUIMovieTextE2,9 + GUIDisplayCheckboxu 15,130,148,MovieVideoAudio,GUIMovieTextE3,2 + mov dword[GUIMovieTextZ+9],'INAC' ; Determine and Display Status mov dword[GUIMovieTextZ+13],'TIVE' mov dword[GUIMovieTextZ+17],' ' @@ -3230,7 +3231,7 @@ DisplayGUIMovies: ; Movie Record/Playback options mov dword[GUIMovieTextZ+13],'PLAY' mov dword[GUIMovieTextZ+17],'ING ' .nooldplay - GUIDisplayTextY 15,6,182,GUIMovieTextZ + GUIDisplayTextY 15,6,192,GUIMovieTextZ ; Display Radio buttons GUIDisplayButtonHole 15,10,25,byte[CMovieExt],'v' ; Select: GUIDisplayButtonHole 15,30,25,byte[CMovieExt],'1' @@ -3247,7 +3248,7 @@ DisplayGUIMovies: ; Movie Record/Playback options DDrawBox 15,115,70,[KeyInsrtChap] ; Chapter Keyboard Shortcut Boxes DDrawBox 15,115,86,[KeyPrevChap] DDrawBox 15,115,102,[KeyNextChap] - + GUIDisplayCheckboxu 15,144,67,MovieDisplayFrame,GUIMovieTextB2,0 ; Checkbox ret @@ -3276,11 +3277,14 @@ GUIMovieTextD1 db 'NO VIDEO',0 GUIMovieTextD2 db 'RAW VIDEO',0 GUIMovieTextD3 db 'FFV1',0 GUIMovieTextD4 db 'X264 LOSSLESS',0 +GUIMovieTextD5 db 'XVID',0 +GUIMovieTextD6 db 'CUSTOM',0 GUIMovieTextE db 'DUMP AUDIO OPTIONS',0 -GUIMovieTextE1 db 'NO AUDIO',0 -GUIMovieTextE2 db 'AUDIO',0 -GUIMovieTextE3 db 'AUDIO IN VIDEO',0 +GUIMovieTextE1 db 'AUDIO',0 +GUIMovieTextE2 db 'AUDIO IN VIDEO',0 +GUIMovieTextE3 db 'COMPRESS',0 + GUIMovieTextX1 db 'WARNING : THIS MOVIE',0 ; Overwrite Window GUIMovieTextX2 db ' FILE ALREADY EXISTS',0