Merge remote-tracking branch 'remotes/Darkice/release-0.1' into release-0.1

Vocaluxe/Lib/Draw/CDirect3D.cs

@@ -71,12 +71,14 @@ namespace Vocaluxe.Lib.Draw
             _VerticesRotationMatrices = new Queue<Matrix>();
 
             _Keys = new CKeys();
-            _D3D = new Direct3D();
+            try
-
+            {
-            if (_D3D == null)
+                _D3D = new Direct3D();
+            }
+            catch (Direct3D9NotFoundException e)
             {
                 MessageBox.Show("No DirectX runtimes were found, please download and install them from http://www.microsoft.com/download/en/details.aspx?id=8109");
-                CLog.LogError("No DirectX runtimes were found, please download and install them from http://www.microsoft.com/download/en/details.aspx?id=8109");
+                CLog.LogError(e.Message + " - No DirectX runtimes were found, please download and install them from http://www.microsoft.com/download/en/details.aspx?id=8109");
                 Environment.Exit(Environment.ExitCode);
             }
 
@@ -172,14 +174,26 @@ namespace Vocaluxe.Lib.Draw
                 flags = CreateFlags.HardwareVertexProcessing;
             else
                 flags = CreateFlags.SoftwareVertexProcessing;
-            _Device = new Device(_D3D, _D3D.Adapters.DefaultAdapter.Adapter, DeviceType.Hardware, Handle, flags, _PresentParameters);
+            try
-
-            if (_Device.Disposed || _D3D.Disposed || _Device == null || _D3D == null)
             {
-                MessageBox.Show("Something went wrong with device creating, please check if your DirectX redistributables and grafic card drivers are up to date. You can download the DirectX runtimes at http://www.microsoft.com/download/en/details.aspx?id=8109");
+                _Device = new Device(_D3D, _D3D.Adapters.DefaultAdapter.Adapter, DeviceType.Hardware, Handle, flags, _PresentParameters);
-                CLog.LogError("Something went wrong with device creating, please check if your DirectX redistributables and grafic card drivers are up to date. You can download the DirectX runtimes at http://www.microsoft.com/download/en/details.aspx?id=8109");
+                _Device.Dispose();
+            }
+            catch (Exception e)
+            {
+                MessageBox.Show("Something went wrong during device creating, please check if your DirectX redistributables and grafic card drivers are up to date. You can download the DirectX runtimes at http://www.microsoft.com/download/en/details.aspx?id=8109", "Vocaluxe", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                CLog.LogError(e.Message + " - Something went wrong during device creating, please check if your DirectX redistributables and grafic card drivers are up to date. You can download the DirectX runtimes at http://www.microsoft.com/download/en/details.aspx?id=8109");
                 Environment.Exit(Environment.ExitCode);
             }
+            finally
+            {
+                if (_Device == null || _Device.Disposed)
+                {
+                    MessageBox.Show("Something went wrong during device creating, please check if your DirectX redistributables and grafic card drivers are up to date. You can download the DirectX runtimes at http://www.microsoft.com/download/en/details.aspx?id=8109", "Vocaluxe", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    CLog.LogError("Something went wrong during device creating, please check if your DirectX redistributables and grafic card drivers are up to date. You can download the DirectX runtimes at http://www.microsoft.com/download/en/details.aspx?id=8109");
+                    Environment.Exit(Environment.ExitCode);
+                }
+            }
 
             this.CenterToScreen();
         }

Vocaluxe/Lib/Video/CVideoDecoderFFmpeg.cs

@@ -394,14 +394,12 @@ namespace Vocaluxe.Lib.Video
 
         #region Threading
         private void DoSkip()
-        {
+        {            
-            string extension = Path.GetExtension(_FileName); //just a workaround for the mkv-search-bug in ffmpeg
-            
             _VideoSkipTime = _Gap;
             _SkipTime = _Start + _Gap;
             _BeforeLoop = false;           
 
-            if (_SkipTime > 0 && extension != ".mkv")
+            if (_SkipTime > 0)
             {
                 _VideoDecoderTime = _SkipTime;
                 try
@@ -419,8 +417,7 @@ namespace Vocaluxe.Lib.Video
                 _VideoDecoderTime = 0f;
                 try 
 	            {
-                    if (extension != ".mkv")
+                    CAcinerella.ac_seek(_videodecoder, -1, (Int64)0);
-                        CAcinerella.ac_seek(_videodecoder, -1, (Int64)0);
 	            }
 	            catch (Exception e)
 	            {