From 6774c61365ed11ede83a7dc65b28bb5cd3b2a4af Mon Sep 17 00:00:00 2001
From: hbeham <horst@beham.biz>
Date: Wed, 25 Nov 2015 23:38:29 +0100
Subject: [PATCH] cleanup

---
 source/ChanSort.Api/Model/ChannelInfo.cs      |  4 +--
 .../ChanSort.Loader.Hisense/HisSerializer.cs  | 30 ++++---------------
 2 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/source/ChanSort.Api/Model/ChannelInfo.cs b/source/ChanSort.Api/Model/ChannelInfo.cs
index 1590768..ec7b287 100644
--- a/source/ChanSort.Api/Model/ChannelInfo.cs
+++ b/source/ChanSort.Api/Model/ChannelInfo.cs
@@ -63,11 +63,11 @@ namespace ChanSort.Api
     /// <summary>
     /// Constructor for exiting TV channel
     /// </summary>
-    public ChannelInfo(SignalSource source, int index, int oldProgNr, string name) : this()
+    public ChannelInfo(SignalSource source, long index, int oldProgNr, string name) : this()
     {
       this.SignalSource = source;
       this.RecordIndex = index;
-      this.RecordOrder = index;
+      this.RecordOrder = (int)index;
       this.NewProgramNr = -1;
       this.OldProgramNr = oldProgNr;
       this.Name = name;
diff --git a/source/ChanSort.Loader.Hisense/HisSerializer.cs b/source/ChanSort.Loader.Hisense/HisSerializer.cs
index 97a8484..8976e98 100644
--- a/source/ChanSort.Loader.Hisense/HisSerializer.cs
+++ b/source/ChanSort.Loader.Hisense/HisSerializer.cs
@@ -214,7 +214,7 @@ namespace ChanSort.Loader.Hisense
       {
         while (r.Read())
         {
-          var id = r.GetInt32(0) | (tableNr << 16);
+          var id = ((long)tableNr << 32) | (uint)r.GetInt32(0);
           var prNr = (int)((uint)r.GetInt32(1)) >> 18;
           var trans = this.DataRoot.Transponder.TryGet(r.GetInt32(2));
           var stype = (ServiceType) r.GetInt32(3);
@@ -280,27 +280,6 @@ namespace ChanSort.Loader.Hisense
 
     #endregion
 
-#if false
-
-    #region ReadDvbData()
-    private void ReadDvbData(ChannelInfo ci)
-    {
-      var mask = dvbMapping.GetDword("LinkageMask");
-      var tsFlag = dvbMapping.Settings.GetInt("LinkageMask_Ts");
-
-      if ((mask & tsFlag) != 0)
-      {
-        ci.OriginalNetworkId = dvbMapping.GetWord("Onid");
-        ci.TransportStreamId = dvbMapping.GetWord("Tsid");
-        ci.ServiceId = dvbMapping.GetWord("Ssid");
-      }
-      //ci.Encrypted = dvbMapping.GetByte("Encrypted") != 0;
-
-    }
-    #endregion
-
-#endif
-
     // Saving ====================================
 
     #region Save()
@@ -336,8 +315,9 @@ namespace ChanSort.Loader.Hisense
     #region UpdateChannel()
     private void UpdateChannel(SQLiteCommand cmd, ChannelInfo ci)
     {
-      int x = (int)ci.RecordIndex >> 16;
-      int id = (int)ci.RecordIndex & 0xFFFF;
+      int x = (int)((ulong)ci.RecordIndex >> 32);   // the table number is kept in the higher 32 bits
+      int id = (int)(ci.RecordIndex & 0xFFFFFFFF);  // the record id is kept in the lower 32 bits
+
       if (ci.NewProgramNr != ci.OldProgramNr)
       {
         if (ci.NewProgramNr >= 0)
@@ -384,7 +364,7 @@ namespace ChanSort.Loader.Hisense
       cmd.Parameters.Add("@resetFlags", DbType.Int32);
       cmd.Parameters.Add("@setFlags", DbType.Int32);
       cmd.Parameters["@id"].Value = id;
-      cmd.Parameters["@resetFlags"].Value = ~(int) resetFlags;
+      cmd.Parameters["@resetFlags"].Value = ~(int)resetFlags;
       cmd.Parameters["@setFlags"].Value = (int)setFlags;
       cmd.ExecuteNonQuery();
     }