[vlc-commits] MediaPlayer: rename delay() to audioDelay() and setDelay() to setAudioDelay()
Steve Lhomme
git at videolan.org
Tue Sep 15 11:21:54 CEST 2015
libvlcpp | branch: master | Steve Lhomme <robux4 at gmail.com> | Tue Sep 15 11:02:49 2015 +0200| [87459db3148769311d26e1d500cae7cfff20be51] | committer: Hugo Beauzée-Luyssen
MediaPlayer: rename delay() to audioDelay() and setDelay() to setAudioDelay()
Signed-off-by: Hugo Beauzée-Luyssen <hugo at beauzee.fr>
> http://git.videolan.org/gitweb.cgi/libvlcpp.git/?a=commit;h=87459db3148769311d26e1d500cae7cfff20be51
---
cppcx/MediaPlayerCX.cpp | 8 ++++----
cppcx/MediaPlayerCX.hpp | 4 ++--
vlcpp/MediaPlayer.hpp | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/cppcx/MediaPlayerCX.cpp b/cppcx/MediaPlayerCX.cpp
index aa98af6..f14aff1 100644
--- a/cppcx/MediaPlayerCX.cpp
+++ b/cppcx/MediaPlayerCX.cpp
@@ -326,14 +326,14 @@ namespace libVLCX
return m_mp.setChannel(channel);
}
- int64_t MediaPlayer::delay()
+ int64_t MediaPlayer::audioDelay()
{
- return m_mp.delay();
+ return m_mp.audioDelay();
}
- int MediaPlayer::setDelay(int64_t i_delay)
+ int MediaPlayer::setAudioDelay(int64_t i_delay)
{
- return m_mp.setDelay(i_delay);
+ return m_mp.setAudioDelay(i_delay);
}
//void setVideoCallbacks(libvlc_video_lock_cb lock, libvlc_video_unlock_cb unlock, libvlc_video_display_cb display, void * opaque);
diff --git a/cppcx/MediaPlayerCX.hpp b/cppcx/MediaPlayerCX.hpp
index 9d45910..5f00f02 100644
--- a/cppcx/MediaPlayerCX.hpp
+++ b/cppcx/MediaPlayerCX.hpp
@@ -653,7 +653,7 @@ namespace libVLCX
*
* \version LibVLC 1.1.1 or later
*/
- int64_t delay();
+ int64_t audioDelay();
/**
* Set current audio delay. The audio delay will be reset to zero each
@@ -665,7 +665,7 @@ namespace libVLCX
*
* \version LibVLC 1.1.1 or later
*/
- int setDelay(int64_t i_delay);
+ int setAudioDelay(int64_t i_delay);
/**
* Set callbacks and private data to render decoded video to a custom
diff --git a/vlcpp/MediaPlayer.hpp b/vlcpp/MediaPlayer.hpp
index ca6a2ff..15a05fc 100644
--- a/vlcpp/MediaPlayer.hpp
+++ b/vlcpp/MediaPlayer.hpp
@@ -1008,7 +1008,7 @@ public:
*
* \version LibVLC 1.1.1 or later
*/
- int64_t delay()
+ int64_t audioDelay()
{
return libvlc_audio_get_delay(*this);
}
@@ -1021,7 +1021,7 @@ public:
*
* \version LibVLC 1.1.1 or later
*/
- bool setDelay(int64_t i_delay)
+ bool setAudioDelay(int64_t i_delay)
{
return libvlc_audio_set_delay(*this, i_delay) == 0;
}
More information about the vlc-commits
mailing list