summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Bieringer <pb@bieringer.de>2021-01-28 21:05:12 +0100
committerPeter Bieringer <pb@bieringer.de>2021-01-28 21:05:12 +0100
commitea963c73eb81e84ebffb8dbdc7af7f1ca35b17db (patch)
treef3d21d0bcf0935ccd27653509d1e7baf0f0f6c51
parent6751c4cd4ee3e81a6d0926d706dd42086ab85bbc (diff)
parent83c85870fbbce0fe18f226a865e77f47613c30ac (diff)
downloadvdr-plugin-skindesigner-ea963c73eb81e84ebffb8dbdc7af7f1ca35b17db.tar.gz
vdr-plugin-skindesigner-ea963c73eb81e84ebffb8dbdc7af7f1ca35b17db.tar.bz2
Merge remote-tracking branch 'upstream/master'
-rw-r--r--HISTORY3
-rw-r--r--coreengine/viewelementscommon.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/HISTORY b/HISTORY
index d19b6a2..5b33437 100644
--- a/HISTORY
+++ b/HISTORY
@@ -468,3 +468,6 @@ Version 1.2.10
- [pbiering] expose to displaymenurecordings: recchannelname, recchannelid
- [pbiering] retrieve ChannelName from 'info' and fallback via ChannelID from active channel list
- [kamel5] Update skin estuary4vdr
+
+Version 1.2.10+
+- [pbiering] align displayed tuner number (0,1,2 -> 1,2,3)
diff --git a/coreengine/viewelementscommon.c b/coreengine/viewelementscommon.c
index 4991870..a1067c2 100644
--- a/coreengine/viewelementscommon.c
+++ b/coreengine/viewelementscommon.c
@@ -326,7 +326,7 @@ bool cVeDevices::Parse(bool forced) {
if (!device || !device->NumProvidedSystems()) {
continue;
}
- tokenContainer->AddLoopToken(devicesIndex, i, (int)eDevicesLT::num, *cString::sprintf("%d", i));
+ tokenContainer->AddLoopToken(devicesIndex, i, (int)eDevicesLT::num, *cString::sprintf("%d", i + 1));
tokenContainer->AddLoopToken(devicesIndex, i, (int)eDevicesLT::type, *(device->DeviceType()));
cCamSlot *camSlot = device->CamSlot();
@@ -538,4 +538,4 @@ bool cVeVolume::Parse(bool forced) {
changed = false;
SetDirty();
return true;
-} \ No newline at end of file
+}