vlc | branch: master | Steve Lhomme <[email protected]> | Mon Mar 21 13:25:23 2016 +0100| [7d6cb418cd5051d7681a7958195006c806189dce] | committer: Jean-Baptiste Kempf
chromecast: use p_module instead of p_this or p_intf > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7d6cb418cd5051d7681a7958195006c806189dce --- modules/stream_out/chromecast/chromecast_ctrl.cpp | 27 +++++++++++---------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/modules/stream_out/chromecast/chromecast_ctrl.cpp b/modules/stream_out/chromecast/chromecast_ctrl.cpp index 341dc8f..d84662a 100644 --- a/modules/stream_out/chromecast/chromecast_ctrl.cpp +++ b/modules/stream_out/chromecast/chromecast_ctrl.cpp @@ -104,18 +104,18 @@ vlc_module_end () /***************************************************************************** * Open: connect to the Chromecast and initialize the sout *****************************************************************************/ -int Open(vlc_object_t *p_this) +int Open(vlc_object_t *p_module) { - intf_thread_t *p_intf = reinterpret_cast<intf_thread_t*>(p_this); - intf_sys_t *p_sys = new(std::nothrow) intf_sys_t(p_this); + intf_thread_t *p_intf = reinterpret_cast<intf_thread_t*>(p_module); + intf_sys_t *p_sys = new(std::nothrow) intf_sys_t(p_module); if (unlikely(p_sys == NULL)) return VLC_ENOMEM; p_intf->p_sys = p_sys; - char *psz_ipChromecast = var_InheritString(p_intf, CONTROL_CFG_PREFIX "addr"); + char *psz_ipChromecast = var_InheritString( p_module, CONTROL_CFG_PREFIX "addr"); if (psz_ipChromecast == NULL) { - msg_Err(p_intf, "No Chromecast receiver IP provided"); + msg_Err( p_module, "No Chromecast receiver IP provided"); Clean(p_intf); return VLC_EGENERIC; } @@ -124,7 +124,7 @@ int Open(vlc_object_t *p_this) free(psz_ipChromecast); if (p_sys->i_sock_fd < 0) { - msg_Err(p_intf, "Could not connect the Chromecast"); + msg_Err( p_module, "Could not connect the Chromecast"); Clean(p_intf); return VLC_EGENERIC; } @@ -133,24 +133,25 @@ int Open(vlc_object_t *p_this) char psz_localIP[NI_MAXNUMERICHOST]; if (net_GetSockAddress(p_sys->i_sock_fd, psz_localIP, NULL)) { - msg_Err(p_this, "Cannot get local IP address"); + msg_Err( p_module, "Cannot get local IP address"); Clean(p_intf); return VLC_EGENERIC; } p_sys->serverIP = psz_localIP; - char *psz_mux = var_InheritString(p_intf, CONTROL_CFG_PREFIX "mux"); + psz_mux = var_InheritString( p_module, CONTROL_CFG_PREFIX "mux"); if (psz_mux == NULL) { + msg_Err( p_module, "Bad muxer provided"); Clean(p_intf); return VLC_EGENERIC; } // Start the Chromecast event thread. - if (vlc_clone(&p_sys->chromecastThread, ChromecastThread, p_intf, + if (vlc_clone(&p_sys->chromecastThread, ChromecastThread, p_module, VLC_THREAD_PRIORITY_LOW)) { - msg_Err(p_intf, "Could not start the Chromecast talking thread"); + msg_Err( p_module, "Could not start the Chromecast talking thread"); Clean(p_intf); return VLC_EGENERIC; } @@ -168,7 +169,7 @@ int Open(vlc_object_t *p_this) i_ret = vlc_cond_timedwait(&p_sys->loadCommandCond, &p_sys->lock, deadline); if (i_ret == ETIMEDOUT) { - msg_Err(p_intf, "Timeout reached before sending the media loading command"); + msg_Err( p_module, "Timeout reached before sending the media loading command"); vlc_mutex_unlock(&p_sys->lock); vlc_cancel(p_sys->chromecastThread); Clean(p_intf); @@ -188,9 +189,9 @@ int Open(vlc_object_t *p_this) /***************************************************************************** * Close: destroy interface *****************************************************************************/ -void Close(vlc_object_t *p_this) +void Close(vlc_object_t *p_module) { - intf_thread_t *p_intf = reinterpret_cast<intf_thread_t*>(p_this); + intf_thread_t *p_intf = reinterpret_cast<intf_thread_t*>(p_module); intf_sys_t *p_sys = p_intf->p_sys; vlc_cancel(p_sys->chromecastThread); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
