[vlc-devel] commit: Remove unused exception from video.c (Hugo Beauzee-Luyssen )
git version control
git at videolan.org
Sun Jan 31 20:15:00 CET 2010
vlc | branch: master | Hugo Beauzee-Luyssen <beauze.h at gmail.com> | Sun Jan 31 20:05:24 2010 +0100| [618605e3423f647ccbab98a12d4c6827b5572120] | committer: Rémi Denis-Courmont
Remove unused exception from video.c
Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=618605e3423f647ccbab98a12d4c6827b5572120
---
include/vlc/libvlc_media_player.h | 16 ++++++++--------
src/control/video.c | 26 +++++++++-----------------
2 files changed, 17 insertions(+), 25 deletions(-)
diff --git a/include/vlc/libvlc_media_player.h b/include/vlc/libvlc_media_player.h
index 6a1dd77..fd97ff3 100644
--- a/include/vlc/libvlc_media_player.h
+++ b/include/vlc/libvlc_media_player.h
@@ -448,7 +448,7 @@ VLC_PUBLIC_API float libvlc_media_player_get_fps( libvlc_media_player_t * );
*
* \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?
@@ -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
*/
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.
@@ -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
* \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.
@@ -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
*/
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.
@@ -686,7 +686,7 @@ VLC_PUBLIC_API libvlc_track_description_t *
* \return list containing description of available chapter for title i_title
*/
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.
@@ -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_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.
@@ -720,7 +720,7 @@ VLC_PUBLIC_API void libvlc_toggle_teletext( libvlc_media_player_t *, libvlc_exce
* \param p_mi media player
* \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.
@@ -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
*/
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.
diff --git a/src/control/video.c b/src/control/video.c
index 7e07044..12d365f 100644
--- a/src/control/video.c
+++ b/src/control/video.c
@@ -187,8 +187,7 @@ int libvlc_video_get_width( libvlc_media_player_t *p_mi,
return width;
}
-int libvlc_media_player_has_vout( libvlc_media_player_t *p_mi,
- libvlc_exception_t *p_e )
+int libvlc_media_player_has_vout( libvlc_media_player_t *p_mi )
{
input_thread_t *p_input_thread = libvlc_get_input_thread(p_mi);
bool has_vout = false;
@@ -325,8 +324,7 @@ int libvlc_video_get_spu_count( libvlc_media_player_t *p_mi,
}
libvlc_track_description_t *
- libvlc_video_get_spu_description( libvlc_media_player_t *p_mi,
- libvlc_exception_t *p_e )
+ libvlc_video_get_spu_description( libvlc_media_player_t *p_mi )
{
return libvlc_get_track_description( p_mi, "spu-es" );
}
@@ -370,8 +368,7 @@ end:
}
int libvlc_video_set_subtitle_file( libvlc_media_player_t *p_mi,
- const char *psz_subtitle,
- libvlc_exception_t *p_e )
+ const char *psz_subtitle )
{
input_thread_t *p_input_thread = libvlc_get_input_thread ( p_mi );
bool b_ret = false;
@@ -386,16 +383,14 @@ int libvlc_video_set_subtitle_file( libvlc_media_player_t *p_mi,
}
libvlc_track_description_t *
- libvlc_video_get_title_description( libvlc_media_player_t *p_mi,
- libvlc_exception_t * p_e )
+ libvlc_video_get_title_description( libvlc_media_player_t *p_mi )
{
return libvlc_get_track_description( p_mi, "title" );
}
libvlc_track_description_t *
libvlc_video_get_chapter_description( libvlc_media_player_t *p_mi,
- int i_title,
- libvlc_exception_t *p_e )
+ int i_title )
{
char psz_title[12];
sprintf( psz_title, "title %2i", i_title );
@@ -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,
- libvlc_exception_t *p_e )
+void libvlc_toggle_teletext( libvlc_media_player_t *p_mi )
{
input_thread_t *p_input_thread;
@@ -465,8 +459,7 @@ void libvlc_toggle_teletext( libvlc_media_player_t *p_mi,
vlc_object_release( p_input_thread );
}
-int libvlc_video_get_track_count( libvlc_media_player_t *p_mi,
- libvlc_exception_t *p_e )
+int libvlc_video_get_track_count( libvlc_media_player_t *p_mi )
{
input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi );
int i_track_count;
@@ -481,8 +474,7 @@ int libvlc_video_get_track_count( libvlc_media_player_t *p_mi,
}
libvlc_track_description_t *
- libvlc_video_get_track_description( libvlc_media_player_t *p_mi,
- libvlc_exception_t *p_e )
+ libvlc_video_get_track_description( libvlc_media_player_t *p_mi )
{
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,
typedef const struct {
const char name[20]; /* probably will become a const char * sometime */
- unsigned type;
+ unsigned type;
} opt_t;
More information about the vlc-devel
mailing list