Merge branch 'develop' of git://github.com/flokuep/Vocaluxe into develop

2014-09-07 10:37:37 +02:00
commit a5ddeeee95
@@ -248,6 +248,13 @@ namespace VocaluxeLib
        // ReSharper restore InconsistentNaming
    }

+    public enum EBackgroundMusicOffOn
+    {
+        TR_CONFIG_OFF,
+        TR_CONFIG_ONLY_SONG,
+        TR_CONFIG_ON
+    }
+
    public enum EPlayerInfo
    {
        // ReSharper disable InconsistentNaming
@@ -288,6 +295,14 @@ namespace VocaluxeLib
    }
    #endregion Config

+    public enum EStreamAction
+    {
+        Nothing,
+        Pause,
+        Stop,
+        Close
+    }
+
    public enum EProgramState
    {
        Start,
@@ -35,6 +35,8 @@ namespace VocaluxeLib
        void SetBackgroundMusicVolume(int newVolume);
        int GetBackgroundMusicVolume();

+        EBackgroundMusicOffOn GetBackgroundMusicStatus();
+
        int GetPreviewMusicVolume();

        EOffOn GetVideosToBackground();
@@ -89,6 +91,8 @@ namespace VocaluxeLib

        float GetSlideShowImageTime();
        float GetSlideShowFadeTime();
+
+        float GetSoundPlayerFadeTime();
    }

    public interface ITheme
@@ -115,16 +119,24 @@ namespace VocaluxeLib
    {
        bool IsDisabled();
        bool IsPlaying();
+        bool IsPlayingPreview();
        bool SongHasVideo();
        bool VideoEnabled();
+        float GetLength();

        void SetDisabled(bool disabled);
        void Next();
        void Previous();
        void Pause();
        void Play();
+        void Stop();

        CTexture GetVideoTexture();
+
+        void LoadPreview(CSong song, float start = 0f);
+        void PlayPreview(float start = -1f);
+        void StopPreview();
+
    }

    public interface IDrawing
@@ -148,6 +160,8 @@ namespace VocaluxeLib
        void FadeTo(EScreens nextScreen);

        float GetGlobalAlpha();
+
+        EScreens GetNextScreen();
    }

    public interface ILog
@@ -255,6 +269,8 @@ namespace VocaluxeLib
        bool IsFinished(int streamID);
        bool Close(int streamID);
        void SetLoop(int streamID, bool loop = true);
+        void Resume(int streamID);
+        void Pause(int streamID);
    }

    public interface ISound
@@ -262,12 +278,12 @@ namespace VocaluxeLib
        int Load(string soundFile, bool loop = false, bool prescan = false);
        void SetPosition(int soundStream, float newPosition);
        void Play(int soundStream);
-        void Fade(int soundStream, float targetVolume, float duration);
+        void Fade(int soundStream, float targetVolume, float duration, EStreamAction afterFadeAction = EStreamAction.Nothing);
+        void Close(int soundStream);

        bool IsFinished(int soundStream);
        float GetPosition(int soundStream);
        float GetLength(int soundStream);
-        void FadeAndClose(int soundStream, float targetVolume, float duration);

        void SetStreamVolume(int soundStream, float volume);
    }
@@ -311,4 +327,17 @@ namespace VocaluxeLib
        int GetSongCount(int playlistID);
        CPlaylistSong GetSong(int playlistID, int songIndex);
    }
+
+    public interface IPreviewPlayer
+    {
+        void Play(float start = -1);
+        void Load(CSong song, float start = 0f);
+        void Stop();
+        void TogglePause();
+        CTexture GetCover();
+        CTexture GetVideoTexture();
+        bool IsPlaying();
+        float GetLength();
+
+    }
 }
