diff options
author | davidus01 <davidus01@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-06-19 20:17:37 +0000 |
---|---|---|
committer | davidus01 <davidus01@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-06-19 20:17:37 +0000 |
commit | a8f35da777534a54881a8a93c5b2729bb1054bde (patch) | |
tree | c152fe59a9046ee4b30882350536c06782fedd6a /us_maker_edition/src | |
parent | 730ae0af9856d38b775b39ba2b0856f132963cb7 (diff) | |
download | usdx-a8f35da777534a54881a8a93c5b2729bb1054bde.tar.gz usdx-a8f35da777534a54881a8a93c5b2729bb1054bde.tar.xz usdx-a8f35da777534a54881a8a93c5b2729bb1054bde.zip |
editor: VideoGap slide
editor: keys 7&8 to change Video Gap
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2550 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
-rw-r--r-- | us_maker_edition/src/base/UThemes.pas | 2 | ||||
-rw-r--r-- | us_maker_edition/src/screens/UScreenEditSub.pas | 42 |
2 files changed, 43 insertions, 1 deletions
diff --git a/us_maker_edition/src/base/UThemes.pas b/us_maker_edition/src/base/UThemes.pas index af901b03..21d729f8 100644 --- a/us_maker_edition/src/base/UThemes.pas +++ b/us_maker_edition/src/base/UThemes.pas @@ -521,6 +521,7 @@ type SelectVolAudio: TThemeSelectSlide; SelectVolMidi: TThemeSelectSlide; SelectVolClick: TThemeSelectSlide; + SlideVideoGap: TThemeSelectSlide; end; //Error- and Check-Popup @@ -1418,6 +1419,7 @@ begin ThemeLoadSelectSlide(EditSub.SelectVolAudio, 'EditSubSelectVolAudio'); ThemeLoadSelectSlide(EditSub.SelectVolMidi, 'EditSubSelectVolMidi'); ThemeLoadSelectSlide(EditSub.SelectVolClick, 'EditSubSelectVolClick'); + ThemeLoadSelectSlide(EditSub.SlideVideoGap, 'EditSubVideoGap'); //error and check popup ThemeLoadBasic (ErrorPopup, 'ErrorPopup'); diff --git a/us_maker_edition/src/screens/UScreenEditSub.pas b/us_maker_edition/src/screens/UScreenEditSub.pas index e003e78d..7e14cd8c 100644 --- a/us_maker_edition/src/screens/UScreenEditSub.pas +++ b/us_maker_edition/src/screens/UScreenEditSub.pas @@ -173,11 +173,17 @@ type LyricData: integer; LyricVal: array of UTF8String; SlideLyricIndex: integer; + // VideoGap header + VideoGapSlideId: integer; + VideoGapData: integer; + VideoGapVal: array of UTF8String; + SlideVideoGapIndex: integer; // Volume Slide VolumeAudioSlideId: integer; VolumeMidiSlideId: integer; VolumeClickSlideId: integer; VolumeAudioIndex,VolumeMidiIndex,VolumeClickIndex: integer; //for update slide + VolumeAudio: array of UTF8String; VolumeMidi: array of UTF8String; VolumeClick: array of UTF8String; @@ -608,6 +614,26 @@ begin end; end; + SDLK_7: + begin + if SDL_ModState = 0 then + CurrentSong.VideoGAP := (round(CurrentSong.VideoGAP*100) - 1 )/100; + if SDL_ModState = KMOD_LSHIFT then + CurrentSong.VideoGAP := (round(CurrentSong.VideoGAP*100) - 10 )/100; + if SDL_ModState = KMOD_LCTRL then + CurrentSong.VideoGAP := (round(CurrentSong.VideoGAP*100) - 100 )/100; + end; + + SDLK_8: + begin + if SDL_ModState = 0 then + CurrentSong.VideoGAP := (round(CurrentSong.VideoGAP*100) + 1 )/100; + if SDL_ModState = KMOD_LSHIFT then + CurrentSong.VideoGAP := (round(CurrentSong.VideoGAP*100) + 10 )/100; + if SDL_ModState = KMOD_LCTRL then + CurrentSong.VideoGAP := (round(CurrentSong.VideoGAP*100) + 100 )/100; + end; + SDLK_9: begin // Decrease GAP @@ -2213,6 +2239,10 @@ begin VolumeAudioSlideId := AddSelectSlide(Theme.EditSub.SelectVolAudio, VolumeAudioIndex, VolumeAudio); VolumeMidiSlideId := AddSelectSlide(Theme.EditSub.SelectVolMidi, VolumeMidiIndex, VolumeMidi); VolumeClickSlideId := AddSelectSlide(Theme.EditSub.SelectVolClick, VolumeClickIndex, VolumeClick); + // VideoGap Header + VideoGapSlideId := AddSelectSlide(Theme.EditSub.SlideVideoGap, VideoGapdata, VideoGapVal); + SelectsS[VideoGapSlideId].Text.Align := 0; + SelectsS[VideoGapSlideId].Text.X := SelectsS[VideoGapSlideId].Texture.X + 3; // TextTitle := AddText(180, 65, 0, 24, 0, 0, 0, 'a'); // TextArtist := AddText(180, 90, 0, 24, 0, 0, 0, 'b'); @@ -2401,7 +2431,7 @@ begin UpdateSelectSlideOptions(Theme.EditSub.SlideTone,ToneSlideId,ToneVal,SlideToneIndex); SelectsS[ToneSlideId].TextOpt[0].Align := 0; SelectsS[ToneSlideId].TextOpt[0].X := SelectsS[ToneSlideId].TextureSBG.X + 5; - // Header Tone + // Header Lyric SetLength(LyricVal, 1); LyricVal[0] := ''; SlideLyricIndex := 1; @@ -2409,6 +2439,14 @@ begin SelectsS[LyricSlideId].TextOpt[0].Align := 0; SelectsS[LyricSlideId].TextOpt[0].X := SelectsS[LyricSlideId].TextureSBG.X + 5; + // Header VideoGap + SetLength(VideoGapVal, 1); + VideoGapVal[0] := ''; + SlideVideoGapIndex := 1; + UpdateSelectSlideOptions(Theme.EditSub.SlideVideoGap,VideoGapSlideId,VideoGapVal,SlideVideoGapIndex); + SelectsS[VideoGapSlideId].TextOpt[0].Align := 0; + SelectsS[VideoGapSlideId].TextOpt[0].X := SelectsS[VideoGapSlideId].TextureSBG.X + 5; + // volume slides SetLength(VolumeAudio, 0); SetLength(VolumeMidi, 0); @@ -2608,6 +2646,8 @@ begin //Text[TextNText].Text := Lines[0].Line[Lines[0].Current].Note[CurrentNote].Text; LyricVal[0] := Lines[0].Line[Lines[0].Current].Note[CurrentNote].Text; SelectsS[LyricSlideId].TextOpt[0].Text := LyricVal[0]; + VideoGapVal[0] := floattostr(CurrentSong.VideoGAP); + SelectsS[VideoGapSlideId].TextOpt[0].Text := VideoGapVal[0]; end; // Text Edit Mode |