- allow Pr#0 for analog channels

- added loader for Toshiba *.db files (saving not yet implemented)
This commit is contained in:
hbeham
2013-04-10 00:35:25 +02:00
parent 16694534f0
commit 49979e3a29
23 changed files with 7926 additions and 2580 deletions

View File

@@ -88,8 +88,9 @@ namespace ChanSort.Loader.TllFile
public override void UpdateRawData()
{
mapping.SetDataPtr(this.rawData, this.baseOffset);
mapping.SetWord(_ProgramNr, this.NewProgramNr | ((this.SignalSource & SignalSource.Radio) != 0 ? 0x4000 : 0));
mapping.SetWord(_ProgramNr2, (mapping.GetWord(_ProgramNr2) & 0x0003) | (this.NewProgramNr << 2));
int progNr = this.NewProgramNr == -1 ? 0 : this.NewProgramNr;
mapping.SetWord(_ProgramNr, progNr | ((this.SignalSource & SignalSource.Radio) != 0 ? 0x4000 : 0));
mapping.SetWord(_ProgramNr2, (mapping.GetWord(_ProgramNr2) & 0x0003) | (progNr << 2));
if (this.IsNameModified)
{
mapping.SetString(_Name, this.Name, 40);
@@ -101,7 +102,7 @@ namespace ChanSort.Loader.TllFile
mapping.SetFlag(_Skip, this.Skip);
mapping.SetFlag(_Lock, this.Lock);
mapping.SetFlag(_Hide, this.Hidden);
if (this.NewProgramNr == 0)
if (this.NewProgramNr == -1)
{
mapping.SetFlag(_Deleted, true);
mapping.SetByte("off"+_Moved, 0); //skip,lock,hide,moved

View File

@@ -622,11 +622,11 @@ namespace ChanSort.Loader.TllFile
{
foreach (ChannelInfo channel in list.Channels)
{
if (channel.NewProgramNr != 0)
if (channel.NewProgramNr != -1)
{
if ((channel.SignalSource & SignalSource.Digital) == 0)
if ((channel.SignalSource & SignalSource.Analog) != 0)
++newAnalogChannelCount;
else if (channel.SignalSource != SignalSource.DvbS)
else if ((channel.SignalSource & SignalSource.DvbCT) != 0)
++newDvbctChannelCount;
}
channel.OldProgramNr = channel.NewProgramNr;