[vlc-devel] commit: Only input uses b_dead ( Rémi Denis-Courmont )

git version control git at videolan.org
Sun Sep 14 13:39:12 CEST 2008


vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Sun Sep 14 14:42:23 2008 +0300| [36e37a19e99fff3c0dbfe83ab49f3efa6fa4de59] | committer: Rémi Denis-Courmont 

Only input uses b_dead

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=36e37a19e99fff3c0dbfe83ab49f3efa6fa4de59
---

 include/vlc_common.h |    1 -
 include/vlc_input.h  |    3 ++-
 src/misc/objects.c   |    1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 3190e66..1c2e806 100644
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -537,7 +537,6 @@ typedef struct vlc_object_internals_t vlc_object_internals_t;
     /* Object properties */                                                 \
     volatile bool b_error;                  /**< set by the object */ \
     volatile bool b_die;                   /**< set by the outside */ \
-    volatile bool b_dead;                   /**< set by the object */ \
     bool b_force;      /**< set by the outside (eg. module_Need()) */ \
                                                                             \
     /* Stuff related to the libvlc structure */                             \
diff --git a/include/vlc_input.h b/include/vlc_input.h
index 63debca..6eeeb05 100644
--- a/include/vlc_input.h
+++ b/include/vlc_input.h
@@ -439,8 +439,9 @@ struct input_thread_t
 {
     VLC_COMMON_MEMBERS;
 
-    bool  b_eof;
+    bool b_eof;
     bool b_preparsing;
+    bool b_dead;
 
     int i_state;
     bool b_can_pace_control;
diff --git a/src/misc/objects.c b/src/misc/objects.c
index bfd2061..b6fc4ff 100644
--- a/src/misc/objects.c
+++ b/src/misc/objects.c
@@ -126,7 +126,6 @@ void *__vlc_custom_create( vlc_object_t *p_this, size_t i_size,
 
     p_new->b_die = false;
     p_new->b_error = false;
-    p_new->b_dead = false;
     p_new->b_force = false;
 
     p_new->psz_header = NULL;




More information about the vlc-devel mailing list