Skip to content

Commit

Permalink
removed DependencyChecker code that was used to ensure VC2010 Redist …
Browse files Browse the repository at this point in the history
…x86 is installed
  • Loading branch information
Horst Beham committed Apr 25, 2021
1 parent 8b956ed commit 5a07d36
Show file tree
Hide file tree
Showing 10 changed files with 0 additions and 54 deletions.
1 change: 0 additions & 1 deletion source/ChanSort.Api/ChanSort.Api.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="Utils\DelegateComparer.cs" />
<Compile Include="Utils\DependencyChecker.cs" />
<Compile Include="Utils\FileAssociation.cs" />
<Compile Include="Utils\Crc16.cs" />
<Compile Include="View\View.cs" />
Expand Down
21 changes: 0 additions & 21 deletions source/ChanSort.Api/Utils/DependencyChecker.cs

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,6 @@ internal enum DvbLinkageMask

public ChannelDbSerializer(string inputFile) : base(inputFile)
{
DepencencyChecker.AssertVc2010RedistPackageX86Installed();

this.Features.ChannelNameEdit = ChannelNameEditMode.All;
this.Features.DeleteMode = DeleteMode.NotSupported;
this.Features.CanSkipChannels = false;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,6 @@ public class ServicelistDbSerializer : SerializerBase

public ServicelistDbSerializer(string inputFile) : base(inputFile)
{
DepencencyChecker.AssertVc2010RedistPackageX86Installed();

Features.ChannelNameEdit = ChannelNameEditMode.All;
Features.DeleteMode = DeleteMode.FlagWithPrNr;
Features.CanSkipChannels = true;
Expand Down
2 changes: 0 additions & 2 deletions source/ChanSort.Loader.Panasonic/Serializer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ enum CypherMode
#region ctor()
public Serializer(string inputFile) : base(inputFile)
{
DepencencyChecker.AssertVc2010RedistPackageX86Installed();

this.Features.ChannelNameEdit = ChannelNameEditMode.None; // due to the chaos with binary data inside the "sname" string column, writing back a name has undesired side effects
this.Features.DeleteMode = DeleteMode.Physically;
this.Features.CanSkipChannels = true;
Expand Down
3 changes: 0 additions & 3 deletions source/ChanSort.Loader.Philips/BinarySerializer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,6 @@ public override void Load()
this.chanLstBin.Load(this.FileName, msg => this.logMessages.AppendLine(msg));
this.dataFilePaths.Add(this.FileName);

if (chanLstBin.VersionMajor >= 25 && chanLstBin.VersionMajor <= 45) // need VC2010 Redist for the SQLite library
DepencencyChecker.AssertVc2010RedistPackageX86Installed();

var dir = Path.GetDirectoryName(this.FileName) ?? "";
var channellib = Path.Combine(dir, "channellib");
var s2channellib = Path.Combine(dir, "s2channellib");
Expand Down
2 changes: 0 additions & 2 deletions source/ChanSort.Loader.Samsung/Zip/DbSerializer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ private enum FileType { Unknown, SatDb, ChannelDbDvb, ChannelDbAnalog, ChannelDb
#region ctor()
public DbSerializer(string inputFile) : base(inputFile)
{
DepencencyChecker.AssertVc2010RedistPackageX86Installed();

this.Features.ChannelNameEdit = ChannelNameEditMode.All;
this.Features.DeleteMode = DeleteMode.Physically;
this.Features.CanSkipChannels = true;
Expand Down
2 changes: 0 additions & 2 deletions source/ChanSort.Loader.Toshiba/ChmgtDbSerializer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ internal class ChmgtDbSerializer : SerializerBase

public ChmgtDbSerializer(string inputFile) : base(inputFile)
{
DepencencyChecker.AssertVc2010RedistPackageX86Installed();

Features.ChannelNameEdit = ChannelNameEditMode.All;
Features.DeleteMode = DeleteMode.Physically;
Features.CanSkipChannels = false;
Expand Down
2 changes: 0 additions & 2 deletions source/ChanSort.Loader.Toshiba/SettingsDbSerializer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ class SettingsDbSerializer : SerializerBase
#region ctor()
public SettingsDbSerializer(string inputFile) : base(inputFile)
{
DepencencyChecker.AssertVc2010RedistPackageX86Installed();

this.Features.ChannelNameEdit = ChannelNameEditMode.All;
this.Features.DeleteMode = DeleteMode.Physically;
this.Features.CanSkipChannels = false;
Expand Down
17 changes: 0 additions & 17 deletions source/ChanSort/MainForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -141,23 +141,6 @@ private bool IsLeftGridSortedByNewProgNr

private void InitAppAfterMainWindowWasShown()
{
if (!DepencencyChecker.IsVc2010RedistPackageX86Installed())
{
if (XtraMessageBox.Show(this,
"Some channel list file formats can only be read when the\n" +
"Microsoft Visual C++ 2010 Redistributable Package (x86) is installed.\n" +
"\nDo you want to open the download page and quit ChanSort?",
"ChanSort",
MessageBoxButtons.YesNo,
MessageBoxIcon.Question,
MessageBoxDefaultButton.Button1) == DialogResult.Yes)
{
System.Diagnostics.Process.Start("https://www.microsoft.com/en-us/download/details.aspx?id=5555");
Application.Exit();
return;
}
}

if (Config.Default.CheckForUpdates)
this.BeginInvoke((Action) UpdateCheck.CheckForNewVersion);
}
Expand Down

0 comments on commit 5a07d36

Please sign in to comment.