[vlc-devel] commit: Stick b_error to object types that actually use it ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Jan 28 21:19:12 2010 +0200| [ce67728ae1a0d91643e416b86efeab34a0891e35] | committer: Rémi Denis-Courmont 

Stick b_error to object types that actually use it

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

 include/vlc_codec.h                      |    1 +
 include/vlc_common.h                     |    1 -
 include/vlc_input.h                      |    1 +
 include/vlc_plugin.h                     |    4 ++--
 include/vlc_stream.h                     |    1 +
 include/vlc_vout.h                       |    1 +
 modules/access/rtmp/rtmp_amf_flv.h       |    1 +
 modules/stream_out/transcode/transcode.h |    1 +
 src/misc/objects.c                       |    1 -
 9 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/include/vlc_codec.h b/include/vlc_codec.h
index 1f9d6f0..9ddd6bc 100644
--- a/include/vlc_codec.h
+++ b/include/vlc_codec.h
@@ -56,6 +56,7 @@ struct decoder_t
     /* Module properties */
     module_t *          p_module;
     decoder_sys_t *     p_sys;
+    bool                b_error;
 
     /* Input format ie from demuxer (XXX: a lot of field could be invalid) */
     es_format_t         fmt_in;
diff --git a/include/vlc_common.h b/include/vlc_common.h
index 20d2232..b29b35c 100644
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -536,7 +536,6 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *,      /* variable's object */
     int  i_flags;                                                           \
                                                                             \
     /* Object properties */                                                 \
-    volatile bool b_error;                  /**< set by the object */ \
     volatile bool b_die;                   /**< set by the outside */ \
     bool b_force;      /**< set by the outside (eg. module_need()) */ \
                                                                             \
diff --git a/include/vlc_input.h b/include/vlc_input.h
index b25e76f..5eebb3b 100644
--- a/include/vlc_input.h
+++ b/include/vlc_input.h
@@ -267,6 +267,7 @@ struct input_thread_t
 {
     VLC_COMMON_MEMBERS
 
+    bool b_error;
     bool b_eof;
     bool b_preparsing;
     bool b_dead;
diff --git a/include/vlc_plugin.h b/include/vlc_plugin.h
index 8161b12..4b02f2b 100644
--- a/include/vlc_plugin.h
+++ b/include/vlc_plugin.h
@@ -120,8 +120,8 @@ enum vlc_module_properties
 /**
  * Current plugin ABI version
  */
-# define MODULE_SYMBOL 1_1_0e
-# define MODULE_SUFFIX "__1_1_0e"
+# define MODULE_SYMBOL 1_1_0f
+# define MODULE_SUFFIX "__1_1_0f"
 
 /*****************************************************************************
  * Add a few defines. You do not want to read this section. Really.
diff --git a/include/vlc_stream.h b/include/vlc_stream.h
index 35cfb35..4385078 100644
--- a/include/vlc_stream.h
+++ b/include/vlc_stream.h
@@ -52,6 +52,7 @@ typedef struct stream_text_t stream_text_t;
 struct stream_t
 {
     VLC_COMMON_MEMBERS
+    bool        b_error;
 
     /* Module properties for stream filter */
     module_t    *p_module;
diff --git a/include/vlc_vout.h b/include/vlc_vout.h
index 9c6f47e..3bc3127 100644
--- a/include/vlc_vout.h
+++ b/include/vlc_vout.h
@@ -108,6 +108,7 @@ typedef struct vout_thread_sys_t vout_thread_sys_t;
 struct vout_thread_t
 {
     VLC_COMMON_MEMBERS
+    bool                b_error;
 
     /** \name Thread properties and locks */
     /**@{*/
diff --git a/modules/access/rtmp/rtmp_amf_flv.h b/modules/access/rtmp/rtmp_amf_flv.h
index 43786ea..b04e361 100644
--- a/modules/access/rtmp/rtmp_amf_flv.h
+++ b/modules/access/rtmp/rtmp_amf_flv.h
@@ -53,6 +53,7 @@ struct rtmp_control_thread_t
     VLC_COMMON_MEMBERS
 
     int fd;
+    bool b_error;
 
     vlc_url_t url;
     char *psz_application;
diff --git a/modules/stream_out/transcode/transcode.h b/modules/stream_out/transcode/transcode.h
index 72b7120..23f9ab7 100644
--- a/modules/stream_out/transcode/transcode.h
+++ b/modules/stream_out/transcode/transcode.h
@@ -25,6 +25,7 @@ struct sout_stream_sys_t
     vlc_cond_t      cond;
     picture_t *     pp_pics[PICTURE_RING_SIZE];
     int             i_first_pic, i_last_pic;
+    bool            b_error;
 
     /* Audio */
     vlc_fourcc_t    i_acodec;   /* codec audio (0 if not transcode) */
diff --git a/src/misc/objects.c b/src/misc/objects.c
index d5c98c0..bde9328 100644
--- a/src/misc/objects.c
+++ b/src/misc/objects.c
@@ -128,7 +128,6 @@ void *__vlc_custom_create( vlc_object_t *p_this, size_t i_size,
     p_priv->psz_name = NULL;
 
     p_new->b_die = false;
-    p_new->b_error = false;
     p_new->b_force = false;
 
     p_new->psz_header = NULL;