Nemcio/ChanSort
1
0
Fork 0
mirror of https://github.com/PredatH0r/ChanSort.git synced 2026-05-07 23:17:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

- fixed "delete channels", which were added at the end regardless of the user selection

Browse Source 
- changed logic how channel lists can control which columns are visible in the UI
- added column for PcrPid
- removed column AudioPid from SCM lists
- added handling for SCM lists where the value of the "hidden" flag is 255. (Guessing the hidden-status based on another field)
This commit is contained in:
hbeham
2019-02-10 15:56:03 +01:00
parent 3c7ef35e80
commit e4c51d12fa
12 changed files with 276 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/ChanSort.Loader.Samsung/ChanSort.Loader.Samsung.ini
View File

@@ -175,7 +175,7 @@
offEncrypted = 24
maskEncrypted = 0x01
offHidden = 25
maskHidden = 0x01
offHiddenAlt = 26
offSymbolRate = 28
offLock = 31
maskLock = 0x01
@@ -214,7 +214,7 @@
offEncrypted = 24
maskEncrypted = 0x01
offHidden = 25
maskHidden = 0x01
offHiddenAlt = 26
offSymbolRate = 28
offLock = 31
maskLock = 0x01

13
source/ChanSort.Loader.Samsung/ScmChannelBase.cs
View File

@@ -23,7 +23,9 @@ namespace ChanSort.Loader.Samsung
// DVB
private const string _Skip = "Skip";
private const string _Hidden = "Hidden";
private const string _HiddenAlt = "HiddenAlt";
private const string _ServiceId = "offServiceId";
private const string _PcrPid = "offPcrPid";
private const string _VideoPid = "offVideoPid";
private const string _AudioPid = "offAudioPid";
private const string _OriginalNetworkId = "offOriginalNetworkId";
@@ -61,12 +63,17 @@ namespace ChanSort.Loader.Samsung
this.Name = data.GetString(_Name, data.Settings.GetInt("lenName"));
this.Favorites = this.ParseRawFavorites();
this.Lock = data.GetFlag(_Lock);
this.Hidden = data.GetFlag(_Hidden);
int hiddenPrimary = data.GetByte(_Hidden);
if (hiddenPrimary == 255)
this.Hidden = data.GetByte(_HiddenAlt) != 0;
else
this.Hidden = hiddenPrimary != 0;
this.Skip = data.GetFlag(_Skip);
this.Encrypted = data.GetFlag(_Encrypted);
this.IsDeleted = data.GetFlag(_Deleted, false) || !data.GetFlag(_IsActive, true);
if (this.IsDeleted)
this.OldProgramNr = -1;
this.AddDebug(data.Data, data.BaseOffset + 25, 3);
}
#endregion
@@ -103,7 +110,7 @@ namespace ChanSort.Loader.Samsung
{
this.ShortName = data.GetString(_ShortName, data.Settings.GetInt("lenShortName"));
this.ServiceId = data.GetWord(_ServiceId);
//this.PcrPid = data.GetWord(_PcrPid);
this.PcrPid = data.GetWord(_PcrPid);
this.VideoPid = data.GetWord(_VideoPid);
this.AudioPid = data.GetWord(_AudioPid);
this.OriginalNetworkId = data.GetWord(_OriginalNetworkId);
@@ -149,7 +156,7 @@ namespace ChanSort.Loader.Samsung
mapping.SetFlag(_Deleted, this.NewProgramNr < 0);
mapping.SetFlag(_IsActive, this.NewProgramNr >= 0);
mapping.SetFlag(_Skip, this.Skip);
mapping.SetFlag(_Hidden, this.Hidden);
mapping.SetByte(this.mapping.GetByte(_Hidden) != 255 ? _Hidden : _HiddenAlt, this.Hidden ? 1 : 0);
if (this.Encrypted != null)
mapping.SetFlag(_Encrypted, this.Encrypted.Value);
this.UpdateChecksum();

6
source/ChanSort.Loader.Samsung/ScmSerializer.cs
View File

@@ -136,6 +136,12 @@ namespace ChanSort.Loader.Samsung
ReadDvbsChannels(zip, "map-CyfraPlusD", this.cyfraPlusChannels, out this.cyfraPlusFileContent, c.cyfraPlusChannelSize);
ReadAstraHdPlusChannels(zip);
}
foreach (var list in this.DataRoot.ChannelLists)
{
list.VisibleColumnFieldNames.Add("PcrPid");
list.VisibleColumnFieldNames.Remove("AudioPid");
}
}
#endregion