From ebd16304b1cd8b6133aaadd873d10d4533a23fd6 Mon Sep 17 00:00:00 2001 From: Alexander Eckart Date: Sun, 26 Feb 2012 18:32:58 +0100 Subject: [PATCH] some changes in acinerella class --- Vocaluxe/Lib/Video/Acinerella/CAcinerella.cs | 15 --------------- Vocaluxe/Lib/Video/CVideoDecoderFFmpeg.cs | 5 +---- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/Vocaluxe/Lib/Video/Acinerella/CAcinerella.cs b/Vocaluxe/Lib/Video/Acinerella/CAcinerella.cs index 6221f6dd..2b7b1ac3 100644 --- a/Vocaluxe/Lib/Video/Acinerella/CAcinerella.cs +++ b/Vocaluxe/Lib/Video/Acinerella/CAcinerella.cs @@ -38,22 +38,7 @@ namespace Vocaluxe.Lib.Video.Acinerella [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] public struct TAc_file_info { - [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 512)] - public string title; - [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 512)] - public string author; - [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 512)] - public string copyright; - [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 512)] - public string comment; - [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 512)] - public string album; - public Int32 year; - public Int32 track; - [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 32)] - public string genre; public Int64 duration; - public Int32 bitrate; } // TAc_instance represents an Acinerella instance. Each instance can open and diff --git a/Vocaluxe/Lib/Video/CVideoDecoderFFmpeg.cs b/Vocaluxe/Lib/Video/CVideoDecoderFFmpeg.cs index 3dac356e..e6031786 100644 --- a/Vocaluxe/Lib/Video/CVideoDecoderFFmpeg.cs +++ b/Vocaluxe/Lib/Video/CVideoDecoderFFmpeg.cs @@ -580,7 +580,6 @@ namespace Vocaluxe.Lib.Video return; int FrameFinished = 0; - bool error = false; if (DropFrame && !_BeforeLoop) { try @@ -604,7 +603,6 @@ namespace Vocaluxe.Lib.Video } catch (Exception) { - error = true; CLog.LogError("Error AcGetFrame " + _FileName); } @@ -649,8 +647,7 @@ namespace Vocaluxe.Lib.Video } else { - if (!error) // just a quick and dirty workaround for the mkv seek bug in ffmpeg - _NoMoreFrames = true; + _NoMoreFrames = true; } return; }