Merge branch 'release-0.3' into develop

Conflicts: VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs
2013-10-19 02:12:29 +02:00
commit dbcd79af79
@@ -658,7 +658,7 @@ namespace Vocaluxe.Screens
                CBackgroundMusic.Disabled = false;

            int song = _SongMenus[_SongMenu].GetActualSelection();
-            if ((CSongs.Category >= 0 || CConfig.Tabs == EOffOn.TR_CONFIG_OFF) && song >= 0 && song < CSongs.VisibleSongs.Count)
+            if ((CSongs.IsInCategory || CConfig.Tabs == EOffOn.TR_CONFIG_OFF) && song >= 0 && song < CSongs.VisibleSongs.Count)
                _Texts[_TextSelection].Text = CSongs.VisibleSongs[song].Artist + " - " + CSongs.VisibleSongs[song].Title;
            else if (!CSongs.IsInCategory && song >= 0 && song < CSongs.Categories.Count)
                _Texts[_TextSelection].Text = CSongs.Categories[song].Name;
@@ -47,7 +47,7 @@ namespace VocaluxeLib.Menu.SongMenu

        public SRectF Rect
        {
-            get { return _SongMenu.GetRect(); }
+            get { return _SongMenu.Rect; }
        }

        #region ISongMenu
@@ -156,11 +156,6 @@ namespace VocaluxeLib.Menu.SongMenu
            _SongMenu.SetVisible(visible);
        }

