vlc/vlc-3.0 | branch: master | Thomas Guillem <tho...@gllm.fr> | Tue Feb 6 08:56:45 2018 +0100| [91056f432fcfb3a59c7016aa57e60a6a1c2d932a] | committer: Jean-Baptiste Kempf
chromecast: rename isPlaying to isStatePlaying And set it private. (cherry picked from commit 716ab2af8b7223fe648e5969ef36d7be883abbdf) Signed-off-by: Jean-Baptiste Kempf <j...@videolan.org> > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=91056f432fcfb3a59c7016aa57e60a6a1c2d932a --- modules/stream_out/chromecast/chromecast.h | 2 +- modules/stream_out/chromecast/chromecast_ctrl.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/stream_out/chromecast/chromecast.h b/modules/stream_out/chromecast/chromecast.h index 4f0ecd9300..61389d681f 100644 --- a/modules/stream_out/chromecast/chromecast.h +++ b/modules/stream_out/chromecast/chromecast.h @@ -165,7 +165,6 @@ struct intf_sys_t bool isFinishedPlaying(); void setHasInput(const std::string mime_type = ""); - bool isPlaying() const; void requestPlayerSeek(mtime_t pos); void requestPlayerStop(); @@ -182,6 +181,7 @@ private: void queueMessage( QueueableMessages msg ); void setPauseState(bool paused); + bool isStatePlaying() const; void setMeta( vlc_meta_t *p_meta ); diff --git a/modules/stream_out/chromecast/chromecast_ctrl.cpp b/modules/stream_out/chromecast/chromecast_ctrl.cpp index dad14c0334..b1f14c7051 100644 --- a/modules/stream_out/chromecast/chromecast_ctrl.cpp +++ b/modules/stream_out/chromecast/chromecast_ctrl.cpp @@ -297,7 +297,7 @@ void intf_sys_t::setHasInput( const std::string mime_type ) m_eof = false; } -bool intf_sys_t::isPlaying() const +bool intf_sys_t::isStatePlaying() const { switch( m_state ) { @@ -382,7 +382,7 @@ void intf_sys_t::mainLoop() switch ( msg ) { case Stop: - if( isPlaying() ) + if( isStatePlaying() ) { if ( m_mediaSessionId == 0 ) m_request_stop = true; @@ -395,7 +395,7 @@ void intf_sys_t::mainLoop() break; case Seek: { - if( !isPlaying() || m_mediaSessionId == 0 ) + if( !isStatePlaying() || m_mediaSessionId == 0 ) break; char current_time[32]; mtime_t seek_request_time = mdate() + SEEK_FORWARD_OFFSET; @@ -824,7 +824,7 @@ void intf_sys_t::requestPlayerStop() m_art_stream = NULL; } - if( !isPlaying() ) + if( !isStatePlaying() ) return; queueMessage( Stop ); @@ -839,7 +839,7 @@ States intf_sys_t::state() const void intf_sys_t::requestPlayerSeek(mtime_t pos) { vlc_mutex_locker locker(&m_lock); - if( !isPlaying() || m_mediaSessionId == 0 ) + if( !isStatePlaying() || m_mediaSessionId == 0 ) return; if ( pos != VLC_TS_INVALID ) m_ts_local_start = pos; _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits