Merge from 1.1.

--HG--
rename : src/xine-engine/xine_internal.h => include/xine/xine_internal.h

2 files changed, 8 insertions, 0 deletions

diff --git a/include/xine.h b/include/xine.h
index ba022c389..9df9fceae 100644
--- a/include/xine.h
+++ b/include/xine.h
@@ -802,6 +802,11 @@ void   xine_vlog(xine_t *self, int buf,
 /* get log messages of specified section */
 char *const *xine_get_log (xine_t *self, int buf) XINE_PROTECTED;
 
+/* log callback will be called whenever something is logged */
+typedef void (*xine_log_cb_t) (void *user_data, int section);
+void   xine_register_log_cb (xine_t *self, xine_log_cb_t cb,
+			     void *user_data) XINE_PROTECTED XINE_DEPRECATED;
+
 /*
  * error handling / engine status
  */
diff --git a/include/xine/xine_internal.h b/include/xine/xine_internal.h
index eecae9c30..b876030ee 100644
--- a/include/xine/xine_internal.h
+++ b/include/xine/xine_internal.h
@@ -98,6 +98,9 @@ struct xine_s {
 #ifdef XINE_ENGINE_INTERNAL
   xine_ticket_t             *port_ticket;
   pthread_mutex_t            log_lock;
+
+  xine_log_cb_t              log_cb;
+  void                      *log_cb_user_data;
 #endif
 };