set stream->dr_dts according to i_dts instead AV_NOPTS_VALUE; seems to

[vlc] / src / control / log.c

diff --git a/src/control/log.c b/src/control/log.c
index 93d000c62c4b905576bb2761d2a90a1e5065d430..2fcdbf0168c1ac9b96dc9cdaaa921209e625149a 100644 (file)
--- a/src/control/log.c
+++ b/src/control/log.c
@@ -3,7 +3,7 @@
  *****************************************************************************
  * Copyright (C) 2005 the VideoLAN team
  *
- * $Id: core.c 14187 2006-02-07 16:37:40Z courmisch $
+ * $Id$
  *
  * Authors: Damien Fouilleul <damienf@videolan.org>
  *
@@ -22,12 +22,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include <libvlc_internal.h>
+#include "libvlc_internal.h"
 #include <vlc/libvlc.h>
 
 struct libvlc_log_t
 {
-    const libvlc_instance_t  *p_instance;
+    libvlc_instance_t  *p_instance;
     msg_subscription_t *p_messages;
 };
 
@@ -58,9 +58,8 @@ void libvlc_set_log_verbosity( libvlc_instance_t *p_instance, unsigned level, li
         RAISEVOID("Invalid VLC instance!");
 }
 
-libvlc_log_t *libvlc_log_open( const libvlc_instance_t *p_instance, libvlc_exception_t *p_e )
+libvlc_log_t *libvlc_log_open( libvlc_instance_t *p_instance, libvlc_exception_t *p_e )
 {
-    
     struct libvlc_log_t *p_log =
         (struct libvlc_log_t *)malloc(sizeof(struct libvlc_log_t));
 
@@ -69,8 +68,13 @@ libvlc_log_t *libvlc_log_open( const libvlc_instance_t *p_instance, libvlc_excep
     p_log->p_instance = p_instance;
     p_log->p_messages = msg_Subscribe(p_instance->p_libvlc_int, MSG_QUEUE_NORMAL);
 
-    if( !p_log->p_messages ) RAISENULL( "Out of memory" );
+    if( !p_log->p_messages )
+    {
+        free( p_log );
+        RAISENULL( "Out of memory" );
+    }
 
+    libvlc_retain( p_instance );
     return p_log;
 }
 
@@ -79,6 +83,7 @@ void libvlc_log_close( libvlc_log_t *p_log, libvlc_exception_t *p_e )
     if( p_log && p_log->p_messages )
     {
         msg_Unsubscribe(p_log->p_instance->p_libvlc_int, p_log->p_messages);
+        libvlc_release( p_log->p_instance );
         free(p_log);
     }
     else
@@ -91,8 +96,11 @@ unsigned libvlc_log_count( const libvlc_log_t *p_log, libvlc_exception_t *p_e )
     {
         int i_start = p_log->p_messages->i_start;
         int i_stop  = *(p_log->p_messages->pi_stop);
-        
-        return i_stop - i_start % VLC_MSG_QSIZE;
+
+        if( i_stop >= i_start )
+            return i_stop-i_start;
+        else
+            return VLC_MSG_QSIZE-(i_start-i_stop);
     }
     RAISEZERO("Invalid log object!");
 }