Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
6595bd78
Commit
6595bd78
authored
Jun 27, 2010
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add version infos to new LibVLC functions
(cherry picked from commit 645e8d0bee60c90923b2d4351e8f10adaa0c43e1)
parent
98b31e7c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
4 deletions
+14
-4
include/vlc/libvlc.h
include/vlc/libvlc.h
+3
-2
include/vlc/libvlc_media_player.h
include/vlc/libvlc_media_player.h
+5
-0
test/libvlc/media_player.c
test/libvlc/media_player.c
+6
-2
No files found.
include/vlc/libvlc.h
View file @
6595bd78
...
@@ -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.
* @{
* @{
*/
*/
...
...
include/vlc/libvlc_media_player.h
View file @
6595bd78
...
@@ -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
);
...
...
test/libvlc/media_player.c
View file @
6595bd78
...
@@ -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
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment