From 78cb7a18b48f3518419855ce77474ad801764230 Mon Sep 17 00:00:00 2001 From: epbk Date: Thu, 18 Jul 2024 15:37:14 +0200 Subject: [PATCH 1/8] MP1-5221: Core: FrameGrabber: Fix frame grabbing (for EVR) --- mediaportal/Core/Player/FrameGrabber.cs | 10 +++++----- mediaportal/Core/Player/PlaneScene.cs | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mediaportal/Core/Player/FrameGrabber.cs b/mediaportal/Core/Player/FrameGrabber.cs index 4a5e25294d2..5fde79bdfc1 100644 --- a/mediaportal/Core/Player/FrameGrabber.cs +++ b/mediaportal/Core/Player/FrameGrabber.cs @@ -62,7 +62,7 @@ private FrameGrabber() } // MP1-4248 : Start* Line Code for Ambilight System Capture (Atmolight) - public delegate void NewFrameHandler(Int16 width, Int16 height, Int16 arWidth, Int16 arHeight, Surface pSurface, FrameSource FrameSource); + public delegate void NewFrameHandler(Int16 width, Int16 height, Int16 arWidth, Int16 arHeight, IntPtr pSurface, FrameSource FrameSource); public event NewFrameHandler OnNewFrame; // MP1-4248 : End* Ambilight Capture @@ -315,7 +315,7 @@ public void OnFrameGUI(Surface surface) { unsafe { - OnFrame((Int16)surface.Description.Width, (Int16)surface.Description.Height, 0, 0, surface, FrameSource.GUI); + OnFrame((Int16)surface.Description.Width, (Int16)surface.Description.Height, 0, 0, (IntPtr)surface, FrameSource.GUI); } } } @@ -328,7 +328,7 @@ public void OnFrameGUI(Surface surface) /// /// /// - public void OnFrame(Int16 width, Int16 height, Int16 arWidth, Int16 arHeight, IntPtr pTargetmadVrDib, FrameSource FrameSource) + public void OnFrameMadVrDib(Int16 width, Int16 height, Int16 arWidth, Int16 arHeight, IntPtr pTargetmadVrDib, FrameSource FrameSource) { FrameGrabberD3D9Enable = false; //Dont pass GUI frames to GetCurrentImage() -> VideoModeSwitcher is using it @@ -408,7 +408,7 @@ public void OnFrame(Int16 width, Int16 height, Int16 arWidth, Int16 arHeight, In /// /// /// - public void OnFrame(Int16 width, Int16 height, Int16 arWidth, Int16 arHeight, Surface pSurface, FrameSource FrameSource) + public void OnFrame(Int16 width, Int16 height, Int16 arWidth, Int16 arHeight, IntPtr pSurface, FrameSource FrameSource) { FrameGrabberD3D9Enable = true; // MP1-4248 :Start* Line Code for Ambilight System Capture (Atmolight) @@ -471,7 +471,7 @@ public void OnFrame(Int16 width, Int16 height, Int16 arWidth, Int16 arHeight, Su // Log.Debug("Calling VideoSurfaceToRGBSurface"); if (rgbSurface != null) { - VideoSurfaceToRGBSurface((IntPtr)pSurface, (IntPtr)rgbSurface); + VideoSurfaceToRGBSurface(pSurface, (IntPtr)rgbSurface); } lock (grabNotifier) { diff --git a/mediaportal/Core/Player/PlaneScene.cs b/mediaportal/Core/Player/PlaneScene.cs index 011826a15da..a5c9f3ed844 100644 --- a/mediaportal/Core/Player/PlaneScene.cs +++ b/mediaportal/Core/Player/PlaneScene.cs @@ -786,7 +786,7 @@ public void RenderFrame(Int16 width, Int16 height, Int16 arWidth, Int16 arHeight lock (GUIGraphicsContext.RenderModeSwitch) { if (grabber != null) - grabber.OnFrame((short)client.Width, (short)client.Height, (short)client.Width, (short)client.Height, surfaceMadVr, + grabber.OnFrame((short)client.Width, (short)client.Height, (short)client.Width, (short)client.Height, (IntPtr)surfaceMadVr, FrameGrabber.FrameSource.Video); } } From 8a5dbf5cfe9e5aac02a669e05fb31f7f85c580c0 Mon Sep 17 00:00:00 2001 From: epbk Date: Fri, 19 Jul 2024 13:44:50 +0200 Subject: [PATCH 2/8] MP1-5222: TV Server: Fix ISO-8859-10/14 DVB text encodings --- TvEngine3/TVLibrary/TvLibrary.Interfaces/DvbTextConverter.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/TvEngine3/TVLibrary/TvLibrary.Interfaces/DvbTextConverter.cs b/TvEngine3/TVLibrary/TvLibrary.Interfaces/DvbTextConverter.cs index 2c4fac575d9..8fa0b561836 100644 --- a/TvEngine3/TVLibrary/TvLibrary.Interfaces/DvbTextConverter.cs +++ b/TvEngine3/TVLibrary/TvLibrary.Interfaces/DvbTextConverter.cs @@ -126,9 +126,9 @@ public static string Convert(IntPtr ptr, string lang) string result; if (encoding == 20269) result = ISOTextDecoder.from_ISO_6937_EU(text); - else if (encoding == 20600) + else if (encoding == 28600) result = ISOTextDecoder.from_ISO_8859_10(text); - else if (encoding == 20604) + else if (encoding == 28604) result = ISOTextDecoder.from_ISO_8859_14(text); else result = System.Text.Encoding.GetEncoding(encoding).GetString(text); From d92ecf808bda9d85830f300514999e712f302c56 Mon Sep 17 00:00:00 2001 From: epbk Date: Mon, 29 Jul 2024 15:10:56 +0200 Subject: [PATCH 3/8] MP1-5223: Core: RefreshRateChanger: Round down detected FPS prior adapter output selection --- mediaportal/Core/Player/RefreshRateChanger.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mediaportal/Core/Player/RefreshRateChanger.cs b/mediaportal/Core/Player/RefreshRateChanger.cs index 51de2545565..b7b790e3c0a 100644 --- a/mediaportal/Core/Player/RefreshRateChanger.cs +++ b/mediaportal/Core/Player/RefreshRateChanger.cs @@ -651,6 +651,9 @@ private static void FindExtCmdfromSettings(double fps, out double newRR, newExtCmd = ""; newRRDescription = ""; + //Round fps down to 3 decimal places + fps = Math.Round(fps, 3); + foreach (RefreshRateSetting setting in _refreshRateSettings) { foreach (double fpsSetting in setting.Fps) From fb792c18e2ca6eab7b2e093caad448f7178cfc6f Mon Sep 17 00:00:00 2001 From: epbk Date: Mon, 29 Jul 2024 15:16:38 +0200 Subject: [PATCH 4/8] MP1-5223: Core: RefreshRateChanger: Improve FPS detection form VideoDecoder(VIDEOINFOHEADER2)(interlaced videos) --- mediaportal/Core/Player/RefreshRateChanger.cs | 59 +++++++++++++++---- 1 file changed, 47 insertions(+), 12 deletions(-) diff --git a/mediaportal/Core/Player/RefreshRateChanger.cs b/mediaportal/Core/Player/RefreshRateChanger.cs index b7b790e3c0a..f705cd97b68 100644 --- a/mediaportal/Core/Player/RefreshRateChanger.cs +++ b/mediaportal/Core/Player/RefreshRateChanger.cs @@ -1092,30 +1092,65 @@ public static void AdaptRefreshRateFromVideoDecoder(string strFile) Log.Debug("[AdaptRefreshRateFromVideoDecoder] Video Decoder found."); DirectShowLib.IPin pin; - int iResult = filter.FindPin("In", out pin); + int iResult = filter.FindPin("Out", out pin); if (iResult == 0) { - Log.Debug("[AdaptRefreshRateFromVideoDecoder] Input Pin of Video Decoder retrieved."); + Log.Debug("[AdaptRefreshRateFromVideoDecoder] Output Pin of Video Decoder retrieved."); DirectShowLib.AMMediaType mediatype = new DirectShowLib.AMMediaType(); iResult = pin.ConnectionMediaType(mediatype); if (iResult == 0) { - Log.Debug("[AdaptRefreshRateFromVideoDecoder] AMMediaType: " + mediatype.formatType.ToString()); + bool bInterlaced = false; + string strGUID = mediatype.formatType.ToString(); + Log.Debug("[AdaptRefreshRateFromVideoDecoder] AMMediaType: " + strGUID); - DirectShowLib.VideoInfoHeader videoHeader = new DirectShowLib.VideoInfoHeader(); - Marshal.PtrToStructure(mediatype.formatPtr, videoHeader); - - if (videoHeader != null) + if (strGUID.Equals("F72A76A0-EB0A-11D0-ACE4-0000C0CC16BA", StringComparison.OrdinalIgnoreCase) //VIDEOINFOHEADER2 + || strGUID.Equals("E06D80E3-DB46-11CF-B4D1-00805F6CBBEA", StringComparison.OrdinalIgnoreCase)) //WMFORMAT_MPEG2Video + { + DirectShowLib.VideoInfoHeader2 videoHeader = new DirectShowLib.VideoInfoHeader2(); + Marshal.PtrToStructure(mediatype.formatPtr, videoHeader); + if (videoHeader != null) + { + bInterlaced = (videoHeader.InterlaceFlags & DirectShowLib.AMInterlace.IsInterlaced) == DirectShowLib.AMInterlace.IsInterlaced; + dFps = Math.Round(10000000F / videoHeader.AvgTimePerFrame, 2); + Log.Debug("[AdaptRefreshRateFromVideoDecoder] AvgTimePerFrame from VideoInfoHeader2: {0}, Interlaced: {1}", + videoHeader.AvgTimePerFrame, bInterlaced); + } + } + else { - Log.Debug("[AdaptRefreshRateFromVideoDecoder] AvgTimePerFrame from VideoInfoHeader: " + videoHeader.AvgTimePerFrame); + DirectShowLib.VideoInfoHeader videoHeader = new DirectShowLib.VideoInfoHeader(); + Marshal.PtrToStructure(mediatype.formatPtr, videoHeader); + + if (videoHeader != null) + { + Log.Debug("[AdaptRefreshRateFromVideoDecoder] AvgTimePerFrame from VideoInfoHeader: " + videoHeader.AvgTimePerFrame); + dFps = Math.Round(10000000F / videoHeader.AvgTimePerFrame, 2); + } + } - dFps = Math.Round(10000000F / videoHeader.AvgTimePerFrame, 2); + if (dFps == 23.98) + dFps = 23.976; - if (dFps == 23.98) - dFps = 23.976; + Log.Info("[AdaptRefreshRateFromVideoDecoder] Detected FPS from Video Decoder: " + dFps); - Log.Info("[AdaptRefreshRateFromVideoDecoder] Detected FPS from Video Decoder: " + dFps); + if (bInterlaced) + { + switch (dFps) + { + case 25: + dFps = 50.0; + break; + + case 29.97: + dFps = 59.97; + break; + + case 30: + dFps = 60.0; + break; + } } } else From 02ef5a761e1e7bfe7db326433892a02a14fe92cb Mon Sep 17 00:00:00 2001 From: epbk Date: Tue, 30 Jul 2024 21:02:24 +0200 Subject: [PATCH 5/8] MP1-5224: TvServer: TvLibrary: Fix CancelTune request (remains permanently set) --- .../DVB/Graphs/TvCardDvbBase.cs | 54 ++++++++++--------- 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/TvEngine3/TVLibrary/TVLibrary/Implementations/DVB/Graphs/TvCardDvbBase.cs b/TvEngine3/TVLibrary/TVLibrary/Implementations/DVB/Graphs/TvCardDvbBase.cs index a7b7fa33aca..d5c77f65991 100644 --- a/TvEngine3/TVLibrary/TVLibrary/Implementations/DVB/Graphs/TvCardDvbBase.cs +++ b/TvEngine3/TVLibrary/TVLibrary/Implementations/DVB/Graphs/TvCardDvbBase.cs @@ -319,41 +319,44 @@ public virtual ITvSubChannel Tune(int subChannelId, IChannel channel) } private ITvSubChannel DoTune(int subChannelId, IChannel channel, bool ignorePMT) - { - bool performTune = (_previousChannel == null || _previousChannel.IsDifferentTransponder(channel)); - ITvSubChannel ch = SubmitTuneRequest(subChannelId, channel, _tuneRequest, performTune); - _previousChannel = channel; - + { try { - if (ch != null) + bool performTune = (_previousChannel == null || _previousChannel.IsDifferentTransponder(channel)); + ITvSubChannel ch = SubmitTuneRequest(subChannelId, channel, _tuneRequest, performTune); + _previousChannel = channel; + + try { - try + if (ch != null) { - RunGraph(ch.SubChannelId); - } - catch (TvExceptionNoPMT) - { - if (!ignorePMT) + try + { + RunGraph(ch.SubChannelId); + } + catch (TvExceptionNoPMT) { - throw; + if (!ignorePMT) + { + throw; + } } + OnAfterTune(channel); + return ch; + } + else + { + throw new TvException("TvCardDvbBase.Tune: Subchannel was null"); } - OnAfterTune(channel); - return ch; - } - else - { - throw new TvException("TvCardDvbBase.Tune: Subchannel was null"); } - } - catch (Exception) - { - if (ch != null) + catch (Exception) { - FreeSubChannel(ch.SubChannelId); + if (ch != null) + { + FreeSubChannel(ch.SubChannelId); + } + throw; } - throw; } finally { @@ -953,6 +956,7 @@ public override void StopGraph() _epgGrabbing = false; _isScanning = false; FreeAllSubChannels(); + _cancelTune = false; if (_mdplugs != null) { _mdplugs.FreeAllChannels(); From 07ba889f588a05d2c4e58b0ae397a0595c7af9f8 Mon Sep 17 00:00:00 2001 From: "Andrew J.Swan" Date: Sat, 31 Aug 2024 19:01:44 +0300 Subject: [PATCH 6/8] MP1.35.Pre: Bump version number and set INFO level to DEBUG --- Common-MP-TVE3/SolutionInfo.cs | 4 ++-- .../include/MediaPortalCurrentVersion.nsh | 2 +- Tools/MediaPortal.DeployTool/Utils.cs | 8 ++++---- .../TVLibrary/TVDatabase/TvBusinessLayer/BusinessLayer.cs | 2 +- appveyor.yml | 2 +- mediaportal/Configuration/App.config | 2 +- mediaportal/Configuration/Sections/General.cs | 2 +- mediaportal/MediaPortal.Application/App.config | 2 +- mediaportal/Utils/ServiceImplementations/LogImpl.cs | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Common-MP-TVE3/SolutionInfo.cs b/Common-MP-TVE3/SolutionInfo.cs index c339170afe9..cc3642e18b0 100644 --- a/Common-MP-TVE3/SolutionInfo.cs +++ b/Common-MP-TVE3/SolutionInfo.cs @@ -50,8 +50,8 @@ // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.34.000.0")] -[assembly: AssemblyFileVersion("1.34.000.0")] +[assembly: AssemblyVersion("1.34.100.0")] +[assembly: AssemblyFileVersion("1.34.100.0")] //[assembly: AssemblyInformationalVersion("")] //[assembly: CompatibleVersion("1.1.8.*", "1.1.8.*")] diff --git a/Tools/InstallationScripts/include/MediaPortalCurrentVersion.nsh b/Tools/InstallationScripts/include/MediaPortalCurrentVersion.nsh index 978c47f31b3..6430b9b2cb7 100644 --- a/Tools/InstallationScripts/include/MediaPortalCurrentVersion.nsh +++ b/Tools/InstallationScripts/include/MediaPortalCurrentVersion.nsh @@ -32,7 +32,7 @@ !define VER_MAJOR 1 !define VER_MINOR 34 -!define VER_REVISION 000 +!define VER_REVISION 100 #**********************************************************************************************************# diff --git a/Tools/MediaPortal.DeployTool/Utils.cs b/Tools/MediaPortal.DeployTool/Utils.cs index 2b0ac3d3576..004ca6e8882 100644 --- a/Tools/MediaPortal.DeployTool/Utils.cs +++ b/Tools/MediaPortal.DeployTool/Utils.cs @@ -781,8 +781,8 @@ public static Version GetPackageVersion(string type) break; case "max": major = 1; - minor = 33; - revision = 100; + minor = 34; + revision = 000; break; } Version ver = new Version(major, minor, revision); @@ -803,7 +803,7 @@ public static Version GetCurrentPackageVersion() { int major = 1; int minor = 34; - int revision = 000; + int revision = 100; Version ver = new Version(major, minor, revision); return ver; @@ -853,7 +853,7 @@ public static Version VersionFromRegistry(string regkey) public static string GetDisplayVersion() { - return "1.34 Dune"; + return "1.34 Pre Release"; } /// diff --git a/TvEngine3/TVLibrary/TVDatabase/TvBusinessLayer/BusinessLayer.cs b/TvEngine3/TVLibrary/TVDatabase/TvBusinessLayer/BusinessLayer.cs index 78446e4b25f..d3b28c8b6ca 100644 --- a/TvEngine3/TVLibrary/TVDatabase/TvBusinessLayer/BusinessLayer.cs +++ b/TvEngine3/TVLibrary/TVDatabase/TvBusinessLayer/BusinessLayer.cs @@ -3399,7 +3399,7 @@ public bool IsChannelMappedToCard(Channel dbChannel, Card card, bool forEpg) /// public void SetLogLevel() { - var logLevel = (LogLevel)int.Parse(GetSetting("loglevel", "4").Value); // debug is "5", info is "4" + var logLevel = (LogLevel)int.Parse(GetSetting("loglevel", "5").Value); // debug is "5", info is "4" Log.SetLogLevel(logLevel); } } diff --git a/appveyor.yml b/appveyor.yml index 0cf11c9fa99..2e0a00527bc 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 1.34.Final.{build} +version: 1.35.Pre.Release.{build} image: Visual Studio 2019 clone_folder: c:\project\mediaportal environment: diff --git a/mediaportal/Configuration/App.config b/mediaportal/Configuration/App.config index 07a008f7c7f..0c36db370d7 100644 --- a/mediaportal/Configuration/App.config +++ b/mediaportal/Configuration/App.config @@ -23,7 +23,7 @@ - + diff --git a/mediaportal/Configuration/Sections/General.cs b/mediaportal/Configuration/Sections/General.cs index 3e7cd46f010..dfc40d308b8 100644 --- a/mediaportal/Configuration/Sections/General.cs +++ b/mediaportal/Configuration/Sections/General.cs @@ -42,7 +42,7 @@ public General(string name) InitializeComponent(); } - private string loglevel = "2"; // 1= error, 2 = info, 3 = debug + private string loglevel = "3"; // 1= error, 2 = info, 3 = debug /// /// Erforderliche Designervariable. diff --git a/mediaportal/MediaPortal.Application/App.config b/mediaportal/MediaPortal.Application/App.config index 2f5bc508c76..d7cd14dc0ac 100644 --- a/mediaportal/MediaPortal.Application/App.config +++ b/mediaportal/MediaPortal.Application/App.config @@ -35,7 +35,7 @@ - + diff --git a/mediaportal/Utils/ServiceImplementations/LogImpl.cs b/mediaportal/Utils/ServiceImplementations/LogImpl.cs index 173d661410c..61c6a95548a 100644 --- a/mediaportal/Utils/ServiceImplementations/LogImpl.cs +++ b/mediaportal/Utils/ServiceImplementations/LogImpl.cs @@ -63,7 +63,7 @@ public LogImpl() //BackupLogFiles(); using (Settings xmlreader = new MPSettings()) { - _minLevel = (Level)Enum.Parse(typeof (Level), xmlreader.GetValueAsString("general", "loglevel", "2")); // set loglevel to 2:info 3:debug + _minLevel = (Level)Enum.Parse(typeof (Level), xmlreader.GetValueAsString("general", "loglevel", "3")); // set loglevel to 2:info 3:debug } bConfiguration = false; } From ce78b0a237806416f68e63b052294b13d059441e Mon Sep 17 00:00:00 2001 From: "Andrew J.Swan" Date: Sun, 1 Sep 2024 00:35:44 +0300 Subject: [PATCH 7/8] MP1.35.Pre: DWHD Update Co-authored-by: catavolt --- .../skin/DefaultWideHD/BasicHome.xml | 42 +++++++++++++++++-- 1 file changed, 38 insertions(+), 4 deletions(-) diff --git a/mediaportal/MediaPortal.Base/skin/DefaultWideHD/BasicHome.xml b/mediaportal/MediaPortal.Base/skin/DefaultWideHD/BasicHome.xml index 79830e85637..dba1457349f 100644 --- a/mediaportal/MediaPortal.Base/skin/DefaultWideHD/BasicHome.xml +++ b/mediaportal/MediaPortal.Base/skin/DefaultWideHD/BasicHome.xml @@ -44,7 +44,7 @@ left 1800 58 - !skin.hastheme(Xmas) + !skin.hastheme(Xmas)+[plugin.isenabled(World Weather)|plugin.isenabled(World Weather Lite)] fadelabel Date Time Weather Label @@ -93,7 +93,7 @@ left 1800 58 - skin.hastheme(Xmas) + skin.hastheme(Xmas)+[plugin.isenabled(World Weather)|plugin.isenabled(World Weather Lite)] fadelabel Date Time Weather Label @@ -103,8 +103,8 @@ 1600 gold 10 - 2 - ff000000 + 2 + ff000000 left Label @@ -132,6 +132,40 @@ Label + + Date + label + 0 + 45 + 15 + 1800 + 58 + + Label + left + ff6FAFE1 + 10 + 2 + ff000000 + !skin.hastheme(Xmas)+!plugin.isenabled(World Weather)+!plugin.isenabled(World Weather Lite) + + + Date + label + 0 + 45 + 15 + 1800 + 58 + + Label + left + gold + 10 + 2 + ff000000 + skin.hastheme(Xmas)+!plugin.isenabled(World Weather)+!plugin.isenabled(World Weather Lite) + From 093230eaeff8f90bafa0ceb40236aa020b23e3ee Mon Sep 17 00:00:00 2001 From: "Andrew J.Swan" Date: Sat, 31 Aug 2024 19:01:44 +0300 Subject: [PATCH 8/8] MP1.35.Pre: Bump version number and set INFO level to DEBUG --- Common-MP-TVE3/SolutionInfo.cs | 4 ++-- .../include/MediaPortalCurrentVersion.nsh | 2 +- Tools/MediaPortal.DeployTool/Utils.cs | 8 ++++---- .../TVLibrary/TVDatabase/TvBusinessLayer/BusinessLayer.cs | 2 +- appveyor.yml | 2 +- mediaportal/Configuration/App.config | 2 +- mediaportal/Configuration/Sections/General.cs | 2 +- mediaportal/MediaPortal.Application/App.config | 2 +- mediaportal/Utils/ServiceImplementations/LogImpl.cs | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Common-MP-TVE3/SolutionInfo.cs b/Common-MP-TVE3/SolutionInfo.cs index c339170afe9..cc3642e18b0 100644 --- a/Common-MP-TVE3/SolutionInfo.cs +++ b/Common-MP-TVE3/SolutionInfo.cs @@ -50,8 +50,8 @@ // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.34.000.0")] -[assembly: AssemblyFileVersion("1.34.000.0")] +[assembly: AssemblyVersion("1.34.100.0")] +[assembly: AssemblyFileVersion("1.34.100.0")] //[assembly: AssemblyInformationalVersion("")] //[assembly: CompatibleVersion("1.1.8.*", "1.1.8.*")] diff --git a/Tools/InstallationScripts/include/MediaPortalCurrentVersion.nsh b/Tools/InstallationScripts/include/MediaPortalCurrentVersion.nsh index 978c47f31b3..6430b9b2cb7 100644 --- a/Tools/InstallationScripts/include/MediaPortalCurrentVersion.nsh +++ b/Tools/InstallationScripts/include/MediaPortalCurrentVersion.nsh @@ -32,7 +32,7 @@ !define VER_MAJOR 1 !define VER_MINOR 34 -!define VER_REVISION 000 +!define VER_REVISION 100 #**********************************************************************************************************# diff --git a/Tools/MediaPortal.DeployTool/Utils.cs b/Tools/MediaPortal.DeployTool/Utils.cs index 2b0ac3d3576..65ffe3e2bee 100644 --- a/Tools/MediaPortal.DeployTool/Utils.cs +++ b/Tools/MediaPortal.DeployTool/Utils.cs @@ -781,8 +781,8 @@ public static Version GetPackageVersion(string type) break; case "max": major = 1; - minor = 33; - revision = 100; + minor = 34; + revision = 000; break; } Version ver = new Version(major, minor, revision); @@ -803,7 +803,7 @@ public static Version GetCurrentPackageVersion() { int major = 1; int minor = 34; - int revision = 000; + int revision = 100; Version ver = new Version(major, minor, revision); return ver; @@ -853,7 +853,7 @@ public static Version VersionFromRegistry(string regkey) public static string GetDisplayVersion() { - return "1.34 Dune"; + return "1.35 Pre Release"; } /// diff --git a/TvEngine3/TVLibrary/TVDatabase/TvBusinessLayer/BusinessLayer.cs b/TvEngine3/TVLibrary/TVDatabase/TvBusinessLayer/BusinessLayer.cs index 78446e4b25f..d3b28c8b6ca 100644 --- a/TvEngine3/TVLibrary/TVDatabase/TvBusinessLayer/BusinessLayer.cs +++ b/TvEngine3/TVLibrary/TVDatabase/TvBusinessLayer/BusinessLayer.cs @@ -3399,7 +3399,7 @@ public bool IsChannelMappedToCard(Channel dbChannel, Card card, bool forEpg) /// public void SetLogLevel() { - var logLevel = (LogLevel)int.Parse(GetSetting("loglevel", "4").Value); // debug is "5", info is "4" + var logLevel = (LogLevel)int.Parse(GetSetting("loglevel", "5").Value); // debug is "5", info is "4" Log.SetLogLevel(logLevel); } } diff --git a/appveyor.yml b/appveyor.yml index 0cf11c9fa99..2e0a00527bc 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 1.34.Final.{build} +version: 1.35.Pre.Release.{build} image: Visual Studio 2019 clone_folder: c:\project\mediaportal environment: diff --git a/mediaportal/Configuration/App.config b/mediaportal/Configuration/App.config index 07a008f7c7f..0c36db370d7 100644 --- a/mediaportal/Configuration/App.config +++ b/mediaportal/Configuration/App.config @@ -23,7 +23,7 @@ - + diff --git a/mediaportal/Configuration/Sections/General.cs b/mediaportal/Configuration/Sections/General.cs index 3e7cd46f010..dfc40d308b8 100644 --- a/mediaportal/Configuration/Sections/General.cs +++ b/mediaportal/Configuration/Sections/General.cs @@ -42,7 +42,7 @@ public General(string name) InitializeComponent(); } - private string loglevel = "2"; // 1= error, 2 = info, 3 = debug + private string loglevel = "3"; // 1= error, 2 = info, 3 = debug /// /// Erforderliche Designervariable. diff --git a/mediaportal/MediaPortal.Application/App.config b/mediaportal/MediaPortal.Application/App.config index 2f5bc508c76..ec30781cc8c 100644 --- a/mediaportal/MediaPortal.Application/App.config +++ b/mediaportal/MediaPortal.Application/App.config @@ -35,7 +35,7 @@ - + diff --git a/mediaportal/Utils/ServiceImplementations/LogImpl.cs b/mediaportal/Utils/ServiceImplementations/LogImpl.cs index 173d661410c..61c6a95548a 100644 --- a/mediaportal/Utils/ServiceImplementations/LogImpl.cs +++ b/mediaportal/Utils/ServiceImplementations/LogImpl.cs @@ -63,7 +63,7 @@ public LogImpl() //BackupLogFiles(); using (Settings xmlreader = new MPSettings()) { - _minLevel = (Level)Enum.Parse(typeof (Level), xmlreader.GetValueAsString("general", "loglevel", "2")); // set loglevel to 2:info 3:debug + _minLevel = (Level)Enum.Parse(typeof (Level), xmlreader.GetValueAsString("general", "loglevel", "3")); // set loglevel to 2:info 3:debug } bConfiguration = false; }