<!DOCTYPE html><html><head><title></title><style type="text/css">p.MsoNormal,p.MsoNoSpacing{margin:0}</style></head><body><div>I'm think of the following name changes to reflect what each function is doing.<br></div><div><br></div><div>vlc_player_SelectEsId => vlc_player_SwitchEsId<br></div><div>vlc_player_UnselectEsId => vlc_player_DisableEsId<br></div><div>vlc_player_AddEsId => vlc_player_EnableEsId<br></div><div>vlc_player_SelectEsIdList => vlc_player_SetEsIdList<br></div><div><br></div><div>On Fri, Jun 21, 2019, at 20:32, Roland Bewick wrote:<br></div><blockquote type="cite" id="qt"><div><div><br></div><div><div class="qt-gmail_quote"><br></div></div></div><div><div class="qt-gmail_attr" dir="ltr">On Sat, 22 Jun 2019 at 12:29 AM, Alexandre Janniaux <<a href="mailto:ajanni@videolabs.io">ajanni@videolabs.io</a>> wrote:<br></div><blockquote style="margin-top:0px;margin-right:0px;margin-bottom:0px;margin-left:0.8ex;border-left-color:rgb(204, 204, 204);border-left-style:solid;border-left-width:1px;padding-left:1ex;" class="qt-gmail_quote"><div>Hi,<br></div><div> <br></div><div> I didn't checked the code, only the gif, but maybe you can use a different QML<br></div><div> component that doesn't trigger the close of the menu ?<br></div></blockquote><div dir="auto"><br></div></div><div><div dir="auto">Isn’t it standard behaviour for the menu to close when an option is clicked? Anyway, I was just trying to point out that I had implemented what Thomas thought was missing:<br></div></div><div dir="auto"><br></div><div dir="auto">“Multiple tracks selection inside Qt should be more graphical, like adding a checking in tracks selection to enable multiple mode, then selecting a track will add it instead of replacing it.”<br></div><div><div><div class="qt-gmail_quote"><div dir="auto"><br></div><div dir="auto">There were some unsolved issues though with the API but Thomas’ changes have solved them I think.<br></div><div dir="auto"><br></div><div dir="auto"><br></div><blockquote style="margin-top:0px;margin-right:0px;margin-bottom:0px;margin-left:0.8ex;border-left-color:rgb(204, 204, 204);border-left-style:solid;border-left-width:1px;padding-left:1ex;" class="qt-gmail_quote"><div><br></div><div><br></div><div>Regards,<br></div><div> <br></div><div> -- <br></div><div> Alexandre Janniaux<br></div><div> VideoLabs<br></div><div> <br></div><div> <br></div><div> On Fri, Jun 21, 2019 at 12:58:46PM +0700, Roland Bewick wrote:<br></div><div> > <br></div><div> > On 20/06/2019 10:23 PM, Thomas Guillem wrote:<br></div><div> > > Hello,<br></div><div> > > <br></div><div> > > Here is the result of the merge of Roland Bewick work about dual subtitles<br></div><div> > > handling.<br></div><div> > > <br></div><div> > > I started from Roland's work but did some modifications, mainly for polishing<br></div><div> > > the player API regarding multiple tracks handling. For now, only multiple video<br></div><div> > > and dual subtitles are supported, but we won't have to modify the player API if<br></div><div> > > we add multiple audio support later.<br></div><div> > > <br></div><div> > > I rejected the change regarding dual tracks selection in Qt. I didn't like the<br></div><div> > > way it interacted with the hotkeys plugin. Multiple tracks selection inside Qt<br></div><div> > > should be more graphical, like adding a checking in tracks selection to enable<br></div><div> > > multiple mode, then selecting a track will add it instead of replacing it.<br></div><div> > <br></div><div> > That's what I added, see a gif:<br></div><div> > <a rel="noreferrer" href="https://gyazo.com/5520dee77935f14020cb879a791e24c1">https://gyazo.com/5520dee77935f14020cb879a791e24c1</a><br></div><div> > <br></div><div> > The only issue was that the checkboxes show rather than radio buttons when<br></div><div> > dual subtitles is disabled. But that is an existing bug.<br></div><div> > <br></div><div> > Now that you've made the changes to retrieve the spu_order for a vlc_es_id,<br></div><div> > I think the interaction between the QT interface and hotkeys plugin is<br></div><div> > minimal. In fact, as far as I can see the only requirement is for the QT<br></div><div> > interface to listen to track selection changes and toggle the "Enable Dual<br></div><div> > Subtitles" checkbox if there is a track with<br></div><div> > VLC_SPU_CHANNEL_ORDER_SECONDARY.<br></div><div> > <br></div><div> > Other than that, I'm happy with your changes. Thank you for picking up my<br></div><div> > work and seeing it to completion :-)<br></div><div> > <br></div><div> > > <br></div><div> > > The player gained finer controls with SPU tracks. Indeed, users can know which<br></div><div> > > vout is linked with wich SPU tracks, and if a SPU track is primary or secondary.<br></div><div> > > <br></div><div> > > Regards,<br></div><div> > > Thomas<br></div><div> > > <br></div><div> > > Roland Bewick (12):<br></div><div> > > demux: add DEMUX_SET_ES_LIST control<br></div><div> > > input: add INPUT_CONTROL_SET_ES_LIST<br></div><div> > > player: add vlc_player_SelectEsIdList<br></div><div> > > vout: spu: handle secondary channel order<br></div><div> > > vout: spu: pass channel order to vout_ChangeSubMargin<br></div><div> > > player: handle secondary-sub-margin notification<br></div><div> > > libvlc: add secondary sub options<br></div><div> > > libvlc: add a key to switch spu channel orders<br></div><div> > > vout: handle secondary-sub-margin callback<br></div><div> > > hotkeys: handle secondary subtitles options<br></div><div> > > qt: add secondary sub margin/alignment preferences<br></div><div> > > qt: add secondary subtitle delay synchronization<br></div><div> > > <br></div><div> > > Thomas Guillem (8):<br></div><div> > > input: add input_SetEsIdDelay<br></div><div> > > es_out: handle all tracks delays in EsOutGetTracksDelay<br></div><div> > > player: add vlc_player_SetEsIdDelay<br></div><div> > > vout: spu: use mutex instead of atomic<br></div><div> > > input: pass vout and spu_order via events<br></div><div> > > player: rename vlc_player_GetVoutFromEsId<br></div><div> > > player: get vout and spu channel order from SPU es_ids<br></div><div> > > qt: re-indent after last commit<br></div><div> > > <br></div><div> > > include/vlc_actions.h | 2 +<br></div><div> > > include/vlc_demux.h | 3 +-<br></div><div> > > include/vlc_es_out.h | 1 +<br></div><div> > > include/vlc_player.h | 93 +++++++++-<br></div><div> > > include/vlc_vout.h | 10 +<br></div><div> > > lib/media_player.c | 9 +-<br></div><div> > > modules/access/bluray.c | 3 +<br></div><div> > > modules/control/gestures.c | 8 +-<br></div><div> > > modules/control/hotkeys.c | 154 +++++++++++++--<br></div><div> > > modules/demux/adaptive/plumbing/FakeESOut.cpp | 1 +<br></div><div> > > modules/demux/asf/asf.c | 3 +<br></div><div> > > modules/demux/mock.c | 2 +<br></div><div> > > modules/demux/mpeg/ts.c | 10 +-<br></div><div> > > .../gui/macosx/playlist/VLCPlayerController.m | 7 +-<br></div><div> > > modules/gui/qt/components/extended_panels.cpp | 44 ++++-<br></div><div> > > modules/gui/qt/components/extended_panels.hpp | 2 +<br></div><div> > > .../gui/qt/components/player_controller.cpp | 98 ++++++++--<br></div><div> > > .../gui/qt/components/player_controller.hpp | 4 +<br></div><div> > > .../gui/qt/components/player_controller_p.hpp | 6 +-<br></div><div> > > .../gui/qt/components/simple_preferences.cpp | 3 +<br></div><div> > > modules/gui/qt/ui/sprefs_subtitles.ui | 91 +++++++++<br></div><div> > > .../chromecast/chromecast_demux.cpp | 1 +<br></div><div> > > src/input/decoder.c | 40 +++-<br></div><div> > > src/input/demux.c | 1 +<br></div><div> > > src/input/es_out.c | 100 +++++++++-<br></div><div> > > src/input/es_out.h | 8 +<br></div><div> > > src/input/es_out_timeshift.c | 2 +<br></div><div> > > src/input/event.h | 9 +<br></div><div> > > src/input/input.c | 49 +++++<br></div><div> > > src/input/input_internal.h | 23 +++<br></div><div> > > src/input/player.c | 175 +++++++++++++++++-<br></div><div> > > src/libvlc-module.c | 29 +++<br></div><div> > > src/libvlccore.sym | 6 +-<br></div><div> > > src/misc/actions.c | 1 +<br></div><div> > > src/video_output/video_output.c | 10 +-<br></div><div> > > src/video_output/vout_internal.h | 10 +-<br></div><div> > > src/video_output/vout_intf.c | 22 ++-<br></div><div> > > src/video_output/vout_subpictures.c | 107 ++++++++---<br></div><div> > > test/src/input/player.c | 5 +-<br></div><div> > > 39 files changed, 1056 insertions(+), 96 deletions(-)<br></div><div> > > <br></div><div> > _______________________________________________<br></div><div> > vlc-devel mailing list<br></div><div> > To unsubscribe or modify your subscription options:<br></div><div> > <a rel="noreferrer" href="https://mailman.videolan.org/listinfo/vlc-devel">https://mailman.videolan.org/listinfo/vlc-devel</a><br></div><div> _______________________________________________<br></div><div> vlc-devel mailing list<br></div><div> To unsubscribe or modify your subscription options:<br></div><div> <a rel="noreferrer" href="https://mailman.videolan.org/listinfo/vlc-devel">https://mailman.videolan.org/listinfo/vlc-devel</a><br></div></blockquote></div></div></div><div>_______________________________________________<br></div><div>vlc-devel mailing list<br></div><div>To unsubscribe or modify your subscription options:<br></div><div>https://mailman.videolan.org/listinfo/vlc-devel<br></div></blockquote><div><br></div></body></html>