Merge remote-tracking branch 'upstream/master'

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)

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;
-}
+}