- fixed favorites for Samsung J and later series

This commit is contained in:
hbeham
2017-11-16 11:26:50 +01:00
parent f6e039a08d
commit d9a252a97b
5 changed files with 14 additions and 8 deletions

View File

@@ -1,5 +1,6 @@
using System.Collections.Generic;
using System.Text;
using System.Linq;
namespace ChanSort.Api
{

View File

@@ -6,9 +6,6 @@ namespace ChanSort.Loader.SamsungJ
{
internal class DbChannel : ChannelInfo
{
internal List<int> OriginalFavIndex = new List<int> { -1, -1, -1, -1 , -1 };
internal Favorites OriginalFavs;
#region ctor()
internal DbChannel(SQLiteDataReader r, IDictionary<string, int> field, DataRoot dataRoot, Dictionary<long, string> providers, Satellite sat, Transponder tp)
{

View File

@@ -373,8 +373,7 @@ namespace ChanSort.Loader.SamsungJ
if (pos >= 0)
{
channel.Favorites |= (Favorites) (1 << fav);
channel.OriginalFavs = channel.Favorites;
channel.FavIndex[fav] = channel.OriginalFavIndex[fav] = pos + 1;
channel.FavIndex[fav] = channel.OldFavIndex[fav] = pos + 1;
}
}
}
@@ -540,7 +539,7 @@ namespace ChanSort.Loader.SamsungJ
// update favorites
for (int i=0, mask=1; i<5; i++, mask <<= 1)
{
int oldPos = channel.OriginalFavIndex[i];
int oldPos = channel.OldFavIndex[i];
int newPos = ((int)channel.Favorites & mask) != 0 ? channel.FavIndex[i] : -1;
if (newPos >= 0)
@@ -558,9 +557,8 @@ namespace ChanSort.Loader.SamsungJ
cmdDeleteFav.ExecuteNonQuery();
}
channel.OriginalFavIndex[i] = channel.FavIndex[i] = newPos;
channel.OldFavIndex[i] = channel.FavIndex[i] = newPos;
}
channel.OriginalFavs = channel.Favorites;
}
}
#endregion

View File

@@ -0,0 +1,6 @@
DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.PictureEdit, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v17.1, Version=17.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

View File

@@ -1,6 +1,10 @@
ChanSort Change Log
===================
2017-11-13
- Samsung .zip: fixed loading/saving of favorites A-E
2017-10-29
- Show popup with download link for MS Visual C++ 2010 x86 Redist
(this package is needed to open lists with a SQLite file format)