[vlc-commits] commit: Add version infos to new LibVLC functions ( Rémi Denis-Courmont )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Jun 27 17:10:33 2010 +0300| [6595bd7807dd57781ce799f97a4aa56328734278] | committer: Rémi Denis-Courmont 

Add version infos to new LibVLC functions
(cherry picked from commit 645e8d0bee60c90923b2d4351e8f10adaa0c43e1)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=6595bd7807dd57781ce799f97a4aa56328734278
---

 include/vlc/libvlc.h              |    5 +++--
 include/vlc/libvlc_media_player.h |    5 +++++
 test/libvlc/media_player.c        |    8 ++++++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/include/vlc/libvlc.h b/include/vlc/libvlc.h
index 5f3b52b..2b67cf0 100644
--- a/include/vlc/libvlc.h
+++ b/include/vlc/libvlc.h
@@ -67,8 +67,9 @@ extern "C" {
  * You can create one (or more) instance(s) of LibVLC in a given process,
  * with libvlc_new() and destroy them with libvlc_release().
  *
- * \version This documents LibVLC version 1.1.
- * Earlier versions (0.9 and 1.0) are <b>not</b> compatible.
+ * \version Unless otherwise stated, these functions are available
+ * from LibVLC versions numbered 1.1.0 or more.
+ * Earlier versions (0.9.x and 1.0.x) are <b>not</b> compatible.
  * @{
  */
 
diff --git a/include/vlc/libvlc_media_player.h b/include/vlc/libvlc_media_player.h
index 435bb4f..10dd6d0 100644
--- a/include/vlc/libvlc_media_player.h
+++ b/include/vlc/libvlc_media_player.h
@@ -181,6 +181,7 @@ VLC_PUBLIC_API int libvlc_media_player_play ( libvlc_media_player_t *p_mi );
  *
  * \param mp the Media Player
  * \param do_pause play/resume if zero, pause if non-zero
+ * \version LibVLC 1.1.1 or later
  */
 VLC_PUBLIC_API void libvlc_media_player_set_pause ( libvlc_media_player_t *mp,
                                                     int do_pause );
@@ -949,6 +950,7 @@ enum libvlc_video_adjust_option_t {
  *
  * \param p_mi libvlc media player instance
  * \param option adjust option to get, values of libvlc_video_adjust_option_t
+ * \version LibVLC 1.1.1 and later.
  */
 VLC_PUBLIC_API int libvlc_video_get_adjust_int( libvlc_media_player_t *p_mi,
                                                 unsigned option );
@@ -962,6 +964,7 @@ VLC_PUBLIC_API int libvlc_video_get_adjust_int( libvlc_media_player_t *p_mi,
  * \param p_mi libvlc media player instance
  * \param option adust option to set, values of libvlc_video_adjust_option_t
  * \param value adjust option value
+ * \version LibVLC 1.1.1 and later.
  */
 VLC_PUBLIC_API void libvlc_video_set_adjust_int( libvlc_media_player_t *p_mi,
                                                  unsigned option, int value );
@@ -971,6 +974,7 @@ VLC_PUBLIC_API void libvlc_video_set_adjust_int( libvlc_media_player_t *p_mi,
  *
  * \param p_mi libvlc media player instance
  * \param option adjust option to get, values of libvlc_video_adjust_option_t
+ * \version LibVLC 1.1.1 and later.
  */
 VLC_PUBLIC_API float libvlc_video_get_adjust_float( libvlc_media_player_t *p_mi,
                                                     unsigned option );
@@ -982,6 +986,7 @@ VLC_PUBLIC_API float libvlc_video_get_adjust_float( libvlc_media_player_t *p_mi,
  * \param p_mi libvlc media player instance
  * \param option adust option to set, values of libvlc_video_adjust_option_t
  * \param value adjust option value
+ * \version LibVLC 1.1.1 and later.
  */
 VLC_PUBLIC_API void libvlc_video_set_adjust_float( libvlc_media_player_t *p_mi,
                                                    unsigned option, float value );
diff --git a/test/libvlc/media_player.c b/test/libvlc/media_player.c
index 0e02858..258d825 100644
--- a/test/libvlc/media_player.c
+++ b/test/libvlc/media_player.c
@@ -150,17 +150,21 @@ static void test_media_player_pause_stop(const char** argv, int argc)
 
     libvlc_media_release (md);
 
-    libvlc_media_player_play (mi);
+    test_audio_video(mi);
 
+    libvlc_media_player_play (mi);
     log ("Waiting for playing\n");
-
     wait_playing (mi);
+    test_audio_video(mi);
 
     libvlc_media_player_set_pause (mi, true);
     log ("Waiting for pause\n");
     wait_paused (mi);
+    test_audio_video(mi);
 
     libvlc_media_player_stop (mi);
+    test_audio_video(mi);
+
     libvlc_media_player_release (mi);
     libvlc_release (vlc);
 }