- fix the logic
- simplify
- repair the ability to save the state and position
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>