Stick b_error to object types that actually use it

diff --git a/include/vlc_codec.h b/include/vlc_codec.h
index 1f9d6f0924305e03ab1cb58521d7f432df527d96..9ddd6bc94d382d774231dabb286229be5d4acd6d 100644 (file)
--- 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 20d2232971be34a4ea792c6ddad7f154e252a2e8..b29b35c9f9da6292ec2fc26544352b48ce92e24c 100644 (file)
--- 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 b25e76f63b3c3400af9f71a57f8b42f58cb84f24..5eebb3bbd29caf09b0cdc96d70f60badc0ad7371 100644 (file)
--- 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 8161b126094d289441ad5b84d03c2ff3f0a5216e..4b02f2bf4fb8cb4da268b48dee870675372cf3f6 100644 (file)
--- 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 35cfb35c58ca23812a2046daf90fb16b4d1b24ab..43850782262bbf8c1d6c2ae5179f1137dad261dc 100644 (file)
--- 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 9c6f47e2fb3b834332262e65b31aee1fc8007576..3bc312750bac6c3b07dbc17904260967c4f49235 100644 (file)
--- 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 43786ea7eb60dddde62c574bdab318857cb2612a..b04e3610eac03f33e579faa17a790fef05ca92fc 100644 (file)
--- 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 72b712068ff9182b3700545ce3f0cb3c2b9adb76..23f9ab75e6496332ec671f35c5347214428b63e7 100644 (file)
--- 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 d5c98c00f64a8ba0e5ea059a48f052c6870b8633..bde93285e2461c5f2bbc35182a9861c8b6d732e6 100644 (file)
--- 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;