diff --git a/source/ChanSort.Api/Model/ChannelList.cs b/source/ChanSort.Api/Model/ChannelList.cs
index 869ee41..5701d0e 100644
--- a/source/ChanSort.Api/Model/ChannelList.cs
+++ b/source/ChanSort.Api/Model/ChannelList.cs
@@ -17,6 +17,13 @@ namespace ChanSort.Api
public ChannelList(SignalSource source, string caption)
{
+ if ((source & SignalSource.MaskAnalogDigital) == 0)
+ source |= SignalSource.MaskAnalogDigital;
+ if ((source & SignalSource.MaskAntennaCableSat) == 0)
+ source |= SignalSource.MaskAntennaCableSat;
+ if ((source & SignalSource.MaskTvRadioData) == 0)
+ source |= SignalSource.MaskTvRadioData;
+
this.SignalSource = source;
this.ShortCaption = caption;
this.FirstProgramNumber = (source & SignalSource.Digital) != 0 ? 1 : 0;
diff --git a/source/ChanSort.Api/Model/DataRoot.cs b/source/ChanSort.Api/Model/DataRoot.cs
index 19ed9bc..55badf3 100644
--- a/source/ChanSort.Api/Model/DataRoot.cs
+++ b/source/ChanSort.Api/Model/DataRoot.cs
@@ -91,13 +91,13 @@ namespace ChanSort.Api
{
var listMask = list.SignalSource;
- if ((listMask & SignalSource.MaskAnalogDigital) != 0 && (listMask & SignalSource.MaskAnalogDigital & searchMask) == 0) // digital/analog
+ if ((searchMask & SignalSource.MaskAnalogDigital) != 0 && (listMask & SignalSource.MaskAnalogDigital & searchMask) == 0) // digital/analog
continue;
- if ((listMask & SignalSource.MaskAntennaCableSat) != 0 && (listMask & SignalSource.MaskAntennaCableSat & searchMask) == 0) // air/cable/sat/ip
+ if ((searchMask & SignalSource.MaskAntennaCableSat) != 0 && (listMask & SignalSource.MaskAntennaCableSat & searchMask) == 0) // air/cable/sat/ip
continue;
- if ((listMask & SignalSource.MaskTvRadioData) != 0 && (listMask & SignalSource.MaskTvRadioData & searchMask) == 0) // tv/radio/data
+ if ((searchMask & SignalSource.MaskTvRadioData) != 0 && (listMask & SignalSource.MaskTvRadioData & searchMask) == 0) // tv/radio/data
continue;
- if ((listMask & SignalSource.MaskProvider) != 0 && (listMask & SignalSource.MaskProvider) != (searchMask & SignalSource.MaskProvider)) // preset list
+ if ((searchMask & SignalSource.MaskProvider) != 0 && (listMask & SignalSource.MaskProvider) != (searchMask & SignalSource.MaskProvider)) // preset list
continue;
return list;
}
diff --git a/source/ChanSort.Loader.PhilipsXml/Serializer.cs b/source/ChanSort.Loader.PhilipsXml/Serializer.cs
index f67c275..37da734 100644
--- a/source/ChanSort.Loader.PhilipsXml/Serializer.cs
+++ b/source/ChanSort.Loader.PhilipsXml/Serializer.cs
@@ -198,7 +198,7 @@ namespace ChanSort.Loader.PhilipsXml
data.Add(attr.LocalName, attr.Value);
}
- var chan = new Channel(curList.SignalSource, rowId, rowId, setupNode);
+ var chan = new Channel(curList.SignalSource & SignalSource.MaskAdInput, rowId, rowId, setupNode);
chan.OldProgramNr = -1;
chan.IsDeleted = false;
if (this.formatVersion == 1)
diff --git a/source/ChanSort.Loader.Sony/Serializer.cs b/source/ChanSort.Loader.Sony/Serializer.cs
index 2b13f6f..0cfc8d4 100644
--- a/source/ChanSort.Loader.Sony/Serializer.cs
+++ b/source/ChanSort.Loader.Sony/Serializer.cs
@@ -41,13 +41,13 @@ namespace ChanSort.Loader.Sony
this.DataRoot.AddChannelList(new ChannelList(SignalSource.DvbT | SignalSource.Tv, "DVB-T TV"));
this.DataRoot.AddChannelList(new ChannelList(SignalSource.DvbT | SignalSource.Radio, "DVB-T Radio"));
- this.DataRoot.AddChannelList(new ChannelList(SignalSource.DvbT, "DVB-T Other"));
+ this.DataRoot.AddChannelList(new ChannelList(SignalSource.DvbT | SignalSource.Data, "DVB-T Other"));
this.DataRoot.AddChannelList(new ChannelList(SignalSource.DvbC | SignalSource.Tv, "DVB-C TV"));
this.DataRoot.AddChannelList(new ChannelList(SignalSource.DvbC | SignalSource.Radio, "DVB-C Radio"));
- this.DataRoot.AddChannelList(new ChannelList(SignalSource.DvbC, "DVB-C Other"));
- this.DataRoot.AddChannelList(new ChannelList(SignalSource.DvbS, "DVB-S"));
- this.DataRoot.AddChannelList(new ChannelList(SignalSource.DvbS | SignalSource.Provider2, "DVB-S Preset"));
- this.DataRoot.AddChannelList(new ChannelList(SignalSource.DvbS | SignalSource.Provider3, "DVB-S Ci"));
+ this.DataRoot.AddChannelList(new ChannelList(SignalSource.DvbC | SignalSource.Data, "DVB-C Other"));
+ this.DataRoot.AddChannelList(new ChannelList(SignalSource.DvbS | SignalSource.Provider0, "DVB-S"));
+ this.DataRoot.AddChannelList(new ChannelList(SignalSource.DvbS | SignalSource.Provider1, "DVB-S Preset"));
+ this.DataRoot.AddChannelList(new ChannelList(SignalSource.DvbS | SignalSource.Provider2, "DVB-S Ci"));
foreach (var list in this.DataRoot.ChannelLists)
{
@@ -158,11 +158,11 @@ namespace ChanSort.Loader.Sony
else if (name == "sdbc")
ReadSdb(child, SignalSource.DvbC, 0x10000, "DvbC");
else if (name == "sdbgs")
- ReadSdb(child, SignalSource.DvbS | SignalSource.Provider1, 0x20000, "DvbS");
+ ReadSdb(child, SignalSource.DvbS | SignalSource.Provider0, 0x20000, "DvbS");
else if (name == "sdbps")
- ReadSdb(child, SignalSource.DvbS | SignalSource.Provider2, 0x30000, "DvbS");
+ ReadSdb(child, SignalSource.DvbS | SignalSource.Provider1, 0x30000, "DvbS");
else if (name == "sdbcis")
- ReadSdb(child, SignalSource.DvbS | SignalSource.Provider3, 0x40000, "DvbS");
+ ReadSdb(child, SignalSource.DvbS | SignalSource.Provider2, 0x40000, "DvbS");
}
}
#endregion
diff --git a/source/ChanSort/MainForm.cs b/source/ChanSort/MainForm.cs
index fd6648f..d234a0e 100644
--- a/source/ChanSort/MainForm.cs
+++ b/source/ChanSort/MainForm.cs
@@ -1479,13 +1479,7 @@ namespace ChanSort.Ui
else if (col.Tag is bool originalVisible && !originalVisible)
return false;
- // find out what sort of channels the list may contain. If a mask yields all bits 0, it means that the list may contain everything
var source = list.SignalSource;
- if ((source & SignalSource.MaskAnalogDigital) == 0)
- source |= SignalSource.MaskAnalogDigital;
- if ((source & SignalSource.MaskAntennaCableSat) == 0)
- source |= SignalSource.MaskAntennaCableSat;
-
if (col == this.colSource) return list.IsMixedSourceFavoritesList;
if (col == this.colPrNr) return this.subListIndex > 0;
if (col == this.colChannelOrTransponder) return (source & SignalSource.Sat) == 0;
diff --git a/source/ChanSort/Properties/Resources.Designer.cs b/source/ChanSort/Properties/Resources.Designer.cs
index 7fbcdab..37122ab 100644
--- a/source/ChanSort/Properties/Resources.Designer.cs
+++ b/source/ChanSort/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace ChanSort.Ui.Properties {
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
@@ -491,7 +491,7 @@ namespace ChanSort.Ui.Properties {
}
///
- /// Looks up a localized string similar to Antenna,Cable,Sat,IP,Analog,Digital,TV,Radio.
+ /// Looks up a localized string similar to Antenna,Cable,Sat,IP,Analog,Digital,TV,Radio,Data.
///
internal static string ReferenceListForm_AntennaCableSatIPAnalogDigitalTVRadio {
get {
diff --git a/source/ChanSort/Properties/Resources.de.resx b/source/ChanSort/Properties/Resources.de.resx
index b0beea2..9ab0193 100644
--- a/source/ChanSort/Properties/Resources.de.resx
+++ b/source/ChanSort/Properties/Resources.de.resx
@@ -269,7 +269,7 @@ Sollen die Programmnummern in fortlaufende Zahlen umgeändert werden?
Mögliche Ursachen sind USB-Sticks, die mit NTFS formatiert sind (FAT32 sollte immer funktionieren) oder ein am TV durchgeführtes Firmwareupdate, ohne einen anschließenden neuen Suchlauf. Dabei kann dann unter Umständen die neue Firmware die alten Daten nicht korrekt exportieren.
- Antenne,Kabel,Sat,IP,Analog,Digital,TV,Radio
+ Antenne,Kabel,Sat,IP,Analog,Digital,TV,Radio,Daten
Wie soll vorgegangen werden, wenn eine Pr# bereits vergeben ist?
diff --git a/source/ChanSort/Properties/Resources.resx b/source/ChanSort/Properties/Resources.resx
index 1366202..5d62521 100644
--- a/source/ChanSort/Properties/Resources.resx
+++ b/source/ChanSort/Properties/Resources.resx
@@ -267,7 +267,7 @@ or firmware upgrades without running a new channel scan.
(The new software in the TV might be unable to process the old channel data during the export.)
- Antenna,Cable,Sat,IP,Analog,Digital,TV,Radio
+ Antenna,Cable,Sat,IP,Analog,Digital,TV,Radio,Data
How do you want to handle it when a Pr# is already taken in the target list?
diff --git a/source/ChanSort/Properties/Resources.ro.resx b/source/ChanSort/Properties/Resources.ro.resx
index 98bec15..967ae01 100644
--- a/source/ChanSort/Properties/Resources.ro.resx
+++ b/source/ChanSort/Properties/Resources.ro.resx
@@ -261,7 +261,7 @@ sau actualizări ale firmware-ului fără a efectua o nouă scanare a canalelor.
(Noul software din televizor ar putea să nu poată procesa datele vechi ale canalului în timpul exportului.)
- Antenă, Cablu, Sat, IP, analog, digital, TV, radio
+ Antenă, Cablu, Sat, IP, analog, digital, TV, radio, data
Cum doriți să o gestionați atunci când un Pr # este deja luat în lista țintă?
diff --git a/source/ChanSort/Properties/licenses.licx b/source/ChanSort/Properties/licenses.licx
index 9bee23d..a0cdb09 100644
--- a/source/ChanSort/Properties/licenses.licx
+++ b/source/ChanSort/Properties/licenses.licx
@@ -1,6 +1,7 @@
-DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v19.1, Version=19.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v19.1, Version=19.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.PictureEdit, DevExpress.XtraEditors.v19.1, Version=19.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v19.1, Version=19.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v19.1, Version=19.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.1, Version=19.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v19.1, Version=19.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.PictureEdit, DevExpress.XtraEditors.v19.1, Version=19.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v19.1, Version=19.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v19.1, Version=19.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v19.1, Version=19.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/source/ChanSort/ReferenceListForm.Designer.cs b/source/ChanSort/ReferenceListForm.Designer.cs
index eeb737f..57ba8c4 100644
--- a/source/ChanSort/ReferenceListForm.Designer.cs
+++ b/source/ChanSort/ReferenceListForm.Designer.cs
@@ -29,7 +29,11 @@
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ReferenceListForm));
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
this.edFile = new DevExpress.XtraEditors.ButtonEdit();
this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
@@ -65,6 +69,7 @@
this.groupControl2 = new DevExpress.XtraEditors.GroupControl();
this.labelControl10 = new DevExpress.XtraEditors.LabelControl();
this.labelControl8 = new DevExpress.XtraEditors.LabelControl();
+ this.cbData = new DevExpress.XtraEditors.CheckEdit();
((System.ComponentModel.ISupportInitialize)(this.edFile.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.rbAuto.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.rbManual.Properties)).BeginInit();
@@ -86,6 +91,7 @@
this.groupControl1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.groupControl2)).BeginInit();
this.groupControl2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.cbData.Properties)).BeginInit();
this.SuspendLayout();
//
// labelControl1
@@ -98,7 +104,7 @@
resources.ApplyResources(this.edFile, "edFile");
this.edFile.Name = "edFile";
this.edFile.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(((DevExpress.XtraEditors.Controls.ButtonPredefines)(resources.GetObject("edFile.Properties.Buttons"))), resources.GetString("edFile.Properties.Buttons1"), ((int)(resources.GetObject("edFile.Properties.Buttons2"))), ((bool)(resources.GetObject("edFile.Properties.Buttons3"))), ((bool)(resources.GetObject("edFile.Properties.Buttons4"))), ((bool)(resources.GetObject("edFile.Properties.Buttons5"))), ((DevExpress.XtraEditors.ImageLocation)(resources.GetObject("edFile.Properties.Buttons6"))), ((System.Drawing.Image)(resources.GetObject("edFile.Properties.Buttons7"))), new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, resources.GetString("edFile.Properties.Buttons8"), ((object)(resources.GetObject("edFile.Properties.Buttons9"))), ((DevExpress.Utils.SuperToolTip)(resources.GetObject("edFile.Properties.Buttons10"))), ((bool)(resources.GetObject("edFile.Properties.Buttons11"))))});
+ new DevExpress.XtraEditors.Controls.EditorButton(((DevExpress.XtraEditors.Controls.ButtonPredefines)(resources.GetObject("edFile.Properties.Buttons"))), resources.GetString("edFile.Properties.Buttons1"), ((int)(resources.GetObject("edFile.Properties.Buttons2"))), ((bool)(resources.GetObject("edFile.Properties.Buttons3"))), ((bool)(resources.GetObject("edFile.Properties.Buttons4"))), ((bool)(resources.GetObject("edFile.Properties.Buttons5"))), editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, resources.GetString("edFile.Properties.Buttons6"), ((object)(resources.GetObject("edFile.Properties.Buttons7"))), ((DevExpress.Utils.SuperToolTip)(resources.GetObject("edFile.Properties.Buttons8"))), ((DevExpress.Utils.ToolTipAnchor)(resources.GetObject("edFile.Properties.Buttons9"))))});
this.edFile.Properties.ReadOnly = true;
this.edFile.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.edFile_ButtonClick);
//
@@ -203,6 +209,7 @@
// grpManual
//
resources.ApplyResources(this.grpManual, "grpManual");
+ this.grpManual.Controls.Add(this.cbData);
this.grpManual.Controls.Add(this.cbConsecutive);
this.grpManual.Controls.Add(this.cbIp);
this.grpManual.Controls.Add(this.cbSat);
@@ -367,10 +374,19 @@
resources.ApplyResources(this.labelControl8, "labelControl8");
this.labelControl8.Name = "labelControl8";
//
+ // cbData
+ //
+ resources.ApplyResources(this.cbData, "cbData");
+ this.cbData.Name = "cbData";
+ this.cbData.Properties.AutoWidth = true;
+ this.cbData.Properties.Caption = resources.GetString("checkEdit1.Properties.Caption");
+ this.cbData.TabStop = false;
+ //
// ReferenceListForm
//
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.CancelButton = this.btnClose;
this.Controls.Add(this.groupControl2);
this.Controls.Add(this.groupControl1);
this.Controls.Add(this.btnClose);
@@ -402,6 +418,8 @@
this.groupControl1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.groupControl2)).EndInit();
this.groupControl2.ResumeLayout(false);
+ this.groupControl2.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.cbData.Properties)).EndInit();
this.ResumeLayout(false);
}
@@ -443,5 +461,6 @@
private DevExpress.XtraEditors.CheckEdit cbCable;
private DevExpress.XtraEditors.HyperlinkLabelControl linkWiki;
private DevExpress.XtraEditors.CheckEdit cbConsecutive;
+ private DevExpress.XtraEditors.CheckEdit cbData;
}
}
\ No newline at end of file
diff --git a/source/ChanSort/ReferenceListForm.cs b/source/ChanSort/ReferenceListForm.cs
index 0f31c86..2411630 100644
--- a/source/ChanSort/ReferenceListForm.cs
+++ b/source/ChanSort/ReferenceListForm.cs
@@ -151,7 +151,7 @@ namespace ChanSort.Ui
list = (ChannelList) this.comboTarget.EditValue;
this.lblTargetInfo.Text = GetInfoText(list, false);
- var canApply = (cbAnalog.Checked || cbDigital.Checked) && (cbTv.Checked || cbRadio.Checked);
+ var canApply = (cbAnalog.Checked || cbDigital.Checked) && (cbTv.Checked || cbRadio.Checked || cbData.Checked);
this.btnApply.Enabled = canApply;
}
@@ -164,14 +164,14 @@ namespace ChanSort.Ui
var src = list?.SignalSource ?? 0;
var sb = new StringBuilder();
- var sigSource = new[] {SignalSource.Antenna, SignalSource.Cable, SignalSource.Sat, SignalSource.IP, SignalSource.Analog, SignalSource.Digital, SignalSource.Tv, SignalSource.Radio};
+ var sigSource = new[] {SignalSource.Antenna, SignalSource.Cable, SignalSource.Sat, SignalSource.IP, SignalSource.Analog, SignalSource.Digital, SignalSource.Tv, SignalSource.Radio, SignalSource.Data};
var infoText = Resources.ReferenceListForm_AntennaCableSatIPAnalogDigitalTVRadio.Split(',');
- var controls = new[] {cbAntenna, cbCable, cbSat, cbIp, cbAnalog, cbDigital, cbTv, cbRadio };
+ var controls = new[] {cbAntenna, cbCable, cbSat, cbIp, cbAnalog, cbDigital, cbTv, cbRadio, cbData };
for (int i = 0, c = sigSource.Length; i < c; i++)
{
if ((src & sigSource[i]) != 0)
- sb.Append(", ").Append(infoText[i]);
+ sb.Append(", ").Append(infoText[i].TrimEnd());
else
{
controls[i].Checked = false;
@@ -200,7 +200,7 @@ namespace ChanSort.Ui
}
if (!(this.cbAnalog.Checked && (ss & SignalSource.Analog) != 0 || this.cbDigital.Checked && (ss & SignalSource.Digital) != 0))
return false;
- if (!(this.cbTv.Checked && (ss & SignalSource.Tv) != 0 || this.cbRadio.Checked && (ss & SignalSource.Radio) != 0))
+ if (!(this.cbTv.Checked && (ss & SignalSource.Tv) != 0 || this.cbRadio.Checked && (ss & SignalSource.Radio) != 0 || this.cbData.Checked && (ss & SignalSource.Data) != 0))
return false;
return true;
}
diff --git a/source/ChanSort/ReferenceListForm.resx b/source/ChanSort/ReferenceListForm.resx
index 833806e..f43ce6f 100644
--- a/source/ChanSort/ReferenceListForm.resx
+++ b/source/ChanSort/ReferenceListForm.resx
@@ -172,24 +172,17 @@
True
-
-
- MiddleCenter
+
+
-
+
-
-
-
-
-
-
-
- True
+
+ Default
549, 20
@@ -209,6 +202,7 @@
3
+
Vertical
@@ -314,7 +308,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)
grpManual
- 15
+ 16
123, 33
@@ -338,7 +332,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)
grpManual
- 13
+ 14
123, 7
@@ -362,7 +356,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)
grpManual
- 16
+ 17
5, 10
@@ -386,7 +380,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)
grpManual
- 17
+ 18
123, 109
@@ -410,7 +404,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)
grpManual
- 20
+ 21
204, 109
@@ -434,7 +428,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)
grpManual
- 21
+ 22
5, 137
@@ -443,7 +437,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)
62, 13
- 17
+ 18
Start at Pr#:
@@ -458,7 +452,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)
grpManual
- 19
+ 20
Vertical
@@ -470,7 +464,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)
323, 26
- 19
+ 20
(i.e. let radio channels start at 5000 to avoid conflicts with TV channel numbers)
@@ -485,7 +479,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)
grpManual
- 18
+ 19
1
@@ -521,7 +515,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)
140, 20
- 18
+ 19
comboPrNr
@@ -533,11 +527,35 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)
grpManual
- 14
+ 15
Top, Left, Right
+
+ 284, 109
+
+
+ Data/Other
+
+
+ 77, 19
+
+
+ 17
+
+
+ cbData
+
+
+ DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v19.1, Version=19.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+
+
+ grpManual
+
+
+ 0
+
123, 167
@@ -560,7 +578,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)
grpManual
- 0
+ 1
368, 59
@@ -584,7 +602,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)
grpManual
- 1
+ 2
284, 59
@@ -608,7 +626,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)
grpManual
- 2
+ 3
5, 62
@@ -632,7 +650,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)
grpManual
- 3
+ 4
123, 59
@@ -656,7 +674,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)
grpManual
- 4
+ 5
204, 59
@@ -680,7 +698,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)
grpManual
- 5
+ 6
5, 87
@@ -704,7 +722,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)
grpManual
- 6
+ 7
123, 84
@@ -728,7 +746,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)
grpManual
- 7
+ 8
204, 84
@@ -752,7 +770,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)
grpManual
- 8
+ 9
308, 10
@@ -776,7 +794,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)
grpManual
- 9
+ 10
308, 36
@@ -800,7 +818,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)
grpManual
- 10
+ 11
5, 112
@@ -824,7 +842,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)
grpManual
- 11
+ 12
False
@@ -836,7 +854,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)
103, 23
- 20
+ 22
Apply
@@ -851,7 +869,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)
grpManual
- 12
+ 13
False
diff --git a/source/Test.Loader.Sony/SonyXmlTest.cs b/source/Test.Loader.Sony/SonyXmlTest.cs
index e688076..720b142 100644
--- a/source/Test.Loader.Sony/SonyXmlTest.cs
+++ b/source/Test.Loader.Sony/SonyXmlTest.cs
@@ -24,7 +24,9 @@ namespace Test.Loader.Sony
[TestMethod]
public void TestAndroidSatChannelsAddedToCorrectLists()
{
- this.TestChannelsAddedToCorrectLists("android_sdb-sat.xml", SignalSource.DvbS, 1560, 1269, 291);
+ this.TestChannelsAddedToCorrectLists("android_sdb-sat.xml", SignalSource.DvbS, 1163, 1004, 159);
+ this.TestChannelsAddedToCorrectLists("android_sdb-sat.xml", SignalSource.DvbS | SignalSource.Provider1, 397, 265, 132);
+ this.TestChannelsAddedToCorrectLists("android_sdb-sat.xml", SignalSource.DvbS | SignalSource.Provider2, 0, 0, 0);
}
[TestMethod]