[vlc-commits] libvlc: remove deprecated log stubs
Rémi Denis-Courmont
git at videolan.org
Thu May 3 14:28:27 CEST 2018
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu May 3 14:58:11 2018 +0300| [9db1189119291d7b73683857135059ede636536d] | committer: Rémi Denis-Courmont
libvlc: remove deprecated log stubs
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9db1189119291d7b73683857135059ede636536d
---
include/vlc/deprecated.h | 117 -----------------------------------------------
lib/libvlc.sym | 9 ----
lib/log.c | 58 -----------------------
3 files changed, 184 deletions(-)
diff --git a/include/vlc/deprecated.h b/include/vlc/deprecated.h
index 27323a4344..0e7986cc36 100644
--- a/include/vlc/deprecated.h
+++ b/include/vlc/deprecated.h
@@ -338,123 +338,6 @@ void libvlc_wait( libvlc_instance_t *p_instance );
/** @}*/
/**
- * \ingroup libvlc_core
- * \defgroup libvlc_log_deprecated LibVLC logging (legacy)
- * @{
- */
-
-/** This structure is opaque. It represents a libvlc log iterator */
-typedef struct libvlc_log_iterator_t libvlc_log_iterator_t;
-
-typedef struct libvlc_log_message_t
-{
- int i_severity; /* 0=INFO, 1=ERR, 2=WARN, 3=DBG */
- const char *psz_type; /* module type */
- const char *psz_name; /* module name */
- const char *psz_header; /* optional header */
- const char *psz_message; /* message */
-} libvlc_log_message_t;
-
-/**
- * Always returns minus one.
- * This function is only provided for backward compatibility.
- *
- * \param p_instance ignored
- * \return always -1
- */
-LIBVLC_DEPRECATED LIBVLC_API
-unsigned libvlc_get_log_verbosity( const libvlc_instance_t *p_instance );
-
-/**
- * This function does nothing.
- * It is only provided for backward compatibility.
- *
- * \param p_instance ignored
- * \param level ignored
- */
-LIBVLC_DEPRECATED LIBVLC_API
-void libvlc_set_log_verbosity( libvlc_instance_t *p_instance, unsigned level );
-
-/**
- * This function does nothing useful.
- * It is only provided for backward compatibility.
- *
- * \param p_instance libvlc instance
- * \return an unique pointer or NULL on error
- */
-LIBVLC_DEPRECATED LIBVLC_API
-libvlc_log_t *libvlc_log_open( libvlc_instance_t *p_instance );
-
-/**
- * Frees memory allocated by libvlc_log_open().
- *
- * \param p_log libvlc log instance or NULL
- */
-LIBVLC_DEPRECATED LIBVLC_API
-void libvlc_log_close( libvlc_log_t *p_log );
-
-/**
- * Always returns zero.
- * This function is only provided for backward compatibility.
- *
- * \param p_log ignored
- * \return always zero
- */
-LIBVLC_DEPRECATED LIBVLC_API
-unsigned libvlc_log_count( const libvlc_log_t *p_log );
-
-/**
- * This function does nothing.
- * It is only provided for backward compatibility.
- *
- * \param p_log ignored
- */
-LIBVLC_DEPRECATED LIBVLC_API
-void libvlc_log_clear( libvlc_log_t *p_log );
-
-/**
- * This function does nothing useful.
- * It is only provided for backward compatibility.
- *
- * \param p_log ignored
- * \return an unique pointer or NULL on error or if the parameter was NULL
- */
-LIBVLC_DEPRECATED LIBVLC_API
-libvlc_log_iterator_t *libvlc_log_get_iterator( const libvlc_log_t *p_log );
-
-/**
- * Frees memory allocated by libvlc_log_get_iterator().
- *
- * \param p_iter libvlc log iterator or NULL
- */
-LIBVLC_DEPRECATED LIBVLC_API
-void libvlc_log_iterator_free( libvlc_log_iterator_t *p_iter );
-
-/**
- * Always returns zero.
- * This function is only provided for backward compatibility.
- *
- * \param p_iter ignored
- * \return always zero
- */
-LIBVLC_DEPRECATED LIBVLC_API
-int libvlc_log_iterator_has_next( const libvlc_log_iterator_t *p_iter );
-
-/**
- * Always returns NULL.
- * This function is only provided for backward compatibility.
- *
- * \param p_iter libvlc log iterator or NULL
- * \param p_buf ignored
- * \return always NULL
- */
-LIBVLC_DEPRECATED LIBVLC_API
-libvlc_log_message_t *libvlc_log_iterator_next( libvlc_log_iterator_t *p_iter,
- libvlc_log_message_t *p_buf );
-
-/** @}*/
-
-/**
* \ingroup libvlc
* \defgroup libvlc_playlist LibVLC playlist (legacy)
* @deprecated Use @ref libvlc_media_list instead.
diff --git a/lib/libvlc.sym b/lib/libvlc.sym
index 482d95f6f1..bcd2ca9579 100644
--- a/lib/libvlc.sym
+++ b/lib/libvlc.sym
@@ -60,21 +60,12 @@ libvlc_get_changeset
libvlc_get_compiler
libvlc_get_fullscreen
libvlc_get_input_thread
-libvlc_get_log_verbosity
libvlc_get_version
libvlc_log_get_context
libvlc_log_get_object
libvlc_log_set
libvlc_log_set_file
libvlc_log_unset
-libvlc_log_clear
-libvlc_log_close
-libvlc_log_count
-libvlc_log_get_iterator
-libvlc_log_iterator_free
-libvlc_log_iterator_has_next
-libvlc_log_iterator_next
-libvlc_log_open
libvlc_media_add_option
libvlc_media_add_option_flag
libvlc_media_discoverer_event_manager
diff --git a/lib/log.c b/lib/log.c
index f3a769a9ba..f54328840b 100644
--- a/lib/log.c
+++ b/lib/log.c
@@ -107,61 +107,3 @@ void libvlc_log_set_file (libvlc_instance_t *inst, FILE *stream)
{
libvlc_log_set (inst, libvlc_log_file, stream);
}
-
-/*** Stubs for the old interface ***/
-unsigned libvlc_get_log_verbosity( const libvlc_instance_t *p_instance )
-{
- (void) p_instance;
- return -1;
-}
-
-void libvlc_set_log_verbosity( libvlc_instance_t *p_instance, unsigned level )
-{
- (void) p_instance;
- (void) level;
-}
-
-libvlc_log_t *libvlc_log_open( libvlc_instance_t *p_instance )
-{
- (void) p_instance;
- return malloc(sizeof(libvlc_log_t));
-}
-
-void libvlc_log_close( libvlc_log_t *p_log )
-{
- free(p_log);
-}
-
-unsigned libvlc_log_count( const libvlc_log_t *p_log )
-{
- (void) p_log;
- return 0;
-}
-
-void libvlc_log_clear( libvlc_log_t *p_log )
-{
- (void) p_log;
-}
-
-libvlc_log_iterator_t *libvlc_log_get_iterator( const libvlc_log_t *p_log )
-{
- return (p_log != NULL) ? malloc(1) : NULL;
-}
-
-void libvlc_log_iterator_free( libvlc_log_iterator_t *p_iter )
-{
- free( p_iter );
-}
-
-int libvlc_log_iterator_has_next( const libvlc_log_iterator_t *p_iter )
-{
- (void) p_iter;
- return 0;
-}
-
-libvlc_log_message_t *libvlc_log_iterator_next( libvlc_log_iterator_t *p_iter,
- libvlc_log_message_t *buffer )
-{
- (void) p_iter; (void) buffer;
- return NULL;
-}
More information about the vlc-commits
mailing list