Commit 6595bd78 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Add version infos to new LibVLC functions

(cherry picked from commit 645e8d0b)
parent 98b31e7c
...@@ -67,8 +67,9 @@ extern "C" { ...@@ -67,8 +67,9 @@ extern "C" {
* You can create one (or more) instance(s) of LibVLC in a given process, * You can create one (or more) instance(s) of LibVLC in a given process,
* with libvlc_new() and destroy them with libvlc_release(). * with libvlc_new() and destroy them with libvlc_release().
* *
* \version This documents LibVLC version 1.1. * \version Unless otherwise stated, these functions are available
* Earlier versions (0.9 and 1.0) are <b>not</b> compatible. * from LibVLC versions numbered 1.1.0 or more.
* Earlier versions (0.9.x and 1.0.x) are <b>not</b> compatible.
* @{ * @{
*/ */
......
...@@ -181,6 +181,7 @@ VLC_PUBLIC_API int libvlc_media_player_play ( libvlc_media_player_t *p_mi ); ...@@ -181,6 +181,7 @@ VLC_PUBLIC_API int libvlc_media_player_play ( libvlc_media_player_t *p_mi );
* *
* \param mp the Media Player * \param mp the Media Player
* \param do_pause play/resume if zero, pause if non-zero * \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, VLC_PUBLIC_API void libvlc_media_player_set_pause ( libvlc_media_player_t *mp,
int do_pause ); int do_pause );
...@@ -949,6 +950,7 @@ enum libvlc_video_adjust_option_t { ...@@ -949,6 +950,7 @@ enum libvlc_video_adjust_option_t {
* *
* \param p_mi libvlc media player instance * \param p_mi libvlc media player instance
* \param option adjust option to get, values of libvlc_video_adjust_option_t * \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, VLC_PUBLIC_API int libvlc_video_get_adjust_int( libvlc_media_player_t *p_mi,
unsigned option ); unsigned option );
...@@ -962,6 +964,7 @@ VLC_PUBLIC_API int libvlc_video_get_adjust_int( libvlc_media_player_t *p_mi, ...@@ -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 p_mi libvlc media player instance
* \param option adust option to set, values of libvlc_video_adjust_option_t * \param option adust option to set, values of libvlc_video_adjust_option_t
* \param value adjust option value * \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, VLC_PUBLIC_API void libvlc_video_set_adjust_int( libvlc_media_player_t *p_mi,
unsigned option, int value ); unsigned option, int value );
...@@ -971,6 +974,7 @@ VLC_PUBLIC_API void libvlc_video_set_adjust_int( libvlc_media_player_t *p_mi, ...@@ -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 p_mi libvlc media player instance
* \param option adjust option to get, values of libvlc_video_adjust_option_t * \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, VLC_PUBLIC_API float libvlc_video_get_adjust_float( libvlc_media_player_t *p_mi,
unsigned option ); unsigned option );
...@@ -982,6 +986,7 @@ VLC_PUBLIC_API float libvlc_video_get_adjust_float( libvlc_media_player_t *p_mi, ...@@ -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 p_mi libvlc media player instance
* \param option adust option to set, values of libvlc_video_adjust_option_t * \param option adust option to set, values of libvlc_video_adjust_option_t
* \param value adjust option value * \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, VLC_PUBLIC_API void libvlc_video_set_adjust_float( libvlc_media_player_t *p_mi,
unsigned option, float value ); unsigned option, float value );
......
...@@ -150,17 +150,21 @@ static void test_media_player_pause_stop(const char** argv, int argc) ...@@ -150,17 +150,21 @@ static void test_media_player_pause_stop(const char** argv, int argc)
libvlc_media_release (md); libvlc_media_release (md);
libvlc_media_player_play (mi); test_audio_video(mi);
libvlc_media_player_play (mi);
log ("Waiting for playing\n"); log ("Waiting for playing\n");
wait_playing (mi); wait_playing (mi);
test_audio_video(mi);
libvlc_media_player_set_pause (mi, true); libvlc_media_player_set_pause (mi, true);
log ("Waiting for pause\n"); log ("Waiting for pause\n");
wait_paused (mi); wait_paused (mi);
test_audio_video(mi);
libvlc_media_player_stop (mi); libvlc_media_player_stop (mi);
test_audio_video(mi);
libvlc_media_player_release (mi); libvlc_media_player_release (mi);
libvlc_release (vlc); libvlc_release (vlc);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment