Merge branch 'master' of git@git.videolan.org:vlc

[vlc] / modules / access / vcdx / info.c

diff --git a/modules/access/vcdx/info.c b/modules/access/vcdx/info.c
index 3824548630f35dc09824fbdb9d62a9f8d9a619a5..ca4a9ef89155f1793c958eac64a3f1cd509a7fcb 100644 (file)
--- a/modules/access/vcdx/info.c
+++ b/modules/access/vcdx/info.c
@@ -21,6 +21,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
 #include <vlc_input.h>
 #include <vlc_access.h>
@@ -192,7 +196,7 @@ VCDMetaInfo( access_t *p_access, /*const*/ char *psz_mrl )
         strncat(tp, str, TEMP_STR_LEN-(tp-temp_str));           \
         tp += len;                           \
       }                                                        \
-      saw_control_prefix = VLC_FALSE;                   \
+      saw_control_prefix = false;                   \
     }                                   \
   }
 
@@ -207,7 +211,7 @@ VCDMetaInfo( access_t *p_access, /*const*/ char *psz_mrl )
       strncat(tp, num_str, TEMP_STR_LEN-(tp-temp_str));        \
       tp += len;                           \
     }                                   \
-    saw_control_prefix = VLC_FALSE;                                \
+    saw_control_prefix = false;                                \
   }
 
 /*!
@@ -242,7 +246,7 @@ VCDFormatStr(const access_t *p_access, vcdplayer_t *p_vcdplayer,
   static char    temp_str[TEMP_STR_SIZE];
   size_t         i;
   char *         tp = temp_str;
-  vlc_bool_t     saw_control_prefix = VLC_FALSE;
+  bool     saw_control_prefix = false;
   size_t         format_len = strlen(format_str);
 
   memset(temp_str, 0, TEMP_STR_SIZE);
@@ -251,7 +255,7 @@ VCDFormatStr(const access_t *p_access, vcdplayer_t *p_vcdplayer,
 
     if (!saw_control_prefix && format_str[i] != '%') {
       *tp++ = format_str[i];
-      saw_control_prefix = VLC_FALSE;
+      saw_control_prefix = false;
       continue;
     }
 
@@ -306,7 +310,7 @@ VCDFormatStr(const access_t *p_access, vcdplayer_t *p_vcdplayer,
           /* What to do? */
           ;
         }
-        saw_control_prefix = VLC_FALSE;
+        saw_control_prefix = false;
       }
       break;
 
@@ -317,7 +321,7 @@ VCDFormatStr(const access_t *p_access, vcdplayer_t *p_vcdplayer,
         strncat(tp, num_str, TEMP_STR_LEN-(tp-temp_str));
         tp += strlen(num_str);
       }
-      saw_control_prefix = VLC_FALSE;
+      saw_control_prefix = false;
       break;
 
     case 'M':
@@ -345,7 +349,7 @@ VCDFormatStr(const access_t *p_access, vcdplayer_t *p_vcdplayer,
         strncat(tp, seg_type_str, TEMP_STR_LEN-(tp-temp_str));
         tp += strlen(seg_type_str);
       }
-      saw_control_prefix = VLC_FALSE;
+      saw_control_prefix = false;
       break;
 
     case 'T':
@@ -363,7 +367,7 @@ VCDFormatStr(const access_t *p_access, vcdplayer_t *p_vcdplayer,
     default:
       *tp++ = '%';
       *tp++ = format_str[i];
-      saw_control_prefix = VLC_FALSE;
+      saw_control_prefix = false;
     }
   }
   return strdup(temp_str);