- renamed loaders

- added experimental support for Panasonic
- fixed Encrypted-flag detection for Samsung Analog and DVB-C/T channels
- text editors now only open after holding the mouse button for 0.5sec
- new menu item/button for deleting channels from the right list
This commit is contained in:
hbeham
2013-04-21 22:04:06 +02:00
parent bcbae783d4
commit d6570d18f3
56 changed files with 1144 additions and 1453 deletions

View File

@@ -1,6 +1,6 @@
using ChanSort.Api;
namespace ChanSort.Loader.ScmFile
namespace ChanSort.Loader.Samsung
{
internal class AnalogChannel : ScmChannelBase
{

View File

@@ -8,11 +8,12 @@
<ProjectGuid>{A1C9A98D-368A-44E8-9B7F-7EACA46C9EC5}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ChanSort.Loader.ScmFile</RootNamespace>
<AssemblyName>ChanSort.Loader.ScmFile</AssemblyName>
<RootNamespace>ChanSort.Loader.Samsung</RootNamespace>
<AssemblyName>ChanSort.Loader.Samsung</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -84,7 +85,7 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="ChanSort.Loader.ScmFile.ini">
<None Include="ChanSort.Loader.Samsung.ini">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>

View File

@@ -132,7 +132,7 @@
offQam = 7
offServiceType = 9
offEncrypted = 23
maskEncrypted = 0xff
maskEncrypted = 0x01
offSymbolRate = 32
offLock = 244
maskLock = 0x01
@@ -162,7 +162,7 @@
offHRes = 20
offVRes = 22
offEncrypted = 24
maskEncrypted = 0xff
maskEncrypted = 0x01
offFrameRate = 25
offSymbolRate = 28
offLock = 31
@@ -197,7 +197,7 @@
offHRes = 20
offVRes = 22
offEncrypted = 24
maskEncrypted = 0xff
maskEncrypted = 0x01
offFrameRate = 25
offSymbolRate = 28
offLock = 31

View File

@@ -1,7 +1,7 @@
using System.Collections.Generic;
using ChanSort.Api;
namespace ChanSort.Loader.ScmFile
namespace ChanSort.Loader.Samsung
{
public class DigitalChannel : ScmChannelBase
{

View File

@@ -1,6 +1,6 @@
using ChanSort.Api;
namespace ChanSort.Loader.ScmFile
namespace ChanSort.Loader.Samsung
{
internal class ModelConstants
{

View File

@@ -2,14 +2,16 @@
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
[assembly:InternalsVisibleTo("Test.Loader")]
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("ChanSort.Loader.ScmFile")]
[assembly: AssemblyTitle("ChanSort.Loader.Samsung")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("ChanSort.Loader.ScmFile")]
[assembly: AssemblyProduct("ChanSort.Loader.Samsung")]
[assembly: AssemblyCopyright("Copyright © 2012")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

View File

@@ -1,6 +1,6 @@
using ChanSort.Api;
namespace ChanSort.Loader.ScmFile
namespace ChanSort.Loader.Samsung
{
class SatChannel : ScmChannelBase
{

View File

@@ -1,7 +1,7 @@
using System;
using System.Text;
namespace ChanSort.Loader.ScmFile
namespace ChanSort.Loader.Samsung
{
internal class SatelliteMapping
{

View File

@@ -2,7 +2,7 @@
using System.Text;
using ChanSort.Api;
namespace ChanSort.Loader.ScmFile
namespace ChanSort.Loader.Samsung
{
public class ScmChannelBase : ChannelInfo
{

View File

@@ -6,7 +6,7 @@ using System.Windows.Forms;
using ChanSort.Api;
using ICSharpCode.SharpZipLib.Zip;
namespace ChanSort.Loader.ScmFile
namespace ChanSort.Loader.Samsung
{
class ScmSerializer : SerializerBase
{
@@ -180,10 +180,10 @@ namespace ChanSort.Loader.ScmFile
validCandidates = newValidCandidats;
}
if (validCandidates.Length != 1)
if (validCandidates.Length == 0)
return false;
this.modelConstants.TryGetValue("Series:" + validCandidates, out this.c);
this.modelConstants.TryGetValue("Series:" + validCandidates[0], out this.c);
return true;
}
@@ -365,7 +365,7 @@ namespace ChanSort.Loader.ScmFile
for (int slotIndex = 0; slotIndex < count; slotIndex++)
{
DigitalChannel ci = new DigitalChannel(slotIndex, isCable, rawChannel, frequency, c.favoriteNotSetValue);
if (ci.OldProgramNr != -1)
if (ci.OldProgramNr > 0)
this.DataRoot.AddChannel(list, ci);
rawChannel.BaseOffset += entrySize;

View File

@@ -1,6 +1,6 @@
using ChanSort.Api;
namespace ChanSort.Loader.ScmFile
namespace ChanSort.Loader.Samsung
{
public class ScmSerializerPlugin : ISerializerPlugin
{