@@ -194,7 +194,7 @@ namespace VocaluxeLib.Menu

            if (!String.IsNullOrEmpty(_Theme.TextureName) &&
                (_Theme.Type == EBackgroundTypes.Texture ||
-                 (_Theme.Type == EBackgroundTypes.Video && (CBase.Config.GetVideoBackgrounds() == EOffOn.TR_CONFIG_OFF || !ok))))
+                 (_Theme.Type == EBackgroundTypes.Video && CBase.Config.GetVideoBackgrounds() == EOffOn.TR_CONFIG_OFF)))
                ok = _DrawTexture();

            if (_Theme.Type == EBackgroundTypes.Color || _Theme.Type == EBackgroundTypes.Texture && !ok ||
@@ -115,18 +115,15 @@ namespace VocaluxeLib.Menu.SongMenu
                    _PlaySong(value);
                }
                else if (value >= CBase.Songs.GetNumCategories())
+                {
                    value = -1;
+                    CBase.BackgroundMusic.Stop();
+                }

                _PreviewNrInternal = value;
            }
        }

-        protected int _PreviewSongStream { get; private set; }
-
-        protected int _PreviewVideoStream { get; private set; }
-        private CFading _VideoFading;
-        protected CTexture _Vidtex;
-
        private SColorF _ColorInternal;
        protected SColorF _Color
        {
@@ -160,8 +157,6 @@ namespace VocaluxeLib.Menu.SongMenu
        {
            Visible = true;
            _PartyModeID = partyModeID;
-            _PreviewVideoStream = -1;
-            _PreviewSongStream = -1;
            _Theme = new SThemeSongMenu
                {
                    SongMenuTileBoard =
@@ -346,7 +341,7 @@ namespace VocaluxeLib.Menu.SongMenu

        public virtual void Init()
        {
-            _ResetPreview();
+            _ResetPreview(false);
            _Initialized = true;
        }

@@ -354,40 +349,14 @@ namespace VocaluxeLib.Menu.SongMenu
        {
            if (!_Initialized)
                return;
-
-            if (_PreviewSongStream == -1 || _PreviewVideoStream == -1)
-                return;
-
-            if (CBase.Video.IsFinished(_PreviewVideoStream) || CBase.Sound.IsFinished(_PreviewSongStream))
-            {
-                CBase.Video.Close(_PreviewVideoStream);
-                _PreviewVideoStream = -1;
-                return;
-            }
-
-            float time = CBase.Sound.GetPosition(_PreviewSongStream);
-
-            float vtime;
-            if (CBase.Video.GetFrame(_PreviewVideoStream, ref _Vidtex, time, out vtime))
-            {
-                if (_Vidtex != null)
-                {
-                    if (_VideoFading != null)
-                    {
-                        bool finished;
-                        _Vidtex.Color.A = _VideoFading.GetValue(out finished);
-                        if (finished)
-                            _VideoFading = null;
-                    }
-                }
-            }
        }

        public virtual void OnShow() {}
-
+        
        public virtual void OnHide()
        {
-            _ResetPreview();
+            if(CBase.Graphics.GetNextScreen() != EScreens.ScreenNames)
+                _ResetPreview();
        }

        public abstract bool HandleInput(ref SKeyEvent keyEvent, SScreenSongOptions options);
@@ -399,8 +368,8 @@ namespace VocaluxeLib.Menu.SongMenu
            if (!_Initialized || !Visible)
                return;

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

        public bool IsMouseOverSelectedSong(SMouseEvent mEvent)
@@ -486,7 +455,7 @@ namespace VocaluxeLib.Menu.SongMenu
            if (categoryNr >= CBase.Songs.GetNumCategories())
                return;

-            _ResetPreview();
+            _ResetPreview(false);
            CBase.Songs.SetCategory(categoryNr);
        }

@@ -504,50 +473,24 @@ namespace VocaluxeLib.Menu.SongMenu

        private void _PlaySong(int nr)
        {
-            _ResetPreview();
+            _PreviewNrInternal = -1;

            CSong song = CBase.Songs.GetVisibleSong(nr);
            if (song == null)
                return;

-            //TODO: Using prescan here causes Vocaluxe to hang a bit on loading the song but we need the length below
-            _PreviewSongStream = CBase.Sound.Load(Path.Combine(song.Folder, song.MP3FileName), true, true);
-
-            float startposition = song.Preview.StartTime;
-            float length = CBase.Sound.GetLength(_PreviewSongStream);
-
-            if (song.Preview.Source == EDataSource.None)
-                startposition = length / 4f;
-            else if (startposition > length - 5f)
-                startposition = Math.Max(0f, Math.Min(length / 4f, length - 5f));
-
-            CBase.Sound.SetPosition(_PreviewSongStream, startposition);
-            CBase.Sound.Play(_PreviewSongStream);
-            CBase.Sound.SetStreamVolume(_PreviewSongStream, 0f);
-            CBase.Sound.Fade(_PreviewSongStream, 100f, 3f);
-
-            if (song.VideoFileName != "" && CBase.Config.GetVideoPreview() == EOffOn.TR_CONFIG_ON)
-            {
-                _PreviewVideoStream = CBase.Video.Load(Path.Combine(song.Folder, song.VideoFileName));
-                if (_PreviewVideoStream == -1)
-                    return;
-                CBase.Video.SetLoop(_PreviewVideoStream);
-                CBase.Video.Skip(_PreviewVideoStream, startposition, song.VideoGap);
-                _VideoFading = new CFading(0f, 1f, 3f);
-            }
+            CBase.BackgroundMusic.LoadPreview(song);
        }

-        protected void _ResetPreview()
+        protected void _ResetPreview(bool playBGagain = true)
        {
-            if (_PreviewSongStream >= 0)
-                CBase.Sound.FadeAndClose(_PreviewSongStream, 0f, 0.75f);
+            if (_PreviewNrInternal == -1)
+                return;

-            _PreviewSongStream = -1;
+            CBase.BackgroundMusic.StopPreview();

-            CBase.Video.Close(_PreviewVideoStream);
-            _PreviewVideoStream = -1;
-
-            CBase.Drawing.RemoveTexture(ref _Vidtex);
+            if (playBGagain)
+                CBase.BackgroundMusic.Play();

            //Make sure we don't have a preview here otherwise a change won't be recognized
            //(e.g. leave a category with one song and set preview to 0 --> previewOld=previewNew=0 --> No change --> Old data shown
@@ -110,7 +110,11 @@ namespace VocaluxeLib.Menu.SongMenu
            set
            {
                if (value == base._PreviewNr)
+                {
+                    if (!CBase.BackgroundMusic.IsPlaying() && value != -1)
+                        CBase.BackgroundMusic.PlayPreview();
                    return;
+                }
                base._PreviewNr = value;
                _UpdatePreview();
            }
@@ -179,7 +183,7 @@ namespace VocaluxeLib.Menu.SongMenu
            if (songOptions.Selection.RandomOnly)
                _PreviewNr = _SelectionNr;

-            if (_Length < 0 && CBase.Songs.IsInCategory() && CBase.Sound.GetLength(_PreviewSongStream) > 0)
+            if (_Length < 0 && CBase.Songs.IsInCategory() && CBase.BackgroundMusic.GetLength() > 0)
                _UpdateLength(CBase.Songs.GetVisibleSong(_PreviewNr));
        }

@@ -244,7 +248,7 @@ namespace VocaluxeLib.Menu.SongMenu
        {
            if (song == null)
                return;
-            float time = CBase.Sound.GetLength(_PreviewSongStream);
+            float time = CBase.BackgroundMusic.GetLength();
            if (Math.Abs(song.Finish) > 0.001)
                time = song.Finish;

@@ -463,18 +467,20 @@ namespace VocaluxeLib.Menu.SongMenu

            _TextBG.Draw();

-            if (_Vidtex != null && _PreviewVideoStream != -1)
+            CTexture vidtex = CBase.BackgroundMusic.IsPlayingPreview() ? CBase.BackgroundMusic.GetVideoTexture() : null;
+
+            if (vidtex != null)
            {
-                if (_Vidtex.Color.A < 1)
+                if (vidtex.Color.A < 1)
                    _CoverBig.Draw(EAspect.Crop);
                var bounds = new RectangleF(_CoverBig.Rect.X, _CoverBig.Rect.Y, _CoverBig.Rect.W, _CoverBig.Rect.H);
                RectangleF rect;
-                CHelper.SetRect(bounds, out rect, _Vidtex.OrigAspect, EAspect.Crop);
+                CHelper.SetRect(bounds, out rect, vidtex.OrigAspect, EAspect.Crop);
                var vidRect = new SRectF(rect.X, rect.Y, rect.Width, rect.Height, _CoverBig.Rect.Z);
                var vidRectBounds = new SRectF(bounds.X, bounds.Y, bounds.Width, bounds.Height, 0f);

-                CBase.Drawing.DrawTexture(_Vidtex, vidRect, _Vidtex.Color, vidRectBounds);
-                CBase.Drawing.DrawTextureReflection(_Vidtex, vidRect, _Vidtex.Color, vidRectBounds, _CoverBig.ReflectionSpace, _CoverBig.ReflectionHeight);
+                CBase.Drawing.DrawTexture(vidtex, vidRect, vidtex.Color, vidRectBounds);
+                CBase.Drawing.DrawTextureReflection(vidtex, vidRect, vidtex.Color, vidRectBounds, _CoverBig.ReflectionSpace, _CoverBig.ReflectionHeight);
            }
            else
                _CoverBig.Draw(EAspect.Crop);
@@ -458,7 +458,10 @@ namespace VocaluxeLib.Songs
            if (Preview.Source == EDataSource.None)
            {
                if (Medley.Source != EDataSource.None)
+                {
                    Preview.StartTime = CBase.Game.GetTimeFromBeats(Medley.StartBeat, BPM);
+                    Preview.Source = EDataSource.Calculated;
+                }
            }
        }

@@ -416,6 +416,7 @@ namespace VocaluxeLib.Songs
                    {
                        //PreviewStart is not set or <=0
                        _Song.Preview.StartTime = (headerFlags & EHeaderFlags.MedleyStartBeat) != 0 ? CBase.Game.GetTimeFromBeats(_Song.Medley.StartBeat, _Song.BPM) : 0f;
+                        _Song.Preview.Source = _Song.Preview.StartTime == 0 ? EDataSource.None : EDataSource.Calculated;
                    }

                    if ((headerFlags & EHeaderFlags.MedleyStartBeat) != 0 && (headerFlags & EHeaderFlags.MedleyEndBeat) != 0)
@@ -0,0 +1,185 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.IO;
+
+using VocaluxeLib.Draw;
+using VocaluxeLib.Songs;
+
+namespace VocaluxeLib.Utils.Player
+{
+    public class CSongPlayer : CSoundPlayer
+    {
+        private CSong _Song;
+        private bool _VideoEnabled;
+        private int _Video = -1;
+        private CTexture _CurrentVideoTexture;
+        private CFading _VideoFading;
+
+        public bool VideoEnabled
+        {
+            get { return _VideoEnabled; }
+            set
+            {
+                if (_VideoEnabled == value)
+                    return;
+                _VideoEnabled = value;
+                if (_VideoEnabled)
+                    _LoadVideo();
+                else if (_Video != -1)
+                {
+                    CBase.Video.Close(_Video);
+                    CBase.Drawing.RemoveTexture(ref _CurrentVideoTexture);
+                    _Video = -1;
+                }
+            }
+        }
+        public int SongID
+        {
+            get { return _Song == null ? -1 : _Song.ID; }
+        }
+        public bool SongHasVideo
+        {
+            get { return _Song != null && File.Exists(Path.Combine(_Song.Folder,_Song.VideoFileName)); }
+        }
+
+        public string ArtistAndTitle
+        {
+            get
+            {
+                if (_Song == null)
+                    return "";
+                if (_Song.Artist != "" && _Song.Title != "")
+                    return _Song.Artist + " - " + _Song.Title;
+                return Path.GetFileNameWithoutExtension(_Song.MP3FileName);
+            }
+        }
+
+        public CTexture Cover
+        {
+            get { return _Song == null ? CBase.Cover.GetNoCover() : _Song.CoverTextureBig; }
+        }
+
+        public bool SongLoaded
+        {
+            get { return _StreamID != -1; }
+        }
+
+
+        public CSongPlayer(bool loop = false) : base(loop) { }
+
+        public CSongPlayer(CSong song, bool loop = false, float position = 0f, bool autoplay = false)
+            : base(Path.Combine(song.Folder,song.MP3FileName), loop, position, autoplay)
+        {
+            _Song = song;
+            _LoadVideo();
+        }
+
+        public CSongPlayer(string file, bool loop = false, float position = 0f, bool autoplay = false)
+            : base(file, loop, position, autoplay)
+        {
+            _Song = null;
+        }
+
+        public CTexture GetVideoTexture()
+        {
+            if (_Video == -1 || _Song == null)
+                return null;
+            float vtime;
+            if (CBase.Video.GetFrame(_Video, ref _CurrentVideoTexture, CBase.Sound.GetPosition(_StreamID), out vtime))
+            {
+                if (_VideoFading != null)
+                {
+                    bool finished;
+                    _CurrentVideoTexture.Color.A = _VideoFading.GetValue(out finished);
+                    if (finished)
+                        _VideoFading = null;
+                }
+                return _CurrentVideoTexture;
+            }
+            return null;
+        }
+
+        public void Load(CSong song, float position = 0f, bool autoplay = false) 
+        {
+            if (song == null)
+                return;
+
+            Stop();
+
+            _Song = song;
+         
+            base.Load(Path.Combine(song.Folder, song.MP3FileName), position, false);
+            _LoadVideo();
+
+            if (autoplay)
+                Play();
+        }
+
+        public void LoadFile(string file, float position = 0f, bool autoplay = false)
+        {
+            if (String.IsNullOrEmpty(file))
+                return;
+
+            Stop();
+
+            base.Load(file, position, autoplay);
+        }
+
+        public new void Play()
+        {
+            CBase.Sound.SetPosition(_StreamID, _StartPosition);
+            CBase.Video.Skip(_Video, _StartPosition, _Song.VideoGap);
+            TogglePause();
+        }
+
+        public new void Stop()
+        {
+            base.Stop();
+
+            _Song = null;
+
+            if (_Video != -1)
+            {
+                CBase.Video.Close(_Video);
+                CBase.Drawing.RemoveTexture(ref _CurrentVideoTexture);
+                _Video = -1;
+            }
+        }
+
+        public new void TogglePause()
+        {
+            if (IsPlaying && _Video != -1)
+            {
+                CBase.Video.Pause(_Video);
+                CBase.Video.Skip(_Video, CBase.Sound.GetPosition(_StreamID) + _FadeTime, _Song.VideoGap);
+            }
+            else if(_Video != -1)
+            {
+                CBase.Video.Resume(_Video);
+            }
+            base.TogglePause();
+        }
+       
+
+        private void _LoadVideo()
+        {
+            if (_Song == null)
+                return;
+
+            string videoFilePath = Path.Combine(_Song.Folder, _Song.VideoFileName);
+            if (_Video != -1 || String.IsNullOrEmpty(videoFilePath))
+                return;
+            _Video = CBase.Video.Load(videoFilePath);
+            CBase.Video.Skip(_Video, 0f, _Song.VideoGap); //Use gap, otherwhise we will overwrite position in GetVideoTexture
+            _VideoFading = new CFading(0f, 1f, 3f);
+
+            if (IsPlaying)
+            {
+                CBase.Video.Skip(_Video, Position, _Song.VideoGap);
+                CBase.Video.Resume(_Video);
+            }
+        }
+    }
+}
@@ -0,0 +1,153 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace VocaluxeLib.Utils.Player
+{
+    public class CSoundPlayer
+    {
+        protected int _StreamID = -1;
+        protected float _Volume;
+        protected float _StartPosition;
+        protected float _FadeTime = CBase.Settings.GetSoundPlayerFadeTime();
+
+        public float Volume
+        {
+            set 
+            {
+                _Volume = value;
+                _ApplyVolume(); 
+            }
+            get { return _Volume; }
+        }
+        public bool Loop;
+
+        public float Position
+        {
+            set { 
+                if(_StreamID == -1)
+                    return;
+                _StartPosition = value;
+            }
+            get { 
+                if(_StreamID == -1)
+                    return -1;
+                return CBase.Sound.GetPosition(_StreamID);
+            }
+        }
+
+        public float Length
+        {
+            get
+            {
+                if (_StreamID == -1)
+                    return 0;
+                return CBase.Sound.GetLength(_StreamID);
+            }
+        }
+
+        public bool RepeatSong;
+        public bool IsPlaying { get; protected set; }
+
+        public bool IsFinished { get { return RepeatSong ? false : CBase.Sound.IsFinished(_StreamID); } }
+
+        public CSoundPlayer(bool loop = false)
+        {
+            Loop = loop;
+        }
+
+        public CSoundPlayer(string file, bool loop = false, float position = 0f, bool autoplay = false)
+        {
+            _StreamID = CBase.Sound.Load(file, false, true);
+            if(position > 0f)
+                Position = position;
+            Loop = loop;
+            if (autoplay)
+                Play();
+        }
+
+        public void Load(string file, float position = 0f, bool autoplay = false)
+        {
+            if (IsPlaying)
+                Stop();
+
+            _StreamID = CBase.Sound.Load(file, false, true);
+            if (position > 0f)
+                Position = position;
+            if (autoplay)
+                Play();
+        }
+
+        public void Play()
+        {
+            if (_StreamID == -1 || IsPlaying)
+                return;
+
+            CBase.Sound.SetPosition(_StreamID, _StartPosition);
+            CBase.Sound.SetStreamVolume(_StreamID, 0f);
+            CBase.Sound.Fade(_StreamID, Volume, _FadeTime);
+            CBase.Sound.Play(_StreamID);
+            IsPlaying = true;
+        }
+
+        public void TogglePause()
+        {
+            if (_StreamID == -1)
+                return;
+
+            if(IsPlaying)
+                CBase.Sound.Fade(_StreamID, 0f, _FadeTime, EStreamAction.Pause);
+            else
+            {
+                CBase.Sound.Fade(_StreamID, Volume, _FadeTime);
+                CBase.Sound.Play(_StreamID);
+            }
+
+            IsPlaying = !IsPlaying;
+        }
+
+        public void Stop()
+        {
+            if (_StreamID == -1 || !IsPlaying)
+                return;
+
+            CBase.Sound.Fade(_StreamID, 0f, _FadeTime, EStreamAction.Close);
+            _StreamID = -1;
+
+            IsPlaying = false;
+        }
+
+        public void Update()
+        {
+            if (_StreamID == -1 || !IsPlaying)
+                return;
+
+            float timeToPlay;
+            float len = CBase.Sound.GetLength(_StreamID);
+            timeToPlay = (len > 0f) ? len - CBase.Sound.GetPosition(_StreamID) : _FadeTime + 1f;
+            
+            bool finished = CBase.Sound.IsFinished(_StreamID);
+            if (timeToPlay <= _FadeTime || finished)
+            {
+                if (RepeatSong)
+                {
+                    //Set to false for restarting
+                    IsPlaying = false;
+                    Play();
+                }
+                else
+                    Stop();
+            }
+        
+        }
+
+        private void _ApplyVolume()
+        {
+            if (_StreamID == -1)
+                return;
+
+            CBase.Sound.SetStreamVolume(_StreamID, Volume);
+        }
+    }
+}
@@ -135,6 +135,8 @@
    <Compile Include="PartyModes\IPartyMode.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
    <Compile Include="Utils\CWavFile.cs" />
+    <Compile Include="Utils\Player\CSongPlayer.cs" />
+    <Compile Include="Utils\Player\CSoundPlayer.cs" />
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <PropertyGroup>