vlc | branch: master | Thomas Guillem <[email protected]> | Fri Jun 21 14:04:28 2019 +0200| [3025577bb5bed301f7b0d2b5696555ec284cabca] | committer: Thomas Guillem
input: send the vout order via the vout event > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3025577bb5bed301f7b0d2b5696555ec284cabca --- src/input/decoder.c | 2 +- src/input/decoder.h | 1 + src/input/es_out.c | 5 ++++- src/input/input_internal.h | 1 + 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/input/decoder.c b/src/input/decoder.c index d3ecfb6e5c..08b5946168 100644 --- a/src/input/decoder.c +++ b/src/input/decoder.c @@ -548,7 +548,7 @@ static int vout_update_format( decoder_t *p_dec ) .mouse_event = MouseEvent, .mouse_opaque = p_dec }, &order ); if (p_vout) - decoder_Notify(p_owner, on_vout_added, p_vout); + decoder_Notify(p_owner, on_vout_added, p_vout, order); vlc_mutex_lock( &p_owner->lock ); p_owner->p_vout = p_vout; diff --git a/src/input/decoder.h b/src/input/decoder.h index a259152a23..04b64ac713 100644 --- a/src/input/decoder.h +++ b/src/input/decoder.h @@ -31,6 +31,7 @@ struct input_decoder_callbacks { /* notifications */ void (*on_vout_added)(decoder_t *decoder, vout_thread_t *vout, + enum vlc_vout_order vout_order, void *userdata); void (*on_vout_deleted)(decoder_t *decoder, vout_thread_t *vout, void *userdata); diff --git a/src/input/es_out.c b/src/input/es_out.c index 613310310e..5b0f262824 100644 --- a/src/input/es_out.c +++ b/src/input/es_out.c @@ -274,7 +274,8 @@ FindEsIdFromDecoder(es_out_sys_t *p_sys, decoder_t *decoder) } static void -decoder_on_vout_added(decoder_t *decoder, vout_thread_t *vout, void *userdata) +decoder_on_vout_added(decoder_t *decoder, vout_thread_t *vout, + enum vlc_vout_order order, void *userdata) { es_out_sys_t *priv = userdata; if (!priv->p_input) @@ -286,6 +287,7 @@ decoder_on_vout_added(decoder_t *decoder, vout_thread_t *vout, void *userdata) struct vlc_input_event_vout event = { .action = VLC_INPUT_EVENT_VOUT_ADDED, .vout = vout, + .order = order, .id = id, }; @@ -305,6 +307,7 @@ decoder_on_vout_deleted(decoder_t *decoder, vout_thread_t *vout, void *userdata) struct vlc_input_event_vout event = { .action = VLC_INPUT_EVENT_VOUT_DELETED, .vout = vout, + .order = VLC_VOUT_ORDER_NONE, .id = id, }; diff --git a/src/input/input_internal.h b/src/input/input_internal.h index b159033b1c..8863b00c2d 100644 --- a/src/input/input_internal.h +++ b/src/input/input_internal.h @@ -268,6 +268,7 @@ struct vlc_input_event_vout VLC_INPUT_EVENT_VOUT_DELETED, } action; vout_thread_t *vout; + enum vlc_vout_order order; vlc_es_id_t *id; }; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
