X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fvcdx%2Finfo.c;h=79ef1f2ab319bc57937deee05587c3d40ea8aeae;hb=37708112ca12f0bacbed99fc5a1a7e774b7a8511;hp=88b55ba1eafe4f87f8050f9c4b21d77296194c84;hpb=99fab9089e9e1709d9c3a4bc5ced0c137ac59134;p=vlc

diff --git a/modules/access/vcdx/info.c b/modules/access/vcdx/info.c
index 88b55ba1ea..79ef1f2ab3 100644
--- a/modules/access/vcdx/info.c
+++ b/modules/access/vcdx/info.c
@@ -25,11 +25,10 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_input.h>
 #include <vlc_access.h>
 #include "vcd.h"
-#include <vlc_playlist.h>
 #include <vlc_keys.h>
 #include "info.h"
 
@@ -196,7 +195,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;                   \
     }                                   \
   }
 
@@ -211,7 +210,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;                                \
   }
 
 /*!
@@ -246,7 +245,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);
@@ -255,7 +254,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;
     }
 
@@ -310,7 +309,7 @@ VCDFormatStr(const access_t *p_access, vcdplayer_t *p_vcdplayer,
           /* What to do? */
           ;
         }
-        saw_control_prefix = VLC_FALSE;
+        saw_control_prefix = false;
       }
       break;
 
@@ -321,7 +320,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':
@@ -349,7 +348,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':
@@ -367,7 +366,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);