-        public SRectF GetRect()
-        {
-            return _SongMenu.GetRect();
-        }
-
        public bool IsSmallView()
        {
            return _SongMenu.IsSmallView();
@@ -101,52 +101,38 @@ namespace VocaluxeLib.Menu.SongMenu

        private readonly Stopwatch _VideoFadeTimer = new Stopwatch();
        private readonly List<int> _Streams = new List<int>();
-        private int _ActSongId = -1;
-        private int _Actsongstream = -1;
        protected CTexture _Vidtex;

        protected bool _Initialized;
        protected int _LastKnownNumSongs;
        protected int _LastKnownCategory = -1;

-        protected SRectF _Rect;
        protected SColorF _Color;

        protected bool _Active;

        protected float _MaxVolume = 100f;

-        protected virtual int _PreviewId { get; set; }
+        //the real selected song for singing
+        protected int _Locked { get; set; }

-        private int _LockedInternal = -1;
-        protected int _Locked
+        private int _PreviewIdInternal = -1;
+        protected virtual int _PreviewId
        {
-            //the real selected song for singing
-            get { return _LockedInternal; }
-            set { _LockedInternal = value; }
+            get { return _PreviewIdInternal; }
+            set
+            {
+                //Do this first, otherwhise song will restart
+                _PlaySong(value);
+                _PreviewIdInternal = value;
+            }
        }

-        protected int _SongStream
-        {
-            get { return _Actsongstream; }
-        }
+        protected int _PreviewSongStream { get; private set; }

-        protected int _Video { get; private set; }
+        protected int _PreviewVideoStream { get; private set; }

-        protected int _ActSong
-        {
-            get { return _ActSongId; }
-        }
-
-        public SRectF Rect
-        {
-            get { return _Rect; }
-        }
-
-        public SRectF GetRect()
-        {
-            return _Rect;
-        }
+        public SRectF Rect { get; protected set; }

        public SColorF Color
        {
@@ -155,7 +141,7 @@ namespace VocaluxeLib.Menu.SongMenu

        public virtual int GetActualSelection()
        {
-            return _ActSongId;
+            return -1;
        }

        private bool _Selected;
@@ -185,7 +171,9 @@ namespace VocaluxeLib.Menu.SongMenu
        protected CSongMenuFramework(int partyModeID)
        {
            _PartyModeID = partyModeID;
-            _Video = -1;
+            _PreviewVideoStream = -1;
+            _PreviewSongStream = -1;
+            _Locked = -1;
            _Theme = new SThemeSongMenu
                {
                    SongMenuTileBoard =
@@ -374,7 +362,7 @@ namespace VocaluxeLib.Menu.SongMenu

        public void UpdateRect(SRectF rect)
        {
-            _Rect = rect;
+            Rect = rect;
            Init();
        }

@@ -383,23 +371,20 @@ namespace VocaluxeLib.Menu.SongMenu
            if (!_Initialized)
                return;

-            if (_ActSongId != _PreviewId)
-                _SelectSong(_PreviewId);
-
-            if (_Streams.Count <= 0 || _Video == -1)
+            if (_Streams.Count <= 0 || _PreviewVideoStream == -1)
                return;

-            if (CBase.Video.IsFinished(_Video) || CBase.Sound.IsFinished(_Actsongstream))
+            if (CBase.Video.IsFinished(_PreviewVideoStream) || CBase.Sound.IsFinished(_PreviewSongStream))
            {
-                CBase.Video.Close(_Video);
-                _Video = -1;
+                CBase.Video.Close(_PreviewVideoStream);
+                _PreviewVideoStream = -1;
                return;
            }

-            float time = CBase.Sound.GetPosition(_Actsongstream);
+            float time = CBase.Sound.GetPosition(_PreviewSongStream);

            float vtime;
-            if (CBase.Video.GetFrame(_Video, ref _Vidtex, time, out vtime))
+            if (CBase.Video.GetFrame(_PreviewVideoStream, ref _Vidtex, time, out vtime))
            {
                if (_Vidtex != null)
                {
@@ -416,7 +401,7 @@ namespace VocaluxeLib.Menu.SongMenu

        public virtual void OnShow()
        {
-            _Actsongstream = -1;
+            _PreviewSongStream = -1;
            _Vidtex = null;
            ApplyVolume(CBase.Config.GetPreviewMusicVolume());
        }
@@ -435,7 +420,7 @@ namespace VocaluxeLib.Menu.SongMenu
            if (!_Initialized || !_Visible)
                return;

-            if (_Video != -1)
+            if (_PreviewVideoStream != -1)
                CBase.Drawing.DrawTexture(_Vidtex, new SRectF(0, 0, 1280, 720, 0));
        }

@@ -538,53 +523,44 @@ namespace VocaluxeLib.Menu.SongMenu
            CBase.Songs.SetCategory(-1);
        }

-        public void ApplyVolume()
+        private void _PlaySong(int nr)
        {
-            CBase.Sound.SetStreamVolume(_Actsongstream, CBase.Config.GetPreviewMusicVolume());
-        }
-
-        protected void _SelectSong(int nr)
-        {
-            if (CBase.Songs.IsInCategory() && (CBase.Songs.GetNumSongsVisible() > 0) && (nr >= 0) && ((_ActSongId != nr) || (_Streams.Count == 0)))
+            if (CBase.Songs.IsInCategory() && (_PreviewId != nr || _Streams.Count == 0))
            {
-                _Streams.ForEach(soundStream => CBase.Sound.FadeAndStop(soundStream, 0f, 1f));
-                _Streams.Clear();
+                _Reset();

-                CBase.Video.Close(_Video);
-                _Video = -1;
+                CSong song = CBase.Songs.GetVisibleSong(nr);
+                if (song == null)
+                    return;

-                CBase.Drawing.RemoveTexture(ref _Vidtex);
-
-                _ActSongId = nr;
-                if (_ActSongId >= CBase.Songs.GetNumSongsVisible())
-                    _ActSongId = 0;
-
-
-                CSong actSong = CBase.Songs.GetVisibleSong(_ActSongId);
-                int stream = CBase.Sound.Load(Path.Combine(actSong.Folder, actSong.MP3FileName), true);
+                int stream = CBase.Sound.Load(Path.Combine(song.Folder, song.MP3FileName), true);
                CBase.Sound.SetStreamVolumeMax(stream, _MaxVolume);
                CBase.Sound.SetStreamVolume(stream, 0f);

-                float startposition = actSong.Preview.StartTime;
+                float startposition = song.Preview.StartTime;
+                float length = CBase.Sound.GetLength(stream);

-                if (actSong.Preview.Source == EDataSource.None)
-                    startposition = CBase.Sound.GetLength(stream) / 4f;
+                if (song.Preview.Source == EDataSource.None)
+                    startposition = length / 4f;
+                else if (startposition > length - 5f)
+                    startposition = Math.Max(0f, Math.Min(length / 4f, length - 5f));

                if (startposition >= 0.5f)
                    startposition -= 0.5f;

                CBase.Sound.SetPosition(stream, startposition);
                CBase.Sound.Play(stream);
+                CBase.Sound.SetStreamVolumeMax(stream, CBase.Config.GetPreviewMusicVolume());
                CBase.Sound.Fade(stream, 100f, 3f);
                _Streams.Add(stream);
-                _Actsongstream = stream;
+                _PreviewSongStream = stream;

-                if (actSong.VideoFileName != "" && CBase.Config.GetVideoPreview() == EOffOn.TR_CONFIG_ON)
+                if (song.VideoFileName != "" && CBase.Config.GetVideoPreview() == EOffOn.TR_CONFIG_ON)
                {
-                    _Video = CBase.Video.Load(Path.Combine(actSong.Folder, actSong.VideoFileName));
-                    if (_Video == -1)
+                    _PreviewVideoStream = CBase.Video.Load(Path.Combine(song.Folder, song.VideoFileName));
+                    if (_PreviewVideoStream == -1)
                        return;
-                    CBase.Video.Skip(_Video, startposition, actSong.VideoGap);
+                    CBase.Video.Skip(_PreviewVideoStream, startposition, song.VideoGap);
                    _VideoFadeTimer.Stop();
                    _VideoFadeTimer.Reset();
                    _VideoFadeTimer.Start();
@@ -598,8 +574,8 @@ namespace VocaluxeLib.Menu.SongMenu
                CBase.Sound.FadeAndStop(stream, 0f, 0.75f);
            _Streams.Clear();

-            CBase.Video.Close(_Video);
-            _Video = -1;
+            CBase.Video.Close(_PreviewVideoStream);
+            _PreviewVideoStream = -1;

            CBase.Drawing.RemoveTexture(ref _Vidtex);
        }
@@ -79,7 +79,7 @@ namespace VocaluxeLib.Menu.SongMenu
        {
            base.Init();

-            _Rect = _Theme.SongMenuTileBoard.TileRect;
+            Rect = _Theme.SongMenuTileBoard.TileRect;

            _NumW = _Theme.SongMenuTileBoard.NumW;
            _NumH = _Theme.SongMenuTileBoard.NumH;
@@ -98,7 +98,7 @@ namespace VocaluxeLib.Menu.SongMenu
                for (int j = 0; j < _NumW; j++)
                {
                    var rect = new SRectF(_Theme.SongMenuTileBoard.TileRect.X + j * (_TileW + _SpaceW),
-                                          _Theme.SongMenuTileBoard.TileRect.Y + i * (_TileH + _SpaceH), _TileW, _TileH, _Rect.Z);
+                                          _Theme.SongMenuTileBoard.TileRect.Y + i * (_TileH + _SpaceH), _TileW, _TileH, Rect.Z);
                    var tile = new CStatic(_PartyModeID, _CoverTexture, Color, rect);
                    _Tiles.Add(tile);
                }
@@ -173,7 +173,7 @@ namespace VocaluxeLib.Menu.SongMenu
                _MedleyCalcIcon.Visible = song.Medley.Source == EDataSource.Calculated;
                _MedleyTagIcon.Visible = song.Medley.Source == EDataSource.Tag;

-                float time = CBase.Sound.GetLength(_SongStream);
+                float time = CBase.Sound.GetLength(_PreviewSongStream);
                if (Math.Abs(song.Finish) > 0.001)
                    time = song.Finish;

@@ -192,12 +192,8 @@ namespace VocaluxeLib.Menu.SongMenu
                _Artist.Text = category.Name;

                int num = category.GetNumSongsNotSung();
-                // ReSharper disable ConvertIfStatementToConditionalTernaryExpression
-                if (num != 1)
-                    // ReSharper restore ConvertIfStatementToConditionalTernaryExpression
-                    _Title.Text = CBase.Language.Translate("TR_SCREENSONG_NUMSONGS").Replace("%v", num.ToString());
-                else
-                    _Title.Text = CBase.Language.Translate("TR_SCREENSONG_NUMSONG").Replace("%v", num.ToString());
+                String songOrSongs = (num == 1) ? "TR_SCREENSONG_NUMSONG" : "TR_SCREENSONG_NUMSONGS";
+                _Title.Text = CBase.Language.Translate(songOrSongs).Replace("%v", num.ToString());
            }
        }

@@ -210,7 +206,7 @@ namespace VocaluxeLib.Menu.SongMenu
            _PreviewId = -1;
            _UpdateList(0, true);
            //AfterCategoryChange();
-            SetSelectedSong(_ActSong);
+            SetSelectedSong(_PreviewId);
            _AfterCategoryChange();

            if (_PreviewId < 0)
@@ -374,7 +370,7 @@ namespace VocaluxeLib.Menu.SongMenu
            bool sel = false;
            int lastselection = _ActualSelection;

-            if (!songOptions.Selection.RandomOnly || !CBase.Songs.IsInCategory() && songOptions.Selection.CategoryChangeAllowed)
+            if (!songOptions.Selection.RandomOnly || (!CBase.Songs.IsInCategory() && songOptions.Selection.CategoryChangeAllowed))
            {
                foreach (CStatic tile in _Tiles)
                {
@@ -455,7 +451,7 @@ namespace VocaluxeLib.Menu.SongMenu

            _TextBG.Draw();

-            if (_Vidtex != null && _Video != -1)
+            if (_Vidtex != null && _PreviewVideoStream != -1)
            {
                if (_Vidtex.Color.A < 1)
                    _CoverBig.Draw(1f, EAspect.Crop);
@@ -595,9 +591,6 @@ namespace VocaluxeLib.Menu.SongMenu

        private void _AfterCategoryChange()
        {
-            _SelectSong(_PreviewId);
-            _UpdatePreview();
-
            foreach (CStatic tile in _Tiles)
                tile.Selected = false;

@@ -658,17 +651,17 @@ namespace VocaluxeLib.Menu.SongMenu
            {
                _NumH = _Theme.SongMenuTileBoard.NumHsmall;
                _NumW = _Theme.SongMenuTileBoard.NumWsmall;
-                _Rect = _Theme.SongMenuTileBoard.TileRectSmall;
+                Rect = _Theme.SongMenuTileBoard.TileRectSmall;
            }
            else
            {
                _NumH = _Theme.SongMenuTileBoard.NumH;
                _NumW = _Theme.SongMenuTileBoard.NumW;
-                _Rect = _Theme.SongMenuTileBoard.TileRect;
+                Rect = _Theme.SongMenuTileBoard.TileRect;
            }

-            _TileW = (int)((_Rect.W - _SpaceW * (_NumW - 1)) / _NumW);
-            _TileH = (int)((_Rect.H - _SpaceH * (_NumH - 1)) / _NumH);
+            _TileW = (int)((Rect.W - _SpaceW * (_NumW - 1)) / _NumW);
+            _TileH = (int)((Rect.H - _SpaceH * (_NumH - 1)) / _NumH);

            _CoverTexture = CBase.Theme.GetSkinTexture(_Theme.CoverBackgroundName, _PartyModeID);
            _CoverBigTexture = CBase.Theme.GetSkinTexture(_Theme.CoverBigBackgroundName, _PartyModeID);
@@ -678,13 +671,13 @@ namespace VocaluxeLib.Menu.SongMenu
            {
                for (int j = 0; j < _NumW; j++)
                {
-                    var rect = new SRectF(_Rect.X + j * (_TileW + _SpaceW), _Rect.Y + i * (_TileH + _SpaceH), _TileW, _TileH, _Rect.Z);
+                    var rect = new SRectF(Rect.X + j * (_TileW + _SpaceW), Rect.Y + i * (_TileH + _SpaceH), _TileW, _TileH, Rect.Z);
                    var tile = new CStatic(_PartyModeID, _CoverTexture, Color, rect);
                    _Tiles.Add(tile);
                }
            }

-            _ScrollRect = new SRectF(0, 0, CBase.Settings.GetRenderW(), CBase.Settings.GetRenderH(), _Rect.Z);
+            _ScrollRect = new SRectF(0, 0, CBase.Settings.GetRenderW(), CBase.Settings.GetRenderH(), Rect.Z);
            _UpdateList(true);
        }

@@ -55,6 +55,6 @@ namespace VocaluxeLib.Menu.SongMenu
        bool IsSmallView();
        void SetSmallView(bool smallView);

-        SRectF GetRect();
+        SRectF Rect { get; }
    }
 }