diff --git a/ChanSort.Loader.ScmFile/AnalogChannel.cs b/ChanSort.Loader.ScmFile/AnalogChannel.cs index 1dae412..f6842af 100644 --- a/ChanSort.Loader.ScmFile/AnalogChannel.cs +++ b/ChanSort.Loader.ScmFile/AnalogChannel.cs @@ -4,7 +4,6 @@ namespace ChanSort.Loader.ScmFile { internal class AnalogChannel : ScmChannelBase { - private const string _Skip = "Skip"; private const string _Frequency = "offFrequency"; #region ctor() @@ -21,7 +20,6 @@ namespace ChanSort.Loader.ScmFile this.FreqInMhz = freq; if (this.FreqInMhz == 0) // fallback since Freq is part of the UID and requires a unique value this.FreqInMhz = slot; - this.Skip = mapping.GetFlag(_Skip); this.ChannelOrTransponder = ""; } diff --git a/ChanSort.Loader.ScmFile/ChanSort.Loader.ScmFile.ini b/ChanSort.Loader.ScmFile/ChanSort.Loader.ScmFile.ini index 516267e..b3cfcbd 100644 --- a/ChanSort.Loader.ScmFile/ChanSort.Loader.ScmFile.ini +++ b/ChanSort.Loader.ScmFile/ChanSort.Loader.ScmFile.ini @@ -59,8 +59,8 @@ ; map-AirA and map-CableA for C series offInUse = 1 maskInUse = 0x01 - offSkip = 2 - maskSkip = 0x01 + offDeleted = 2 + maskDeleted = 0x01 offLock = 6 maskLock = 0x01 offTuned = 8 @@ -78,8 +78,8 @@ ; map-AirA and map-CableA for D,E series offInUse = 1 maskInUse = 0x01 - offSkip = 2 - maskSkip = 0x01 + offDeleted = 2 + maskDeleted = 0x01 offLock = 6 maskLock = 0x01 offTuned = 8 @@ -115,7 +115,8 @@ offVideoPid = 2 offPcrPid = 4 offServiceId = 10 - offStatus = 8 + offDeleted = 8 + maskDeleted = 0x01 offQam = 7 offServiceType = 9 offEncrypted = 23 @@ -140,7 +141,8 @@ offVideoPid = 2 offPcrPid = 4 offServiceId = 6 - offStatus = + offDeleted = 8 + maskDeleted = 0x01 offQam = 12 offBandwidth = 14 offServiceType = 15 @@ -174,7 +176,8 @@ offVideoPid = 2 offPcrPid = 4 offServiceId = 6 - offStatus = + maskDeleted = 0x01 + offDeleted = 8 offQam = 12 offBandwidth = 14 offServiceType = 15 diff --git a/ChanSort.Loader.ScmFile/ScmChannelBase.cs b/ChanSort.Loader.ScmFile/ScmChannelBase.cs index 172a4b6..1c539b9 100644 --- a/ChanSort.Loader.ScmFile/ScmChannelBase.cs +++ b/ChanSort.Loader.ScmFile/ScmChannelBase.cs @@ -107,6 +107,7 @@ namespace ChanSort.Loader.ScmFile public override void UpdateRawData() { mapping.SetDataPtr(this.rawData, this.baseOffset); + mapping.SetFlag(_InUse, this.InUse); mapping.SetWord(_ProgramNr, this.NewProgramNr); if (this.IsNameModified) { diff --git a/ChanSort/MainForm.cs b/ChanSort/MainForm.cs index f2fe227..cc811df 100644 --- a/ChanSort/MainForm.cs +++ b/ChanSort/MainForm.cs @@ -22,7 +22,7 @@ namespace ChanSort.Ui { public partial class MainForm : XtraForm { - private const string Version = "v2013-04-03"; + private const string Version = "v2013-04-04"; #region enum EditMode private enum EditMode diff --git a/makeDistribZip.cmd b/makeDistribZip.cmd index 4f925b3..ea02ade 100644 --- a/makeDistribZip.cmd +++ b/makeDistribZip.cmd @@ -17,7 +17,9 @@ cd .. del Website\ChanSort.zip 2>nul copy Source\readme.txt %target% cd %target% -"c:\program files (x86)\7-Zip\7z.exe" a -tzip ChanSort.zip * +c:\cygwin\bin\date +%Y-%m-%d>%TEMP%\date.txt +set /p curdate=<%temp%\date.txt +"c:\program files (x86)\7-Zip\7z.exe" a -tzip ChanSort_%curdate%.zip * pause diff --git a/readme.txt b/readme.txt index 8439780..5f866b9 100644 --- a/readme.txt +++ b/readme.txt @@ -1,19 +1,12 @@ -Version v2013-03-04 ======================================================== +Version v2013-04-04 ======================================================== -This version is a major release and includes a complete re-write of the code -for loading/saving TV-data files (SCM, TLL) and reference lists (CSV). - -New features: -- added support for LG's LX-models -- channel names can now be edited for both LG and Samsung -- menu item for (un-)setting favorite #5 for Samsung series E +This is a bugfix release for major version v2013-04-03 Bug fixes: -- Samsung channel lists are now loaded/saved correctly - (program numbers, favorites, locking, frequencies, ...) -- loading a reference list for a Samsung .SCM file which contains both - air and cable channels or satellite and AstraHD+ lists caused the items - to be only applied to the first list (showing not-found channels in red) +- Deleting channels for Samsung TVs now stores the files correctly (no longer + showing them all on Pr #0 on your TV) + +The complete change log can be found at the end of this document About ChanSort ============================================================= @@ -95,7 +88,12 @@ OTHER DEALINGS IN THE SOFTWARE. Change log ==================================================================== -2013-03-04 (major release) +2013-04-04 +- Deleting channels for Samsung TVs now stores the files correctly (no longer + showing them all on Pr #0 on your TV) + + +2013-04-03 (major release) - complete re-write of the code for loading/saving TV-data files (SCM, TLL) and reference lists (CSV). - added support for LG's LX-models