vlc/vlc-3.0 | branch: master | Thomas Guillem <tho...@gllm.fr> | Wed Mar 28 18:54:56 2018 +0200| [6392b5ac207ebeddc562a6797bc5d3ebdc766559] | committer: Thomas Guillem
chromecast: rename setOnPausedChangedCb to setDemuxEnabled (cherry picked from commit 90276eb2c3a8b4e4d02233c361dd9f92739801ef) Signed-off-by: Thomas Guillem <tho...@gllm.fr> > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=6392b5ac207ebeddc562a6797bc5d3ebdc766559 --- modules/stream_out/chromecast/chromecast.h | 6 +++--- modules/stream_out/chromecast/chromecast_common.h | 2 +- modules/stream_out/chromecast/chromecast_ctrl.cpp | 13 +++++++------ modules/stream_out/chromecast/chromecast_demux.cpp | 7 +++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/modules/stream_out/chromecast/chromecast.h b/modules/stream_out/chromecast/chromecast.h index 0a550136ee..50c678f188 100644 --- a/modules/stream_out/chromecast/chromecast.h +++ b/modules/stream_out/chromecast/chromecast.h @@ -172,8 +172,8 @@ struct intf_sys_t void setHasInput(const std::string mime_type = ""); void setOnInputEventCb(on_input_event_itf on_input_event, void *on_input_event_data); - void setOnPausedChangedCb(on_paused_changed_itf on_paused_changed, - void *on_paused_changed_data); + void setDemuxEnabled(bool enabled, on_paused_changed_itf on_paused_changed, + void *on_paused_changed_data); void requestPlayerStop(); States state() const; @@ -223,7 +223,7 @@ private: static int pace(void*); static void send_input_event(void *, enum cc_input_event event, union cc_input_arg arg); - static void set_on_paused_changed_cb(void *, on_paused_changed_itf, void *); + static void set_demux_enabled(void *, bool, on_paused_changed_itf, void *); static void set_pause_state(void*, bool paused, mtime_t delay); diff --git a/modules/stream_out/chromecast/chromecast_common.h b/modules/stream_out/chromecast/chromecast_common.h index 8b4199fed7..f5a378812d 100644 --- a/modules/stream_out/chromecast/chromecast_common.h +++ b/modules/stream_out/chromecast/chromecast_common.h @@ -58,7 +58,7 @@ typedef struct { void *p_opaque; - void (*pf_set_on_paused_changed_cb)(void *, on_paused_changed_itf, void *); + void (*pf_set_demux_enabled)(void *, bool enabled, on_paused_changed_itf, void *); mtime_t (*pf_get_time)(void*); diff --git a/modules/stream_out/chromecast/chromecast_ctrl.cpp b/modules/stream_out/chromecast/chromecast_ctrl.cpp index 052d51d3f8..c293261594 100644 --- a/modules/stream_out/chromecast/chromecast_ctrl.cpp +++ b/modules/stream_out/chromecast/chromecast_ctrl.cpp @@ -131,7 +131,7 @@ intf_sys_t::intf_sys_t(vlc_object_t * const p_this, int port, std::string device m_art_http_ip = ss.str(); m_common.p_opaque = this; - m_common.pf_set_on_paused_changed_cb = set_on_paused_changed_cb; + m_common.pf_set_demux_enabled = set_demux_enabled; m_common.pf_get_time = get_time; m_common.pf_pace = pace; m_common.pf_send_input_event = send_input_event; @@ -1029,8 +1029,9 @@ void intf_sys_t::setOnInputEventCb(on_input_event_itf on_input_event, m_on_input_event_data = on_input_event_data; } -void intf_sys_t::setOnPausedChangedCb(on_paused_changed_itf on_paused_changed, - void *on_paused_changed_data) +void intf_sys_t::setDemuxEnabled(bool enabled, + on_paused_changed_itf on_paused_changed, + void *on_paused_changed_data) { vlc_mutex_locker locker(&m_lock); m_on_paused_changed = on_paused_changed; @@ -1140,11 +1141,11 @@ mtime_t intf_sys_t::get_time(void *pt) return p_this->getPlaybackTimestamp(); } -void intf_sys_t::set_on_paused_changed_cb(void *pt, - on_paused_changed_itf itf, void *data) +void intf_sys_t::set_demux_enabled(void *pt, bool enabled, + on_paused_changed_itf itf, void *data) { intf_sys_t *p_this = static_cast<intf_sys_t*>(pt); - p_this->setOnPausedChangedCb(itf, data); + p_this->setDemuxEnabled(enabled, itf, data); } int intf_sys_t::pace(void *pt) diff --git a/modules/stream_out/chromecast/chromecast_demux.cpp b/modules/stream_out/chromecast/chromecast_demux.cpp index 08485d13b7..589556406f 100644 --- a/modules/stream_out/chromecast/chromecast_demux.cpp +++ b/modules/stream_out/chromecast/chromecast_demux.cpp @@ -135,8 +135,8 @@ struct demux_cc es_out_Control( p_demux->p_next->out, ES_OUT_RESET_PCR ); - p_renderer->pf_set_on_paused_changed_cb(p_renderer->p_opaque, - on_paused_changed_cb, p_demux); + p_renderer->pf_set_demux_enabled(p_renderer->p_opaque, true, + on_paused_changed_cb, p_demux); resetTimes(); } @@ -145,8 +145,7 @@ struct demux_cc { assert(p_renderer); p_renderer->pf_set_meta( p_renderer->p_opaque, NULL ); - p_renderer->pf_set_on_paused_changed_cb( p_renderer->p_opaque, - NULL, NULL ); + p_renderer->pf_set_demux_enabled(p_renderer->p_opaque, false, NULL, NULL); } void resetTimes() _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits