diff options
| -rw-r--r-- | include/xine.h.tmpl.in | 53 | ||||
| -rw-r--r-- | src/xine-engine/xine.c | 10 | ||||
| -rw-r--r-- | src/xine-engine/xine_internal.h | 14 |
3 files changed, 15 insertions, 62 deletions
diff --git a/include/xine.h.tmpl.in b/include/xine.h.tmpl.in index b764553ad..488770c08 100644 --- a/include/xine.h.tmpl.in +++ b/include/xine.h.tmpl.in @@ -28,7 +28,7 @@ \endverbatim */ /* - * $Id: xine.h.tmpl.in,v 1.87 2002/03/16 13:33:47 esnel Exp $ + * $Id: xine.h.tmpl.in,v 1.88 2002/03/18 19:34:16 guenter Exp $ * */ @@ -1854,65 +1854,18 @@ osd_renderer_t *xine_get_osd_renderer (xine_t *self); * \defgroup log_group Logging section * @{ */ - /** - * \defgroup log_def log defines. - * @{ - */ -/** - * \def XINE_LOG_MSG - * \sa xine_log() -*/ -#define XINE_LOG_MSG 0 -/** - * \def XINE_LOG_INPUT - * \sa xine_log() -*/ -#define XINE_LOG_INPUT 1 -/** - * \def XINE_LOG_DEMUX - * \sa xine_log() -*/ -#define XINE_LOG_DEMUX 2 -/** - * \def XINE_LOG_CODEC - * \sa xine_log() -*/ -#define XINE_LOG_CODEC 3 -/** - * \def XINE_LOG_VIDEO - * \sa xine_log() -*/ -#define XINE_LOG_VIDEO 4 -/** - * \def XINE_LOG_METRONOM - * \sa xine_log() -*/ -#define XINE_LOG_METRONOM 5 -/** - * \def XINE_LOG_PLUGIN - * \sa xine_log() -*/ -#define XINE_LOG_PLUGIN 6 -/** - * \def XINE_LOG_NUM - * number of log buffers defined * - * \sa xine_log() -*/ -#define XINE_LOG_NUM 7 - - /** @} end of log_def */ /** * \fn unsigned int xine_get_log_section_count(void) * \brief return number of available buffers. * \sa xine_get_log_names(), xine_log(), xine_get_log() */ -unsigned int xine_get_log_section_count(void); +int xine_get_log_section_count(xine_t *self); /** * \fn const char **xine_get_log_names(void) * \brief return a NULL terminated array of log sections names. * \sa xine_get_log_section_count(), xine_log(), xine_get_log() */ -const char **xine_get_log_names(void); +char **xine_get_log_names(xine_t *self); /** * \fn void xine_log (xine_t *self, int buf, const char *format, ...) * \param self xine object. diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c index 4f18d5dac..f69b944e8 100644 --- a/src/xine-engine/xine.c +++ b/src/xine-engine/xine.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine.c,v 1.110 2002/03/18 10:52:39 guenter Exp $ + * $Id: xine.c,v 1.111 2002/03/18 19:34:17 guenter Exp $ * * top-level xine functions * @@ -854,15 +854,15 @@ osd_renderer_t *xine_get_osd_renderer (xine_t *this) { /* * log functions */ -unsigned int xine_get_log_section_count(void) { +int xine_get_log_section_count (xine_t *this) { return XINE_LOG_NUM; } -const char **xine_get_log_names(void) { - static const char *log_sections[XINE_LOG_NUM + 1]; +char **xine_get_log_names (xine_t *this) { + static char *log_sections[XINE_LOG_NUM + 1]; - log_sections[XINE_LOG_MSG] = _("messages"); log_sections[XINE_LOG_FORMAT] = _("stream format"); + log_sections[XINE_LOG_MSG] = _("messages"); log_sections[XINE_LOG_PLUGIN] = _("plugin"); log_sections[XINE_LOG_NUM] = NULL; diff --git a/src/xine-engine/xine_internal.h b/src/xine-engine/xine_internal.h index be68a092d..7e7f375b1 100644 --- a/src/xine-engine/xine_internal.h +++ b/src/xine-engine/xine_internal.h @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine_internal.h,v 1.73 2002/03/12 19:51:29 guenter Exp $ + * $Id: xine_internal.h,v 1.74 2002/03/18 19:34:17 guenter Exp $ * */ @@ -138,8 +138,8 @@ struct audio_decoder_s { /* * log output */ -#define XINE_LOG_MSG 0 /* warnings, errors, ... */ -#define XINE_LOG_FORMAT 1 /* stream format, decoders, video size... */ +#define XINE_LOG_FORMAT 0 /* stream format, decoders, video size... */ +#define XINE_LOG_MSG 1 /* warnings, errors, ... */ #define XINE_LOG_PLUGIN 2 #define XINE_LOG_NUM 3 /* # of log buffers defined */ @@ -593,11 +593,11 @@ osd_renderer_t *xine_get_osd_renderer (xine_t *this); * xine log functions */ -const char **xine_get_log_names(void); - -void xine_log (xine_t *this, int buf, const char *format, ...); - +char **xine_get_log_names (xine_t *this); +void xine_log (xine_t *this, int buf, const char *format, ...); char **xine_get_log (xine_t *this, int buf); +int xine_get_log_section_count (xine_t *this); + /* * xine error reporting |