diff --git a/Vocaluxe/Menu/CMenu.cs b/Vocaluxe/Menu/CMenu.cs index 267e69ea..8d5f3ea8 100644 --- a/Vocaluxe/Menu/CMenu.cs +++ b/Vocaluxe/Menu/CMenu.cs @@ -928,6 +928,18 @@ namespace Vocaluxe.Menu CConfig.BackgroundMusicVolume = 0; CConfig.SaveConfig(); } + else if (KeyEvent.Key == Keys.MediaNextTrack) + CBackgroundMusic.Next(); + else if (KeyEvent.Key == Keys.MediaPreviousTrack) + CBackgroundMusic.Previous(); + else if (KeyEvent.Key == Keys.MediaPlayPause) + { + if (CBackgroundMusic.Playing) + CBackgroundMusic.Pause(); + else + CBackgroundMusic.Play(); + } + CBackgroundMusic.ApplyVolume(); } diff --git a/Vocaluxe/Menu/CStatic.cs b/Vocaluxe/Menu/CStatic.cs index d9cddad7..02c695d4 100644 --- a/Vocaluxe/Menu/CStatic.cs +++ b/Vocaluxe/Menu/CStatic.cs @@ -53,6 +53,8 @@ namespace Vocaluxe.Menu public float Alpha; + public EAspect Aspect = EAspect.Stretch; + public CStatic() { _Theme = new SThemeStatic(); @@ -213,25 +215,25 @@ namespace Vocaluxe.Menu public void Draw() { - Draw(1f, Rect.Z, false, false); + Draw(1f, Rect.Z, Aspect, false); } - public void Draw(bool aspect) + public void Draw(EAspect aspect) { Draw(1f, Rect.Z, aspect, false); } - public void Draw(float scale, bool aspect) + public void Draw(float scale, EAspect aspect) { Draw(scale, Rect.Z, aspect, false); } public void ForceDraw() { - Draw(1f, Rect.Z, false, true); + Draw(1f, Rect.Z, Aspect, true); } - public void Draw(float scale, float z, bool aspect, bool ForceDraw) + public void Draw(float scale, float z, EAspect aspect, bool ForceDraw) { STexture texture; if (_Texture.index != -1) @@ -248,11 +250,11 @@ namespace Vocaluxe.Menu SRectF rect = bounds; - if (aspect) + if (aspect != EAspect.Stretch) { RectangleF bounds2 = new RectangleF(bounds.X, bounds.Y, bounds.W, bounds.H); RectangleF rect2 = new RectangleF(0f, 0f, texture.width, texture.height); - CHelper.SetRect(bounds2, ref rect2, texture.width / texture.height, EAspect.Crop); + CHelper.SetRect(bounds2, ref rect2, texture.width / texture.height, aspect); rect.X = rect2.X; rect.Y = rect2.Y; diff --git a/Vocaluxe/Menu/SongMenu/CSongMenuTileBoard.cs b/Vocaluxe/Menu/SongMenu/CSongMenuTileBoard.cs index 4d9336e1..b3e9bc2c 100644 --- a/Vocaluxe/Menu/SongMenu/CSongMenuTileBoard.cs +++ b/Vocaluxe/Menu/SongMenu/CSongMenuTileBoard.cs @@ -408,13 +408,13 @@ namespace Vocaluxe.Menu.SongMenu foreach (CStatic tile in _Tiles) { if (tile.Selected && _Active) - tile.Draw(1.2f, tile.Rect.Z - 0.1f, true, false); + tile.Draw(1.2f, tile.Rect.Z - 0.1f, EAspect.Crop, false); else { if (tile.Texture.index != _CoverTexture.index) - tile.Draw(1f, tile.Rect.Z, true, false); + tile.Draw(1f, tile.Rect.Z, EAspect.Crop, false); else - tile.Draw(1f, tile.Rect.Z, false, false); + tile.Draw(1f, tile.Rect.Z, EAspect.Stretch, false); } } @@ -465,9 +465,9 @@ namespace Vocaluxe.Menu.SongMenu } } - _CoverBig.Draw(1f, true); + _CoverBig.Draw(1f, EAspect.Crop); if (_vidtex.color.A < 1) - _CoverBig.Draw(1f, true); + _CoverBig.Draw(1f, EAspect.Crop); _TextBG.Draw(); if (_vidtex.index != -1 && _Video != -1) diff --git a/Vocaluxe/Screens/CScreenSing.cs b/Vocaluxe/Screens/CScreenSing.cs index decdf754..11c57146 100644 --- a/Vocaluxe/Screens/CScreenSing.cs +++ b/Vocaluxe/Screens/CScreenSing.cs @@ -151,6 +151,7 @@ namespace Vocaluxe.Screens public override void LoadTheme() { base.LoadTheme(); + Statics[htStatics(StaticTimeLine)].Visible = false; Statics[htStatics(StaticTimeLineExpandedNormal)].Visible = false; Statics[htStatics(StaticTimeLineExpandedHighlighted)].Visible = false; @@ -427,6 +428,11 @@ namespace Vocaluxe.Screens { Lyrics[i].LyricStyle = CConfig.LyricStyle; } + + for (int p = 0; p < CGame.NumPlayer; p++) + { + Statics[htStatics(StaticAvatars[p, CGame.NumPlayer - 1])].Aspect = EAspect.Crop; + } SetVisuability(); UpdateAvatars();