From 7db94f4d2fc742537828fbe0c8eb5a6612601749 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sun, 24 Jan 2010 11:31:15 +0200 Subject: [PATCH] Do not export unimplemented functions --- include/vlc/libvlc_media_library.h | 10 ---- include/vlc/libvlc_media_player.h | 18 ------- src/control/media_library.c | 13 ----- src/control/video.c | 84 ------------------------------ src/libvlc.sym | 3 -- 5 files changed, 128 deletions(-) diff --git a/include/vlc/libvlc_media_library.h b/include/vlc/libvlc_media_library.h index 5325d5d58a..2141ce078b 100644 --- a/include/vlc/libvlc_media_library.h +++ b/include/vlc/libvlc_media_library.h @@ -86,16 +86,6 @@ VLC_PUBLIC_API void libvlc_media_library_load( libvlc_media_library_t * p_mlib, libvlc_exception_t * p_e ); -/** - * Save media library. - * - * \param p_mlib media library object - * \param p_e an initialized exception object. - */ -VLC_PUBLIC_API void - libvlc_media_library_save( libvlc_media_library_t * p_mlib, - libvlc_exception_t * p_e ); - /** * Get media library subitems. * diff --git a/include/vlc/libvlc_media_player.h b/include/vlc/libvlc_media_player.h index d91551dd06..e72b59145b 100644 --- a/include/vlc/libvlc_media_player.h +++ b/include/vlc/libvlc_media_player.h @@ -743,24 +743,6 @@ VLC_PUBLIC_API void libvlc_video_set_crop_geometry( libvlc_media_player_t *, con */ VLC_PUBLIC_API void libvlc_toggle_teletext( libvlc_media_player_t *, libvlc_exception_t * ); -/** - * Get current teletext page requested. - * - * \param p_mediaplayer the media player - * \param p_e an initialized exception pointer - * \return the current teletext page requested. - */ -VLC_PUBLIC_API int libvlc_video_get_teletext( libvlc_media_player_t *, libvlc_exception_t * ); - -/** - * Set new teletext page to retrieve. - * - * \param p_mediaplayer the media player - * \param i_page teletex page number requested - * \param p_e an initialized exception pointer - */ -VLC_PUBLIC_API void libvlc_video_set_teletext( libvlc_media_player_t *, int, libvlc_exception_t * ); - /** * Get number of available video tracks. * diff --git a/src/control/media_library.c b/src/control/media_library.c index 9b4d63012e..041a2412d1 100644 --- a/src/control/media_library.c +++ b/src/control/media_library.c @@ -60,7 +60,6 @@ libvlc_media_library_t * libvlc_media_library_new( libvlc_instance_t * p_inst, libvlc_exception_t * p_e ) { - (void)p_e; libvlc_media_library_t * p_mlib; p_mlib = malloc(sizeof(libvlc_media_library_t)); @@ -136,18 +135,6 @@ libvlc_media_library_load( libvlc_media_library_t * p_mlib, return; } -/************************************************************************** - * save (Public) - **************************************************************************/ -void -libvlc_media_library_save( libvlc_media_library_t * p_mlib, - libvlc_exception_t * p_e ) -{ - (void)p_mlib; - libvlc_exception_raise( p_e ); - libvlc_printerr( "Function not implemented" ); -} - /************************************************************************** * media_list (Public) **************************************************************************/ diff --git a/src/control/video.c b/src/control/video.c index 9fe1be5d07..9fbe65681a 100644 --- a/src/control/video.c +++ b/src/control/video.c @@ -414,61 +414,6 @@ void libvlc_video_set_crop_geometry( libvlc_media_player_t *p_mi, } } -int libvlc_video_get_teletext( libvlc_media_player_t *p_mi, - libvlc_exception_t *p_e ) -{ -#if 0 - vout_thread_t *p_vout = GetVout( p_mi, p_e ); - vlc_object_t *p_vbi; - int i_ret = -1; - - if( !p_vout ) return i_ret; - - p_vbi = (vlc_object_t *) vlc_object_find_name( p_vout, "zvbi", - FIND_CHILD ); - if( p_vbi ) - { - i_ret = var_GetInteger( p_vbi, "vbi-page" ); - vlc_object_release( p_vbi ); - } - - vlc_object_release( p_vout ); - return i_ret; -#else - VLC_UNUSED( p_mi ); - VLC_UNUSED( p_e ); - return -1; -#endif -} - -void libvlc_video_set_teletext( libvlc_media_player_t *p_mi, int i_page, - libvlc_exception_t *p_e ) -{ -#if 0 - vout_thread_t *p_vout = GetVout( p_mi, p_e ); - vlc_object_t *p_vbi; - int i_ret = -1; - - if( !p_vout ) return; - - p_vbi = (vlc_object_t *) vlc_object_find_name( p_vout, "zvbi", - FIND_CHILD ); - if( p_vbi ) - { - i_ret = var_SetInteger( p_vbi, "vbi-page", i_page ); - vlc_object_release( p_vbi ); - if( i_ret ) - libvlc_exception_raise( p_e, - "Unexpected error while setting teletext page" ); - } - vlc_object_release( p_vout ); -#else - VLC_UNUSED( p_mi ); - VLC_UNUSED( p_e ); - VLC_UNUSED( i_page ); -#endif -} - void libvlc_toggle_teletext( libvlc_media_player_t *p_mi, libvlc_exception_t *p_e ) { @@ -483,35 +428,6 @@ void libvlc_toggle_teletext( libvlc_media_player_t *p_mi, return; } const bool b_selected = var_GetInteger( p_input_thread, "teletext-es" ) >= 0; -#if 0 - int i_ret; - vlc_object_t *p_vbi; - p_vbi = (vlc_object_t *)vlc_object_find_name( p_input_thread, "zvbi", - FIND_CHILD ); - if( p_vbi ) - { - if( b_selected ) - { - /* FIXME Gni, why that ? */ - i_ret = var_SetInteger( p_vbi, "vbi-page", - var_GetInteger( p_vbi, "vbi-page" ) ); - if( i_ret ) - libvlc_exception_raise( p_e, - "Unexpected error while setting teletext page" ); - } - else - { - /* FIXME Gni^2 */ - i_ret = var_SetBool( p_vbi, "vbi-opaque", - !var_GetBool( p_vbi, "vbi-opaque" ) ); - if( i_ret ) - libvlc_exception_raise( p_e, - "Unexpected error while setting teletext transparency" ); - } - vlc_object_release( p_vbi ); - } - else -#endif if( b_selected ) { var_SetInteger( p_input_thread, "spu-es", -1 ); diff --git a/src/libvlc.sym b/src/libvlc.sym index 5183ed30ba..b4d2555740 100644 --- a/src/libvlc.sym +++ b/src/libvlc.sym @@ -73,7 +73,6 @@ libvlc_media_library_media_list libvlc_media_library_new libvlc_media_library_release libvlc_media_library_retain -libvlc_media_library_save libvlc_media_list_add_file_content libvlc_media_list_add_media libvlc_media_list_count @@ -194,7 +193,6 @@ libvlc_video_get_scale libvlc_video_get_spu libvlc_video_get_spu_count libvlc_video_get_spu_description -libvlc_video_get_teletext libvlc_video_get_title_description libvlc_video_get_track libvlc_video_get_track_count @@ -212,7 +210,6 @@ libvlc_video_set_mouse_input libvlc_video_set_scale libvlc_video_set_spu libvlc_video_set_subtitle_file -libvlc_video_set_teletext libvlc_video_set_track libvlc_video_take_snapshot libvlc_vlm_add_broadcast -- 2.39.2