Bouquet editor, numbering, 320 markers
Is it possible that the numbering in Bouquet editor can also count the 320 markers? They are there to make up numbers, so excluding them from OWIF numbering does do tehm justice.
Thanks in advance
userbouquet.abm.sat_282_sky_uk.101.tv.zip

Oops, I forgot to attach the picture of how the bouquets actually appear on the receiver. As you can see, Eden should be 166

Please check again using the latest version.
It is still not right. Just to clarify, In Enigma2 the 320 markers are counted but not visible in the normal viewing mode. When you go to edit, they become visible (otherwise you would not be able to see where you are putting them)
In OWIF Bouquet Editor, they are currently visible, but are still not counted. They must be counted. I suspect that all markers are being treated the same when the are different types. For example 064 markers should be visible but not counted..
I hope this commit explains things better. We added it to Vix last year, but it has been in PLI for many years. https://github.com/OpenViX/enigma2/commit/8d9cf312f628173297bf8ea5706ccc79a716951d
Better still https://github.com/OpenPLi/enigma2/blob/develop/lib/service/iservice.h#L28:L48
{
isDirectory=1, // SHOULD enter (implies mustDescent)
mustDescent=2, // cannot be played directly - often used with "isDirectory" (implies canDescent)
/*
for example:
normal services have none of them - they can be fed directly into the "play"-handler.
normal directories have both of them set - you cannot play a directory directly and the UI should descent into it.
playlists have "mustDescent", but not "isDirectory" - you don't want the user to browse inside the playlist (unless he really wants)
services with sub-services have none of them, instead the have the "canDecsent" flag (as all of the above)
*/
canDescent=4, // supports enterDirectory/leaveDirectory
flagDirectory=isDirectory|mustDescent|canDescent,
shouldSort=8, // should be ASCII-sorted according to service_name. great for directories.
hasSortKey=16, // has a sort key in data[3]. not having a sort key implies 0.
sort1=32, // sort key is 1 instead of 0
isMarker=64, // Marker
isGroup=128, // is a group of services
isNumberedMarker=256, //use together with isMarker, to force the marker to be numbered
isInvisible=512 // use to make services or markers in a list invisable
};
64 = marker 256 = is numbered marker 64+256 = 320
I have only one question. Why do you have 320 and not 832?
I'm pretty sure that your number markers should be hidden or am i wrong?
832 are permanently hidden and not visible while moving/editing using remote in Enigma2. 320 can be toggled to be visible in normal viewing. They are always visible in editing mode, there is no choice with regards to visibility in editing mode.
Okay.
This is the current code.
sref = citem[0].toString()
hs = (int(sref.split(":")[1]) & 512)
sp = (sref[:7] == '1:832:D')
if not hs or sp: # 512 is hidden service on sifteam image. Doesn't affect other images
oPos = oPos + 1
if not sp and citem[0].flags & eServiceReference.isMarker:
oPos = oPos - 1
I think this code can be easy optimized. Maybe:
if int(sref.split(":")[1]) <> 64:
oPos = oPos + 1
What you think?
I am not a coder, so can't comment decisively. We need to apply the different types of marker correctly instead of grouping them incorrectly. Some are visible and not counted, others are invisible but counted.
However, to repeat what was said earlier, all markers must be visible in edit mode.
I hope that helps. If not I can ask others to comment.
I can make the change but i cannot test.
If you upload the file, I can test. Thanks
P.S I commented in the remote commit if you get a moment.
I have fixed this in eListboxService where the problem was. Current openvix dev image should now work properly.
https://github.com/OpenViX/enigma2/commit/41320646128af00497778a216f39dcd57074bf88
The code in OWI that looks for a marker currently is citem[0].flags & eServiceReference.isMarker. Change to citem[0].flags == eServiceReference.isMarker and it should work properly.
And this suggestion above if int(sref.split(":")[1]) <> 64: should be if int(sref.split(":")[1]) != eServiceReference.isMarker:
The OWIF bouquet editor issue fixed by these commits:
https://github.com/oe-alliance/OpenWebif/commit/0915762bc8a2e9b4bff2af945b40d615446c7c7b https://github.com/oe-alliance/OpenWebif/commit/0fc956e216feb31c850fe143686052eac251a7e2
Many thanks
The navigation issue within sections in E2 has been fixed in Vix. Thanks