Merge pull request #95 from flokuep/develop

Smaller fixes and additions

Vocaluxe/Lib/Draw/CDirect3D.cs

@@ -230,6 +230,9 @@ namespace Vocaluxe.Lib.Draw
                         case 0xF100: // SC_KEYMENU
                             m.Result = IntPtr.Zero;
                             break;
+                        case 0xF140: // SC_SCREENSAVER
+                        case 0xF170: // SC_MONITORPOWER
+                            break;
                         default:
                             base.WndProc(ref m);
                             break;

Vocaluxe/Lib/Draw/CDrawWinForm.cs

@@ -173,6 +173,9 @@ namespace Vocaluxe.Lib.Draw
                         case 0xF100: // SC_KEYMENU
                             m.Result = IntPtr.Zero;
                             break;
+                        case 0xF140: // SC_SCREENSAVER
+                        case 0xF170: // SC_MONITORPOWER
+                            break;
                         default:
                             base.WndProc(ref m);
                             break;

Vocaluxe/Lib/Draw/COpenGL.cs

@@ -310,6 +310,9 @@ namespace Vocaluxe.Lib.Draw
                         case 0xF100: // SC_KEYMENU
                             m.Result = IntPtr.Zero;
                             break;
+                        case 0xF140: // SC_SCREENSAVER
+                        case 0xF170: // SC_MONITORPOWER
+                            break;
                         default:
                             base.WndProc(ref m);
                             break;

VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs

@@ -116,7 +116,7 @@ namespace VocaluxeLib.Menu.SongMenu
         //the real selected song for singing
         protected int _Locked { get; set; }
 
-        private int _PreviewIdInternal = -1;
+        protected int _PreviewIdInternal = -1;
         protected virtual int _PreviewId
         {
             get { return _PreviewIdInternal; }
@@ -523,7 +523,7 @@ namespace VocaluxeLib.Menu.SongMenu
             CBase.Songs.SetCategory(-1);
         }
 
-        private void _PlaySong(int nr)
+        protected void _PlaySong(int nr)
         {
             if (CBase.Songs.IsInCategory() && (_PreviewId != nr || _Streams.Count == 0))
             {
@@ -555,6 +555,8 @@ namespace VocaluxeLib.Menu.SongMenu
                 _Streams.Add(stream);
                 _PreviewSongStream = stream;
 
+                _PreviewIdInternal = nr;
+
                 if (song.VideoFileName != "" && CBase.Config.GetVideoPreview() == EOffOn.TR_CONFIG_ON)
                 {
                     _PreviewVideoStream = CBase.Video.Load(Path.Combine(song.Folder, song.VideoFileName));

VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs

@@ -67,9 +67,14 @@ namespace VocaluxeLib.Menu.SongMenu
         {
             set
             {
-                base._PreviewId = value;
+                base._PlaySong(value);
+                base._PreviewIdInternal = value;
                 _UpdatePreview();
             }
+            get
+            {
+                return base._PreviewIdInternal;
+            }
         }
 
         public override int GetActualSelection()
@@ -222,7 +227,6 @@ namespace VocaluxeLib.Menu.SongMenu
                 _EnterCategory(0);
             _ActualSelection = -1;
             _Locked = -1;
-            _PreviewId = -1;
             _UpdateList(0, true);
             //AfterCategoryChange();
             SetSelectedSong(_PreviewId);
@@ -372,8 +376,9 @@ namespace VocaluxeLib.Menu.SongMenu
 
                 if (!keyEvent.Handled)
                 {                   
-                    _PreviewId = _Locked;
                     _ActualSelection = _Locked;
+                    if (_PreviewId != _Locked)
+                        _PreviewId = _Locked;
 
                     for (int i = 0; i < _Tiles.Count; i++)
                         _Tiles[i].Selected = _Locked == i + _Offset;
@@ -554,6 +559,7 @@ namespace VocaluxeLib.Menu.SongMenu
 
         public override void SetSelectedSong(int visibleSongNr)
         {
+            base._PlaySong(visibleSongNr);
             base.SetSelectedSong(visibleSongNr);
 
             if (visibleSongNr >= 0 && visibleSongNr < CBase.Songs.GetNumSongsVisible())

VocaluxeLib/Songs/CSong.cs

@@ -488,9 +488,11 @@ namespace VocaluxeLib.Songs
                     if (stop < (voice.Lines[series[i].Start].FirstNoteBeat + ((voice.Lines[series[i].End].LastNoteBeat - voice.Lines[series[i].Start].FirstNoteBeat) / 2)))
                     {
                         ShortEnd.EndBeat = voice.Lines[series[i].Start - 1].LastNote.EndBeat;
+                        ShortEnd.Source = EDataSource.Calculated;
                         return;
                     }
                     ShortEnd.EndBeat = voice.Lines[series[i].End].LastNote.EndBeat;
+                    ShortEnd.Source = EDataSource.Calculated;
                     return;
                 }
             }
@@ -501,6 +503,7 @@ namespace VocaluxeLib.Songs
                 if (line.FirstNoteBeat < stop && line.LastNoteBeat > stop)
                 {
                     ShortEnd.EndBeat = line.LastNoteBeat;
+                    ShortEnd.Source = EDataSource.Calculated;
                     return;
                 }
             }

VocaluxeLib/Songs/CSongLoader.cs

@@ -309,7 +309,7 @@ namespace VocaluxeLib.Songs
                                         _Song.ShortEnd.Source = EDataSource.Tag;
                                     }
                                     else
-                                        _LogWarning("Invalid medleyendbeat");
+                                        _LogWarning("Invalid shortendbeat");
                                 }
                                 break;
                             case "CALCMEDLEY":