Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
618605e3
Commit
618605e3
authored
Jan 31, 2010
by
Hugo Beauzee-Luyssen
Committed by
Rémi Denis-Courmont
Jan 31, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove unused exception from video.c
Signed-off-by:
Rémi Denis-Courmont
<
remi@remlab.net
>
parent
595e377e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
25 deletions
+17
-25
include/vlc/libvlc_media_player.h
include/vlc/libvlc_media_player.h
+8
-8
src/control/video.c
src/control/video.c
+9
-17
No files found.
include/vlc/libvlc_media_player.h
View file @
618605e3
...
@@ -448,7 +448,7 @@ VLC_PUBLIC_API float libvlc_media_player_get_fps( libvlc_media_player_t * );
...
@@ -448,7 +448,7 @@ VLC_PUBLIC_API float libvlc_media_player_get_fps( libvlc_media_player_t * );
*
*
* \param p_md the media player
* \param p_md the media player
*/
*/
VLC_PUBLIC_API
int
libvlc_media_player_has_vout
(
libvlc_media_player_t
*
,
libvlc_exception_t
*
);
VLC_PUBLIC_API
int
libvlc_media_player_has_vout
(
libvlc_media_player_t
*
);
/**
/**
* Is this media player seekable?
* Is this media player seekable?
...
@@ -646,7 +646,7 @@ VLC_PUBLIC_API int libvlc_video_get_spu_count( libvlc_media_player_t *, libvlc_e
...
@@ -646,7 +646,7 @@ VLC_PUBLIC_API int libvlc_video_get_spu_count( libvlc_media_player_t *, libvlc_e
* \return list containing description of available video subtitles
* \return list containing description of available video subtitles
*/
*/
VLC_PUBLIC_API
libvlc_track_description_t
*
VLC_PUBLIC_API
libvlc_track_description_t
*
libvlc_video_get_spu_description
(
libvlc_media_player_t
*
,
libvlc_exception_t
*
);
libvlc_video_get_spu_description
(
libvlc_media_player_t
*
);
/**
/**
* Set new video subtitle.
* Set new video subtitle.
...
@@ -665,7 +665,7 @@ VLC_PUBLIC_API void libvlc_video_set_spu( libvlc_media_player_t *, int , libvlc_
...
@@ -665,7 +665,7 @@ VLC_PUBLIC_API void libvlc_video_set_spu( libvlc_media_player_t *, int , libvlc_
* \param p_e an initialized exception pointer
* \param p_e an initialized exception pointer
* \return the success status (boolean)
* \return the success status (boolean)
*/
*/
VLC_PUBLIC_API
int
libvlc_video_set_subtitle_file
(
libvlc_media_player_t
*
,
const
char
*
,
libvlc_exception_t
*
);
VLC_PUBLIC_API
int
libvlc_video_set_subtitle_file
(
libvlc_media_player_t
*
,
const
char
*
);
/**
/**
* Get the description of available titles.
* Get the description of available titles.
...
@@ -675,7 +675,7 @@ VLC_PUBLIC_API int libvlc_video_set_subtitle_file( libvlc_media_player_t *, cons
...
@@ -675,7 +675,7 @@ VLC_PUBLIC_API int libvlc_video_set_subtitle_file( libvlc_media_player_t *, cons
* \return list containing description of available titles
* \return list containing description of available titles
*/
*/
VLC_PUBLIC_API
libvlc_track_description_t
*
VLC_PUBLIC_API
libvlc_track_description_t
*
libvlc_video_get_title_description
(
libvlc_media_player_t
*
,
libvlc_exception_t
*
);
libvlc_video_get_title_description
(
libvlc_media_player_t
*
);
/**
/**
* Get the description of available chapters for specific title.
* Get the description of available chapters for specific title.
...
@@ -686,7 +686,7 @@ VLC_PUBLIC_API libvlc_track_description_t *
...
@@ -686,7 +686,7 @@ VLC_PUBLIC_API libvlc_track_description_t *
* \return list containing description of available chapter for title i_title
* \return list containing description of available chapter for title i_title
*/
*/
VLC_PUBLIC_API
libvlc_track_description_t
*
VLC_PUBLIC_API
libvlc_track_description_t
*
libvlc_video_get_chapter_description
(
libvlc_media_player_t
*
,
int
,
libvlc_exception_t
*
);
libvlc_video_get_chapter_description
(
libvlc_media_player_t
*
,
int
);
/**
/**
* Get current crop filter geometry.
* Get current crop filter geometry.
...
@@ -712,7 +712,7 @@ VLC_PUBLIC_API void libvlc_video_set_crop_geometry( libvlc_media_player_t *, con
...
@@ -712,7 +712,7 @@ VLC_PUBLIC_API void libvlc_video_set_crop_geometry( libvlc_media_player_t *, con
* \param p_mediaplayer the media player
* \param p_mediaplayer the media player
* \param p_e an initialized exception pointer
* \param p_e an initialized exception pointer
*/
*/
VLC_PUBLIC_API
void
libvlc_toggle_teletext
(
libvlc_media_player_t
*
,
libvlc_exception_t
*
);
VLC_PUBLIC_API
void
libvlc_toggle_teletext
(
libvlc_media_player_t
*
);
/**
/**
* Get number of available video tracks.
* Get number of available video tracks.
...
@@ -720,7 +720,7 @@ VLC_PUBLIC_API void libvlc_toggle_teletext( libvlc_media_player_t *, libvlc_exce
...
@@ -720,7 +720,7 @@ VLC_PUBLIC_API void libvlc_toggle_teletext( libvlc_media_player_t *, libvlc_exce
* \param p_mi media player
* \param p_mi media player
* \return the number of available video tracks (int)
* \return the number of available video tracks (int)
*/
*/
VLC_PUBLIC_API
int
libvlc_video_get_track_count
(
libvlc_media_player_t
*
,
libvlc_exception_t
*
);
VLC_PUBLIC_API
int
libvlc_video_get_track_count
(
libvlc_media_player_t
*
);
/**
/**
* Get the description of available video tracks.
* Get the description of available video tracks.
...
@@ -730,7 +730,7 @@ VLC_PUBLIC_API int libvlc_video_get_track_count( libvlc_media_player_t *, libvlc
...
@@ -730,7 +730,7 @@ VLC_PUBLIC_API int libvlc_video_get_track_count( libvlc_media_player_t *, libvlc
* \return list with description of available video tracks, or NULL on error
* \return list with description of available video tracks, or NULL on error
*/
*/
VLC_PUBLIC_API
libvlc_track_description_t
*
VLC_PUBLIC_API
libvlc_track_description_t
*
libvlc_video_get_track_description
(
libvlc_media_player_t
*
,
libvlc_exception_t
*
);
libvlc_video_get_track_description
(
libvlc_media_player_t
*
);
/**
/**
* Get current video track.
* Get current video track.
...
...
src/control/video.c
View file @
618605e3
...
@@ -187,8 +187,7 @@ int libvlc_video_get_width( libvlc_media_player_t *p_mi,
...
@@ -187,8 +187,7 @@ int libvlc_video_get_width( libvlc_media_player_t *p_mi,
return
width
;
return
width
;
}
}
int
libvlc_media_player_has_vout
(
libvlc_media_player_t
*
p_mi
,
int
libvlc_media_player_has_vout
(
libvlc_media_player_t
*
p_mi
)
libvlc_exception_t
*
p_e
)
{
{
input_thread_t
*
p_input_thread
=
libvlc_get_input_thread
(
p_mi
);
input_thread_t
*
p_input_thread
=
libvlc_get_input_thread
(
p_mi
);
bool
has_vout
=
false
;
bool
has_vout
=
false
;
...
@@ -325,8 +324,7 @@ int libvlc_video_get_spu_count( libvlc_media_player_t *p_mi,
...
@@ -325,8 +324,7 @@ int libvlc_video_get_spu_count( libvlc_media_player_t *p_mi,
}
}
libvlc_track_description_t
*
libvlc_track_description_t
*
libvlc_video_get_spu_description
(
libvlc_media_player_t
*
p_mi
,
libvlc_video_get_spu_description
(
libvlc_media_player_t
*
p_mi
)
libvlc_exception_t
*
p_e
)
{
{
return
libvlc_get_track_description
(
p_mi
,
"spu-es"
);
return
libvlc_get_track_description
(
p_mi
,
"spu-es"
);
}
}
...
@@ -370,8 +368,7 @@ end:
...
@@ -370,8 +368,7 @@ end:
}
}
int
libvlc_video_set_subtitle_file
(
libvlc_media_player_t
*
p_mi
,
int
libvlc_video_set_subtitle_file
(
libvlc_media_player_t
*
p_mi
,
const
char
*
psz_subtitle
,
const
char
*
psz_subtitle
)
libvlc_exception_t
*
p_e
)
{
{
input_thread_t
*
p_input_thread
=
libvlc_get_input_thread
(
p_mi
);
input_thread_t
*
p_input_thread
=
libvlc_get_input_thread
(
p_mi
);
bool
b_ret
=
false
;
bool
b_ret
=
false
;
...
@@ -386,16 +383,14 @@ int libvlc_video_set_subtitle_file( libvlc_media_player_t *p_mi,
...
@@ -386,16 +383,14 @@ int libvlc_video_set_subtitle_file( libvlc_media_player_t *p_mi,
}
}
libvlc_track_description_t
*
libvlc_track_description_t
*
libvlc_video_get_title_description
(
libvlc_media_player_t
*
p_mi
,
libvlc_video_get_title_description
(
libvlc_media_player_t
*
p_mi
)
libvlc_exception_t
*
p_e
)
{
{
return
libvlc_get_track_description
(
p_mi
,
"title"
);
return
libvlc_get_track_description
(
p_mi
,
"title"
);
}
}
libvlc_track_description_t
*
libvlc_track_description_t
*
libvlc_video_get_chapter_description
(
libvlc_media_player_t
*
p_mi
,
libvlc_video_get_chapter_description
(
libvlc_media_player_t
*
p_mi
,
int
i_title
,
int
i_title
)
libvlc_exception_t
*
p_e
)
{
{
char
psz_title
[
12
];
char
psz_title
[
12
];
sprintf
(
psz_title
,
"title %2i"
,
i_title
);
sprintf
(
psz_title
,
"title %2i"
,
i_title
);
...
@@ -433,8 +428,7 @@ void libvlc_video_set_crop_geometry( libvlc_media_player_t *p_mi,
...
@@ -433,8 +428,7 @@ void libvlc_video_set_crop_geometry( libvlc_media_player_t *p_mi,
}
}
}
}
void
libvlc_toggle_teletext
(
libvlc_media_player_t
*
p_mi
,
void
libvlc_toggle_teletext
(
libvlc_media_player_t
*
p_mi
)
libvlc_exception_t
*
p_e
)
{
{
input_thread_t
*
p_input_thread
;
input_thread_t
*
p_input_thread
;
...
@@ -465,8 +459,7 @@ void libvlc_toggle_teletext( libvlc_media_player_t *p_mi,
...
@@ -465,8 +459,7 @@ void libvlc_toggle_teletext( libvlc_media_player_t *p_mi,
vlc_object_release
(
p_input_thread
);
vlc_object_release
(
p_input_thread
);
}
}
int
libvlc_video_get_track_count
(
libvlc_media_player_t
*
p_mi
,
int
libvlc_video_get_track_count
(
libvlc_media_player_t
*
p_mi
)
libvlc_exception_t
*
p_e
)
{
{
input_thread_t
*
p_input_thread
=
libvlc_get_input_thread
(
p_mi
);
input_thread_t
*
p_input_thread
=
libvlc_get_input_thread
(
p_mi
);
int
i_track_count
;
int
i_track_count
;
...
@@ -481,8 +474,7 @@ int libvlc_video_get_track_count( libvlc_media_player_t *p_mi,
...
@@ -481,8 +474,7 @@ int libvlc_video_get_track_count( libvlc_media_player_t *p_mi,
}
}
libvlc_track_description_t
*
libvlc_track_description_t
*
libvlc_video_get_track_description
(
libvlc_media_player_t
*
p_mi
,
libvlc_video_get_track_description
(
libvlc_media_player_t
*
p_mi
)
libvlc_exception_t
*
p_e
)
{
{
return
libvlc_get_track_description
(
p_mi
,
"video-es"
);
return
libvlc_get_track_description
(
p_mi
,
"video-es"
);
}
}
...
@@ -619,7 +611,7 @@ static vlc_object_t *get_object( libvlc_media_player_t * p_mi,
...
@@ -619,7 +611,7 @@ static vlc_object_t *get_object( libvlc_media_player_t * p_mi,
typedef
const
struct
{
typedef
const
struct
{
const
char
name
[
20
];
/* probably will become a const char * sometime */
const
char
name
[
20
];
/* probably will become a const char * sometime */
unsigned
type
;
unsigned
type
;
}
opt_t
;
}
opt_t
;
...
...
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