Split file path functions out of vlc_charset.h into vlc_fs.h

diff --git a/include/vlc_charset.h b/include/vlc_charset.h
index 8e2955db7aaf38e86288ccbf0993d82ade21bc3f..aaa9d58a6526d891d5a8cd10524a7debd10b24dd 100644 (file)
--- a/include/vlc_charset.h
+++ b/include/vlc_charset.h
@@ -2,7 +2,7 @@
  * charset.h: Unicode UTF-8 wrappers function
  *****************************************************************************
  * Copyright (C) 2003-2005 the VideoLAN team
- * Copyright © 2005-2006 Rémi Denis-Courmont
+ * Copyright © 2005-2010 Rémi Denis-Courmont
  * $Id$
  *
  * Author: Rémi Denis-Courmont <rem # videolan,org>
@@ -31,8 +31,6 @@
  */
 
 #include <stdarg.h>
-#include <sys/types.h>
-#include <dirent.h>
 
 VLC_EXPORT( void, LocaleFree, ( const char * ) );
 VLC_EXPORT( char *, FromLocale, ( const char * ) LIBVLC_USED );
@@ -40,29 +38,9 @@ VLC_EXPORT( char *, FromLocaleDup, ( const char * ) LIBVLC_USED );
 VLC_EXPORT( char *, ToLocale, ( const char * ) LIBVLC_USED );
 VLC_EXPORT( char *, ToLocaleDup, ( const char * ) LIBVLC_USED );
 
-/* TODO: move all of this to "vlc_fs.h" or something like that */
-VLC_EXPORT( int, utf8_open, ( const char *filename, int flags, ... ) LIBVLC_USED );
-VLC_EXPORT( FILE *, utf8_fopen, ( const char *filename, const char *mode ) LIBVLC_USED );
-VLC_EXPORT( DIR *, utf8_opendir, ( const char *dirname ) LIBVLC_USED );
-VLC_EXPORT( char *, utf8_readdir, ( DIR *dir ) LIBVLC_USED );
-VLC_EXPORT( int, utf8_loaddir, ( DIR *dir, char ***namelist, int (*select)( const char * ), int (*compar)( const char **, const char ** ) ) );
-VLC_EXPORT( int, utf8_scandir, ( const char *dirname, char ***namelist, int (*select)( const char * ), int (*compar)( const char **, const char ** ) ) );
-VLC_EXPORT( int, utf8_mkdir, ( const char *filename, mode_t mode ) );
-VLC_EXPORT( int, utf8_unlink, ( const char *filename ) );
-int utf8_rename( const char *, const char * );
-
-#if defined( WIN32 ) && !defined( UNDER_CE )
-# define stat _stati64
-#endif
-
-VLC_EXPORT( int, utf8_stat, ( const char *filename, struct stat *buf ) );
-VLC_EXPORT( int, utf8_lstat, ( const char *filename, struct stat *buf ) );
-
 VLC_EXPORT( int, utf8_vfprintf, ( FILE *stream, const char *fmt, va_list ap ) );
 VLC_EXPORT( int, utf8_fprintf, ( FILE *, const char *, ... ) LIBVLC_FORMAT( 2, 3 ) );
 
-VLC_EXPORT( int, utf8_mkstemp, ( char * ) );
-
 VLC_EXPORT( char *, EnsureUTF8, ( char * ) );
 VLC_EXPORT( const char *, IsUTF8, ( const char * ) LIBVLC_USED );
 

diff --git a/include/vlc_fs.h b/include/vlc_fs.h
new file mode 100644 (file)
index 0000000..c2aa266
--- /dev/null
+++ b/include/vlc_fs.h
@@ -0,0 +1,56 @@
+/*****************************************************************************
+ * vlc_fs.h: File system helpers
+ *****************************************************************************
+ * Copyright © 2006-2010 Rémi Denis-Courmont
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#ifndef VLC_FS_H
+#define VLC_FS_H 1
+
+/**
+ * \file
+ * Those functions convert file paths from UTF-8 to the system-specific
+ * encoding (especially UTF-16 on Windows). Also, they always mark file
+ * descriptor with the close-on-exec flag.
+ */
+
+#include <sys/types.h>
+#include <dirent.h>
+
+VLC_EXPORT( int, utf8_open, ( const char *filename, int flags, ... ) LIBVLC_USED );
+VLC_EXPORT( FILE *, utf8_fopen, ( const char *filename, const char *mode ) LIBVLC_USED );
+
+VLC_EXPORT( DIR *, utf8_opendir, ( const char *dirname ) LIBVLC_USED );
+VLC_EXPORT( char *, utf8_readdir, ( DIR *dir ) LIBVLC_USED );
+VLC_EXPORT( int, utf8_loaddir, ( DIR *dir, char ***namelist, int (*select)( const char * ), int (*compar)( const char **, const char ** ) ) );
+VLC_EXPORT( int, utf8_scandir, ( const char *dirname, char ***namelist, int (*select)( const char * ), int (*compar)( const char **, const char ** ) ) );
+VLC_EXPORT( int, utf8_mkdir, ( const char *filename, mode_t mode ) );
+
+VLC_EXPORT( int, utf8_unlink, ( const char *filename ) );
+/* Not exported */
+int utf8_rename( const char *, const char * );
+
+#if defined( WIN32 ) && !defined( UNDER_CE )
+# define stat _stati64
+#endif
+
+VLC_EXPORT( int, utf8_stat, ( const char *filename, struct stat *buf ) );
+VLC_EXPORT( int, utf8_lstat, ( const char *filename, struct stat *buf ) );
+
+VLC_EXPORT( int, utf8_mkstemp, ( char * ) );
+
+#endif

diff --git a/modules/access/bd/bd.c b/modules/access/bd/bd.c
index 5c61970e1720861f8e057df8b21346b4538dcd7e..b1fdb53b91af4908e6ec5720dd4f67a754ac0aab 100644 (file)
--- a/modules/access/bd/bd.c
+++ b/modules/access/bd/bd.c
@@ -39,7 +39,7 @@
 #include <vlc_input.h>
 #include <vlc_access.h>
 #include <vlc_demux.h>
-#include <vlc_charset.h>
+#include <vlc_fs.h>
 #include <vlc_bits.h>
 #include <assert.h>
 

diff --git a/modules/access/dc1394.c b/modules/access/dc1394.c
index 4fe11a763a2e82e50c02fa055891397d6e51a6a6..d6d305bdcdf69a5a6382b16ad14a6936be606399 100644 (file)
--- a/modules/access/dc1394.c
+++ b/modules/access/dc1394.c
@@ -36,7 +36,7 @@
 #include <vlc_plugin.h>
 #include <vlc_input.h>
 #include <vlc_demux.h>
-#include <vlc_charset.h>
+#include <vlc_fs.h>
 #include <vlc_picture.h>
 
 #ifdef HAVE_FCNTL_H

diff --git a/modules/access/directory.c b/modules/access/directory.c
index 2e1d75a6453b1211e9f826d0568effbd82efd588..2c550821161e891bb90ee9168c7b90d90bebb15c 100644 (file)
--- a/modules/access/directory.c
+++ b/modules/access/directory.c
@@ -55,7 +55,7 @@ static inline int dirfd (DIR *dir)
 }
 #endif
 
-#include <vlc_charset.h>
+#include <vlc_fs.h>
 #include <vlc_url.h>
 #include <vlc_strings.h>
 

diff --git a/modules/access/dvb/linux_dvb.c b/modules/access/dvb/linux_dvb.c
index 8235c82119c240ad8adb33fe833f009b9a320b15..83e6401a1afe39fe909e36e71234c48c4c998782 100644 (file)
--- a/modules/access/dvb/linux_dvb.c
+++ b/modules/access/dvb/linux_dvb.c
@@ -38,7 +38,7 @@
 #include <time.h>
 #include <unistd.h>
 #include <poll.h>
-#include <vlc_charset.h>
+#include <vlc_fs.h>
 
 /* DVB Card Drivers */
 #include <linux/dvb/version.h>

diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c
index 3743cf81ae80f89666f70cba357e1e4e2e36662f..5a3ba32a95d87d054de518fcd25114bb4c1aa10c 100644 (file)
--- a/modules/access/dvdnav.c
+++ b/modules/access/dvdnav.c
@@ -36,6 +36,7 @@
 #include <vlc_access.h>
 #include <vlc_demux.h>
 #include <vlc_charset.h>
+#include <vlc_fs.h>
 
 #include <vlc_dialog.h>
 

diff --git a/modules/access/file.c b/modules/access/file.c
index 1db875dd3a75c9d058ae296926f6b9a54debcf13..d999a019fd530df9351de11092f88b1641528ce5 100644 (file)
--- a/modules/access/file.c
+++ b/modules/access/file.c
@@ -72,7 +72,7 @@
 # define PathIsNetworkPathW(wpath) (! wcsncmp(wpath, L"\\\\", 2))
 #endif
 
-#include <vlc_charset.h>
+#include <vlc_fs.h>
 #include <vlc_url.h>
 
 struct access_sys_t

diff --git a/modules/access/fs.h b/modules/access/fs.h
index a2eba257072d7fd101803879c0b6103306619a9a..de5e4936499653769b4277f2044e027a24daa77b 100644 (file)
--- a/modules/access/fs.h
+++ b/modules/access/fs.h
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include <vlc_charset.h>
+#include <dirent.h>
 
 int Open (vlc_object_t *);
 void Close (vlc_object_t *);

diff --git a/modules/access/mmap.c b/modules/access/mmap.c
index c6116aa8d276f9395211e612acabd03ac3c30cc4..badc06ffc0388dfd6b9e594a287a82dcd6079bac 100644 (file)
--- a/modules/access/mmap.c
+++ b/modules/access/mmap.c
@@ -27,7 +27,7 @@
 #include <vlc_plugin.h>
 #include <vlc_access.h>
 #include <vlc_input.h>
-#include <vlc_charset.h>
+#include <vlc_fs.h>
 #include <vlc_dialog.h>
 
 #include <assert.h>

diff --git a/modules/access/mtp.c b/modules/access/mtp.c
index 3a834ba0acc6c05b91ce221cb3f0bcf783ff3fb9..99b07c5254648d74c0110a6d8f6005886556b54d 100644 (file)
--- a/modules/access/mtp.c
+++ b/modules/access/mtp.c
@@ -49,7 +49,7 @@
 #include <unistd.h>
 #include <poll.h>
 
-#include <vlc_charset.h>
+#include <vlc_fs.h>
 
 #include "libmtp.h"
 

diff --git a/modules/access/oss.c b/modules/access/oss.c
index 52ec5f2bff20b07622ecb712027284b158950cdc..5d069dcd977b56523615bfbb42fdfe1e7dc92031 100644 (file)
--- a/modules/access/oss.c
+++ b/modules/access/oss.c
@@ -36,7 +36,7 @@
 #include <vlc_plugin.h>
 #include <vlc_access.h>
 #include <vlc_demux.h>
-#include <vlc_charset.h>
+#include <vlc_fs.h>
 
 #include <fcntl.h>
 #include <unistd.h>

diff --git a/modules/access/pvr.c b/modules/access/pvr.c
index ce0da917ae976c678c43b187a3d932bc686b3d24..6bd402a38224a9b8225a4dd8526532bf1bd7e277 100644 (file)
--- a/modules/access/pvr.c
+++ b/modules/access/pvr.c
@@ -32,7 +32,7 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_access.h>
-#include <vlc_charset.h>
+#include <vlc_fs.h>
 
 #include <sys/types.h>
 #include <fcntl.h>

diff --git a/modules/access/smb.c b/modules/access/smb.c
index f12706d26e8eadde2cbe933d5656e1f182ac9744..59b9565acc66f8957751e05d9742f25baa423cdf 100644 (file)
--- a/modules/access/smb.c
+++ b/modules/access/smb.c
@@ -29,7 +29,7 @@
 #endif
 
 #include <vlc_common.h>
-#include <vlc_charset.h>
+#include <vlc_fs.h>
 #include <vlc_plugin.h>
 #include <vlc_access.h>
 

diff --git a/modules/access/v4l.c b/modules/access/v4l.c
index 06b67d9453677c2d20e03816d203477e4089c89a..0fb0d2e658436ef4d1d7f095d4eb758e2afffff1 100644 (file)
--- a/modules/access/v4l.c
+++ b/modules/access/v4l.c
@@ -38,7 +38,7 @@
 #include <vlc_demux.h>
 #include <vlc_access.h>
 #include <vlc_picture.h>
-#include <vlc_charset.h>
+#include <vlc_fs.h>
 
 #include <sys/ioctl.h>
 #include <sys/mman.h>

diff --git a/modules/access/v4l2.c b/modules/access/v4l2.c
index a308f161536f5877f3b9d8a47b397bbb3ce3d6ce..87fdc102c858cce06a97adc0bb8cb78171a38032 100644 (file)
--- a/modules/access/v4l2.c
+++ b/modules/access/v4l2.c
@@ -41,6 +41,7 @@
 #include <vlc_plugin.h>
 #include <vlc_access.h>
 #include <vlc_charset.h>
+#include <vlc_fs.h>
 #include <vlc_demux.h>
 #include <vlc_input.h>
 

diff --git a/modules/access/vcd/cdrom.c b/modules/access/vcd/cdrom.c
index 765f6c561b5bd5f906f755898fd222bd415c60b4..390425dd7bdc6dd9664fc7ceedf07cc44f0bb86b 100644 (file)
--- a/modules/access/vcd/cdrom.c
+++ b/modules/access/vcd/cdrom.c
@@ -33,6 +33,7 @@
 #include <vlc_common.h>
 #include <vlc_access.h>
 #include <vlc_charset.h>
+#include <vlc_fs.h>
 #include <limits.h>
 
 #ifdef HAVE_UNISTD_H
@@ -77,7 +78,6 @@
 
 #include "cdrom_internals.h"
 #include "cdrom.h"
-#include <vlc_charset.h>
 #include <vlc_meta.h>
 
 /*****************************************************************************

diff --git a/modules/access/vcdx/vcd.c b/modules/access/vcdx/vcd.c
index aa4c3d45cf4a34a4ff645f763e83009cfc20f78c..4d94ed0d3ac687de2fec3177eb3fda32c92102e4 100644 (file)
--- a/modules/access/vcdx/vcd.c
+++ b/modules/access/vcdx/vcd.c
@@ -35,7 +35,6 @@
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
-#include <vlc_charset.h>
 
 #include "vcd.h"
 #include "access.h"

diff --git a/modules/access_output/file.c b/modules/access_output/file.c
index 3bb110d826dbcb56042c3948213f8ecdf83902c5..84aad89da637895dad68d266f16bcdd646249e4d 100644 (file)
--- a/modules/access_output/file.c
+++ b/modules/access_output/file.c
@@ -39,7 +39,7 @@
 #include <vlc_plugin.h>
 #include <vlc_sout.h>
 #include <vlc_block.h>
-#include <vlc_charset.h>
+#include <vlc_fs.h>
 #include <vlc_strings.h>
 
 #if defined( WIN32 ) && !defined( UNDER_CE )

diff --git a/modules/audio_output/file.c b/modules/audio_output/file.c
index 79e968508d04f36f869eb06ffbdd121440776c65..18fd45c7a05698859e905a28e20f1946af282a77 100644 (file)
--- a/modules/audio_output/file.c
+++ b/modules/audio_output/file.c
@@ -34,7 +34,7 @@
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
 #include <vlc_codecs.h> /* WAVEHEADER */
-#include <vlc_charset.h>
+#include <vlc_fs.h>
 
 #define FRAME_SIZE 2048
 #define A52_FRAME_NB 1536

diff --git a/modules/audio_output/oss.c b/modules/audio_output/oss.c
index 38f49c9ffdf370c6a6f8e2b9f97f841e4b77db3b..f866f173667f3023a0dce66336a58d469781c34d 100644 (file)
--- a/modules/audio_output/oss.c
+++ b/modules/audio_output/oss.c
@@ -37,7 +37,7 @@
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
-#include <vlc_charset.h>
+#include <vlc_fs.h>
 
 #include <vlc_aout.h>
 

diff --git a/modules/codec/fake.c b/modules/codec/fake.c
index 5a3b70ffd23162ad70905d651383a14e4a0ec9e1..d286ecec2df68e0f6f062fedbd72e9e6cf177821 100644 (file)
--- a/modules/codec/fake.c
+++ b/modules/codec/fake.c
@@ -35,7 +35,6 @@
 
 #include <vlc_image.h>
 #include <vlc_filter.h>
-#include <vlc_charset.h>
 
 /*****************************************************************************
  * Local prototypes

diff --git a/modules/control/http/http.c b/modules/control/http/http.c
index 69756fd878c74789419cba6f1a963b922c6ceba4..43464f69dd8f8e9671e9e7bddbcf6986c3b9fdc3 100644 (file)
--- a/modules/control/http/http.c
+++ b/modules/control/http/http.c
@@ -28,6 +28,7 @@
 #include "http.h"
 #include <vlc_plugin.h>
 #include <vlc_url.h>
+#include <vlc_fs.h>
 
 #include <assert.h>
 

diff --git a/modules/control/http/http.h b/modules/control/http/http.h
index 99b834670f46efb0991c20bcd646e2ee6d66d7a6..3b9e98c5448beb70ebc849089721ea37b99de519 100644 (file)
--- a/modules/control/http/http.h
+++ b/modules/control/http/http.h
@@ -42,7 +42,6 @@
 #include <vlc_vlm.h>
 #include <vlc_network.h>
 #include <vlc_acl.h>
-#include <vlc_charset.h>
 
 #ifdef HAVE_UNISTD_H
 #   include <unistd.h>

diff --git a/modules/control/http/mvar.c b/modules/control/http/mvar.c
index 9e0862fecd474aed5bba9c0c79278ee31621d6fa..3ada9dab0e4e4b062daad242e1292f9bdffbf241 100644 (file)
--- a/modules/control/http/mvar.c
+++ b/modules/control/http/mvar.c
@@ -34,6 +34,7 @@
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
+#include <vlc_fs.h>
 
 /* Utility function for scandir */
 static int Filter( const char *foo )

diff --git a/modules/control/http/util.c b/modules/control/http/util.c
index 7134321be87ac7ae805ed75d2c520d076aa7ac0a..218c1f910deddc65be3470b95edc477dc3f1a905 100644 (file)
--- a/modules/control/http/util.c
+++ b/modules/control/http/util.c
@@ -33,6 +33,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/stat.h>
+#include <vlc_fs.h>
 
 /****************************************************************************
  * File and directory functions

diff --git a/modules/demux/demuxdump.c b/modules/demux/demuxdump.c
index 7c5db5234e034f826c2a6c9898b3b396afc56fea..9b0d1c97d227dba0590909c7795953b119df3c0a 100644 (file)
--- a/modules/demux/demuxdump.c
+++ b/modules/demux/demuxdump.c
@@ -32,7 +32,7 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_demux.h>
-#include <vlc_charset.h>
+#include <vlc_fs.h>
 
 /*****************************************************************************
  * Module descriptor

diff --git a/modules/demux/mp4/drms.c b/modules/demux/mp4/drms.c
index 3050e19eeddfbfe23e86cef15eebc3f18740cc9c..723b51e4b442d0c531d2599a4e501824794101a8 100644 (file)
--- a/modules/demux/mp4/drms.c
+++ b/modules/demux/mp4/drms.c
@@ -29,7 +29,7 @@
 #include <vlc_common.h>
 #include <vlc_md5.h>
 #include "libmp4.h"
-#include <vlc_charset.h>
+#include <vlc_fs.h>
 
 #ifdef WIN32
 #   include <io.h>

diff --git a/modules/demux/ogg.c b/modules/demux/ogg.c
index 7f5b240c2d0cebb35a544c2308e9a9c0c382d793..b92ed954c9fcf54f54c10dfc5d60b6620e064be2 100644 (file)
--- a/modules/demux/ogg.c
+++ b/modules/demux/ogg.c
@@ -39,7 +39,6 @@
 
 #include <vlc_codecs.h>
 #include <vlc_bits.h>
-#include <vlc_charset.h>
 #include "vorbis.h"
 #include "kate_categories.h"
 

diff --git a/modules/demux/playlist/wpl.c b/modules/demux/playlist/wpl.c
index a73af682779f62058e56ce8331f81afe7b661e26..7f30facf433f1b21a4f570578b27378904d262db 100644 (file)
--- a/modules/demux/playlist/wpl.c
+++ b/modules/demux/playlist/wpl.c
@@ -30,7 +30,6 @@
 
 #include <vlc_common.h>
 #include <vlc_demux.h>
-#include <vlc_charset.h>
 
 #include "playlist.h"
 

diff --git a/modules/demux/playlist/zpl.c b/modules/demux/playlist/zpl.c
index 7c2efbd95efb80da712baa4333a646ab3694a209..cb41810a06e23b12a3bd1bfac50e3d33562a3d40 100644 (file)
--- a/modules/demux/playlist/zpl.c
+++ b/modules/demux/playlist/zpl.c
@@ -31,7 +31,6 @@
 
 #include <vlc_common.h>
 #include <vlc_demux.h>
-#include <vlc_charset.h>
 
 #include "playlist.h"
 

diff --git a/modules/demux/subtitle_asa.c b/modules/demux/subtitle_asa.c
index 3a6716c2b6c2c8e4fdbc2bb72051ae7c57739b7f..b9f6a371e2cd7ae7e69f8f847faa1bddd57d6a8b 100644 (file)
--- a/modules/demux/subtitle_asa.c
+++ b/modules/demux/subtitle_asa.c
@@ -36,7 +36,6 @@
 #include <vlc_memory.h>
 
 #include <vlc_demux.h>
-#include <vlc_charset.h>
 
 #include "asademux.h"
 

diff --git a/modules/demux/ts.c b/modules/demux/ts.c
index b0731608e76dfbbfe08785b9e97ca00091959520..34f9072d0645ff73b1b4a80cfa3c06a6e32f1468 100644 (file)
--- a/modules/demux/ts.c
+++ b/modules/demux/ts.c
@@ -43,6 +43,7 @@
 #include <vlc_iso_lang.h>
 #include <vlc_network.h>
 #include <vlc_charset.h>
+#include <vlc_fs.h>
 
 #include "../mux/mpeg/csa.h"
 

diff --git a/modules/demux/vobsub.c b/modules/demux/vobsub.c
index 49cb27cd1482b31c26fd8cef2d741bdb6cd70a8f..8877da4f31d086af4d700285d6e80430be9a50c7 100644 (file)
--- a/modules/demux/vobsub.c
+++ b/modules/demux/vobsub.c
@@ -36,7 +36,6 @@
 #include <limits.h>
 
 #include <vlc_demux.h>
-#include <vlc_charset.h>
 
 #include "ps.h"
 #include "vobsub.h"

diff --git a/modules/demux/vorbis.h b/modules/demux/vorbis.h
index 6a96fa1bb6b196073809d7cb5098877fd73cf986..21fbb353b98df72b0029c047f94490fb8a6787c4 100644 (file)
--- a/modules/demux/vorbis.h
+++ b/modules/demux/vorbis.h
@@ -21,6 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#include <vlc_charset.h>
+
 static inline void vorbis_ParseComment( vlc_meta_t **pp_meta, const uint8_t *p_data, int i_data )
 {
     int n;

diff --git a/modules/gui/fbosd.c b/modules/gui/fbosd.c
index acebb0b8e81c065440545c9c63920cb697df1560..8cfa12ac7f8abaca25d8ac17e1f21c0d8f22c16e 100644 (file)
--- a/modules/gui/fbosd.c
+++ b/modules/gui/fbosd.c
@@ -31,7 +31,7 @@
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
-#include <vlc_charset.h>
+#include <vlc_fs.h>
 
 #include <stdlib.h>                                                /* free() */
 #include <string.h>                                            /* strerror() */

diff --git a/modules/gui/skins2/vars/playtree.cpp b/modules/gui/skins2/vars/playtree.cpp
index eaf1db8128d6a5ac2afc422df19084a443cb8c24..28a8735d2c370acc2d4d818264eec0104fe5f33b 100644 (file)
--- a/modules/gui/skins2/vars/playtree.cpp
+++ b/modules/gui/skins2/vars/playtree.cpp
@@ -32,9 +32,6 @@
 #include <vlc_playlist.h>
 #include "../utils/ustring.hpp"
 
-#include <vlc_charset.h>
-
-
 Playtree::Playtree( intf_thread_t *pIntf ): VarTree( pIntf )
 {
     // Get the VLC playlist object

diff --git a/modules/meta_engine/folder.c b/modules/meta_engine/folder.c
index ae98de9438bf2ce6de5dfb3e2cd0c1fa9bb10984..bf9534e1cd7bbe886d2ab022dfdc415b1fccc27d 100644 (file)
--- a/modules/meta_engine/folder.c
+++ b/modules/meta_engine/folder.c
@@ -33,7 +33,7 @@
 #include <vlc_plugin.h>
 #include <vlc_playlist.h>
 #include <vlc_art_finder.h>
-#include <vlc_charset.h>
+#include <vlc_fs.h>
 #include <vlc_url.h>
 
 #ifdef HAVE_SYS_STAT_H

diff --git a/modules/misc/dummy/decoder.c b/modules/misc/dummy/decoder.c
index d63df18b39274f6a980ec07669bbdef903cef724..a01381124d56567c3849f0f5e77beeade61e57b2 100644 (file)
--- a/modules/misc/dummy/decoder.c
+++ b/modules/misc/dummy/decoder.c
@@ -30,7 +30,7 @@
 
 #include <vlc_common.h>
 #include <vlc_codec.h>
-#include <vlc_charset.h>
+#include <vlc_fs.h>
 
 #include <sys/types.h>
 #ifdef HAVE_UNISTD_H

diff --git a/modules/misc/gnutls.c b/modules/misc/gnutls.c
index a58583b7541d531515a5f9a4915c5f417193c02c..6986954f912e28d0e794ad4bce4520a80f51938c 100644 (file)
--- a/modules/misc/gnutls.c
+++ b/modules/misc/gnutls.c
@@ -52,6 +52,7 @@
 
 #include <vlc_tls.h>
 #include <vlc_charset.h>
+#include <vlc_fs.h>
 #include <vlc_block.h>
 
 #include <gcrypt.h>

diff --git a/modules/misc/logger.c b/modules/misc/logger.c
index ddc7f359831816e9275a8e12ef8bd152e9aa18cb..7a67ecfcd8572a3810f8a15da6594880edfed38f 100644 (file)
--- a/modules/misc/logger.c
+++ b/modules/misc/logger.c
@@ -33,7 +33,7 @@
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
 #include <vlc_playlist.h>
-#include <vlc_charset.h>
+#include <vlc_fs.h>
 
 #include <assert.h>
 

diff --git a/modules/misc/lua/demux.c b/modules/misc/lua/demux.c
index dce8c7ae6ae2860a8977e9581cd4c77330f38564..885edfb2282c3ad5f155a0d5f2e467250811d6b7 100644 (file)
--- a/modules/misc/lua/demux.c
+++ b/modules/misc/lua/demux.c
@@ -34,7 +34,6 @@
 #include <vlc_demux.h>
 #include <vlc_url.h>
 #include <vlc_strings.h>
-#include <vlc_charset.h>
 
 #include "vlc.h"
 #include "libs.h"

diff --git a/modules/misc/lua/intf.c b/modules/misc/lua/intf.c
index b9e1737f59b4c6b2fa9d90f9da384267b630251b..fd5583205a56394f5299f37793388ef1727ef00e 100644 (file)
--- a/modules/misc/lua/intf.c
+++ b/modules/misc/lua/intf.c
@@ -34,7 +34,6 @@
 
 #include <vlc_common.h>
 #include <vlc_meta.h>
-#include <vlc_charset.h>
 
 #include <vlc_interface.h>
 #include <vlc_playlist.h>

diff --git a/modules/misc/lua/libs/input.c b/modules/misc/lua/libs/input.c
index a0df5699336fb64308028db197be3d7a4789d330..76496f7932bd996bf820c455b63b8c1210cd6d3b 100644 (file)
--- a/modules/misc/lua/libs/input.c
+++ b/modules/misc/lua/libs/input.c
@@ -34,7 +34,6 @@
 
 #include <vlc_common.h>
 #include <vlc_meta.h>
-#include <vlc_charset.h>
 
 #include <vlc_playlist.h>
 

diff --git a/modules/misc/lua/libs/messages.c b/modules/misc/lua/libs/messages.c
index 5d3dce06d5d5cc5fa8beb5b3169b975429993c65..7f42a86f418e1202101b8f1ece38263b967e3a92 100644 (file)
--- a/modules/misc/lua/libs/messages.c
+++ b/modules/misc/lua/libs/messages.c
@@ -36,7 +36,6 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_meta.h>
-#include <vlc_charset.h>
 #include <vlc_aout.h>
 
 #include <lua.h>        /* Low level lua C API */

diff --git a/modules/misc/lua/libs/misc.c b/modules/misc/lua/libs/misc.c
index c496262b16517f1b3dddc876c2541184823520bb..2ddd4a3bfe96cf06329e4dd1868c14861f92f220 100644 (file)
--- a/modules/misc/lua/libs/misc.c
+++ b/modules/misc/lua/libs/misc.c
@@ -36,7 +36,6 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_meta.h>
-#include <vlc_charset.h>
 #include <vlc_aout.h>
 #include <vlc_interface.h>
 #include <vlc_keys.h>

diff --git a/modules/misc/lua/libs/net.c b/modules/misc/lua/libs/net.c
index 68b875f7f7a4af2607501a9192d24da15a8ced2d..5cc6442742a21bad5398711bf5aefc708c35c02e 100644 (file)
--- a/modules/misc/lua/libs/net.c
+++ b/modules/misc/lua/libs/net.c
@@ -35,6 +35,7 @@
 #include <vlc_common.h>
 #include <vlc_network.h>
 #include <vlc_url.h>
+#include <vlc_fs.h>
 
 #include <lua.h>        /* Low level lua C API */
 #include <lauxlib.h>    /* Higher level C API */

diff --git a/modules/misc/lua/libs/stream.c b/modules/misc/lua/libs/stream.c
index ec373863f10b73c2056b7359c65819496dac71ab..b44507f589e32d0fd5ad9b6e629ffce82b003930 100644 (file)
--- a/modules/misc/lua/libs/stream.c
+++ b/modules/misc/lua/libs/stream.c
@@ -36,7 +36,6 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_meta.h>
-#include <vlc_charset.h>
 #include <vlc_aout.h>
 
 #include <lua.h>        /* Low level lua C API */

diff --git a/modules/misc/lua/libs/strings.c b/modules/misc/lua/libs/strings.c
index b9a56a48414e5870ecfcbfcd0ddae296041e5aa4..5511af181acf08fee2d48330bbae75af2ad41771 100644 (file)
--- a/modules/misc/lua/libs/strings.c
+++ b/modules/misc/lua/libs/strings.c
@@ -36,7 +36,6 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_meta.h>
-#include <vlc_charset.h>
 #include <vlc_aout.h>
 
 #include <lua.h>        /* Low level lua C API */

diff --git a/modules/misc/lua/libs/volume.c b/modules/misc/lua/libs/volume.c
index 12a290f77072e60774f00c09dd2960e8c98d1222..906fbea8222e62630b5043f3960e14c84de38eee 100644 (file)
--- a/modules/misc/lua/libs/volume.c
+++ b/modules/misc/lua/libs/volume.c
@@ -36,7 +36,6 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_meta.h>
-#include <vlc_charset.h>
 #include <vlc_aout.h>
 
 #include <lua.h>        /* Low level lua C API */

diff --git a/modules/misc/lua/meta.c b/modules/misc/lua/meta.c
index 22d4d262ebc961bded0a4828ab56da2601399b5b..65d632861381041e4bc504e55b75bf4daa3a0281 100644 (file)
--- a/modules/misc/lua/meta.c
+++ b/modules/misc/lua/meta.c
@@ -42,7 +42,6 @@
 #include <vlc_url.h>
 #include <vlc_strings.h>
 #include <vlc_stream.h>
-#include <vlc_charset.h>
 
 #include "vlc.h"
 #include "libs.h"

diff --git a/modules/misc/lua/vlc.c b/modules/misc/lua/vlc.c
index 591206a0e3d6d089bafad760d8448df716a09fe6..c4616558caaff0b0da97a0b5017431a37b3d8ed3 100644 (file)
--- a/modules/misc/lua/vlc.c
+++ b/modules/misc/lua/vlc.c
@@ -39,6 +39,7 @@
 #include <vlc_plugin.h>
 #include <vlc_meta.h>
 #include <vlc_charset.h>
+#include <vlc_fs.h>
 #include <vlc_aout.h>
 #include <vlc_services_discovery.h>
 #include <sys/stat.h>

diff --git a/modules/misc/lua/vlc.h b/modules/misc/lua/vlc.h
index ea7e31474832e441ea11028d9b9b2821c4035c8d..21ba79c72a041a55ace6d55f3e562871334f6cbb 100644 (file)
--- a/modules/misc/lua/vlc.h
+++ b/modules/misc/lua/vlc.h
@@ -35,7 +35,6 @@
 #include <vlc_url.h>
 #include <vlc_strings.h>
 #include <vlc_stream.h>
-#include <vlc_charset.h>
 
 #include <lua.h>        /* Low level lua C API */
 #include <lauxlib.h>    /* Higher level C API */

diff --git a/modules/misc/osd/simple.c b/modules/misc/osd/simple.c
index cb51521c8c523786a63dd5201b33b3c04613e6e7..3d024b9cb4c7e823e67e2c41bd9e288be426ee11 100644 (file)
--- a/modules/misc/osd/simple.c
+++ b/modules/misc/osd/simple.c
@@ -31,7 +31,7 @@
 
 #include <vlc_common.h>
 #include <vlc_osd.h>
-#include <vlc_charset.h>
+#include <vlc_fs.h>
 
 #include <limits.h>
 

diff --git a/modules/misc/screensaver.c b/modules/misc/screensaver.c
index 92fee3853245676fae8d2059a071c78f88e576cc..8a07671b525dffabc9cac5b2037921ea4d503400 100644 (file)
--- a/modules/misc/screensaver.c
+++ b/modules/misc/screensaver.c
@@ -33,7 +33,7 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_inhibit.h>
-#include <vlc_charset.h>
+#include <vlc_fs.h>
 
 #include <sys/types.h>
 #include <sys/wait.h>

diff --git a/modules/misc/svg.c b/modules/misc/svg.c
index bcf18b03b027261ad67b1ed45557cfd03e573763..c60fd435aa913234256908424b88887234b26053 100644 (file)
--- a/modules/misc/svg.c
+++ b/modules/misc/svg.c
@@ -31,7 +31,7 @@
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
-#include <vlc_charset.h>
+#include <vlc_fs.h>
 #include <vlc_vout.h>
 #include <vlc_osd.h>
 #include <vlc_block.h>

diff --git a/modules/services_discovery/mediadirs.c b/modules/services_discovery/mediadirs.c
index 897d894dc7e29e2dd608a11a0b0285de7ffd3737..5cd48adaf78ed9b73b7c059b451d0c80ba580da1 100644 (file)
--- a/modules/services_discovery/mediadirs.c
+++ b/modules/services_discovery/mediadirs.c
@@ -32,7 +32,7 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_url.h>
-#include <vlc_charset.h>
+#include <vlc_fs.h>
 #include <vlc_services_discovery.h>
 
 #include <sys/stat.h>

diff --git a/modules/services_discovery/mtp.c b/modules/services_discovery/mtp.c
index f82edf12509033e910a88e43d7aef3dfeb91c3d5..55d0004d2420061017b601a018433be7939d079c 100644 (file)
--- a/modules/services_discovery/mtp.c
+++ b/modules/services_discovery/mtp.c
@@ -27,7 +27,6 @@
 #include <vlc_common.h>
 #include <vlc_playlist.h>
 #include <vlc_plugin.h>
-#include <vlc_charset.h>
 #include <vlc_interface.h>
 #include <vlc_services_discovery.h>
 

diff --git a/modules/stream_filter/record.c b/modules/stream_filter/record.c
index 8afea210fe40510c1c3d4e03aa4750ff5eca0139..388296bb4aded21fb679a71b23c86d112bc514ed 100644 (file)
--- a/modules/stream_filter/record.c
+++ b/modules/stream_filter/record.c
@@ -34,7 +34,7 @@
 #include <assert.h>
 #include <vlc_stream.h>
 #include <vlc_input.h>
-#include <vlc_charset.h>
+#include <vlc_fs.h>
 
 
 /*****************************************************************************

diff --git a/modules/stream_out/raop.c b/modules/stream_out/raop.c
index 70a4e37868cb810f1761ddb792da288dcb828f7a..9718a451b629816b54d0ca097fc6e143d5a8781d 100644 (file)
--- a/modules/stream_out/raop.c
+++ b/modules/stream_out/raop.c
@@ -39,6 +39,7 @@
 #include <vlc_network.h>
 #include <vlc_strings.h>
 #include <vlc_charset.h>
+#include <vlc_fs.h>
 #include <vlc_gcrypt.h>
 #include <vlc_es.h>
 #include <vlc_http.h>

diff --git a/modules/stream_out/record.c b/modules/stream_out/record.c
index 01fa12269c692a5d8bdb38a0c0195e257074b89f..82f525ed7fa42620a5955ecbd1f544510abc3324 100644 (file)
--- a/modules/stream_out/record.c
+++ b/modules/stream_out/record.c
@@ -35,7 +35,7 @@
 #include <vlc_plugin.h>
 #include <vlc_block.h>
 #include <vlc_sout.h>
-#include <vlc_charset.h>
+#include <vlc_fs.h>
 #include <assert.h>
 
 /*****************************************************************************

diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c
index 309104941082f237943422468a5cee522eb68d61..52e062a06c4837f50fc8ea6af50a20936837400d 100644 (file)
--- a/modules/stream_out/rtp.c
+++ b/modules/stream_out/rtp.c
@@ -37,7 +37,7 @@
 #include <vlc_httpd.h>
 #include <vlc_url.h>
 #include <vlc_network.h>
-#include <vlc_charset.h>
+#include <vlc_fs.h>
 #include <vlc_strings.h>
 #include <vlc_rand.h>
 #ifdef HAVE_SRTP

diff --git a/modules/stream_out/switcher.c b/modules/stream_out/switcher.c
index 11a752dca6549d7d714d9c8c53aada26365850a0..5edd114ae10529d3316744696657eaaea048902b 100644 (file)
--- a/modules/stream_out/switcher.c
+++ b/modules/stream_out/switcher.c
@@ -39,7 +39,7 @@
 
 #include <vlc_block.h>
 
-#include <vlc_charset.h>
+#include <vlc_fs.h>
 #include <vlc_network.h>
 
 #define HAVE_MMX

diff --git a/modules/video_filter/dynamicoverlay/dynamicoverlay.c b/modules/video_filter/dynamicoverlay/dynamicoverlay.c
index 00536edb920c4e11e8f8166e43e7f1e32facac92..637a357eafdbd5b36267b994adf9a670c7836274 100644 (file)
--- a/modules/video_filter/dynamicoverlay/dynamicoverlay.c
+++ b/modules/video_filter/dynamicoverlay/dynamicoverlay.c
@@ -34,7 +34,7 @@
 #include <vlc_vout.h>
 #include <vlc_filter.h>
 #include <vlc_osd.h>
-#include <vlc_charset.h>
+#include <vlc_fs.h>
 
 #include <ctype.h>
 #include <fcntl.h>

diff --git a/modules/video_filter/opencv_wrapper.c b/modules/video_filter/opencv_wrapper.c
index 7b71058aa4c2cccd1b5cd25db76522645a9e72ea..f0bea126b44f082342688da5ed32707ddd14d4be 100644 (file)
--- a/modules/video_filter/opencv_wrapper.c
+++ b/modules/video_filter/opencv_wrapper.c
@@ -41,7 +41,6 @@
 
 #include <vlc_filter.h>
 #include "filter_common.h"
-#include <vlc_charset.h>
 #include <vlc_image.h>
 #include <vlc_input.h>
 #include <vlc_playlist.h>

diff --git a/modules/video_output/fb.c b/modules/video_output/fb.c
index e55e6168c7b5bb723ca1b02e2547aa8c0ed13361..d90e03b730c990eb73a46a15e2edd38b51491d16 100644 (file)
--- a/modules/video_output/fb.c
+++ b/modules/video_output/fb.c
@@ -46,7 +46,7 @@
 #include <vlc_plugin.h>
 #include <vlc_vout_display.h>
 #include <vlc_picture_pool.h>
-#include <vlc_charset.h>
+#include <vlc_fs.h>
 
 /*****************************************************************************
  * Module descriptor

diff --git a/modules/video_output/omapfb.c b/modules/video_output/omapfb.c
index b29de5d7f76c6221a127636bf1142a68d4cd291e..daa76c19cb8a0d1d6bbabb09ffa3314b4e7bc036 100644 (file)
--- a/modules/video_output/omapfb.c
+++ b/modules/video_output/omapfb.c
@@ -45,7 +45,7 @@
 #include <vlc_vout.h>
 #include <vlc_vout_window.h>
 #include <vlc_playlist.h>
-#include <vlc_charset.h>
+#include <vlc_fs.h>
 
 /*****************************************************************************
 * Local prototypes

diff --git a/modules/video_output/yuv.c b/modules/video_output/yuv.c
index 8113936dba55031719827262e9858c6b837627f4..d24870eee0f322e5247048ab8df0167f102be791 100644 (file)
--- a/modules/video_output/yuv.c
+++ b/modules/video_output/yuv.c
@@ -33,7 +33,7 @@
 #include <vlc_plugin.h>
 #include <vlc_vout_display.h>
 #include <vlc_picture_pool.h>
-#include <vlc_charset.h>
+#include <vlc_fs.h>
 
 /*****************************************************************************
  * Module descriptor

diff --git a/src/Makefile.am b/src/Makefile.am
index 9daa4c8285aa69fb17eb85c3032ef69a1c41dd19..2f7663db0063c149add4399e5fe7aad61a45131d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -65,6 +65,7 @@ pluginsinclude_HEADERS = \
        ../include/vlc_events.h \
        ../include/vlc_filter.h \
        ../include/vlc_fourcc.h \
+       ../include/vlc_fs.h \
        ../include/vlc_gcrypt.h \
        ../include/vlc_http.h \
        ../include/vlc_httpd.h \

diff --git a/src/config/core.c b/src/config/core.c
index 9632e1be1d17cdcfa24b59f5342194ad67efa4e3..8f4cdc7df5100b6c24ef28669bbd749ba9b70acd 100644 (file)
--- a/src/config/core.c
+++ b/src/config/core.c
@@ -27,7 +27,6 @@
 
 #include <vlc_common.h>
 #include "vlc_keys.h"
-#include "vlc_charset.h"
 #include "vlc_configuration.h"
 
 #include <assert.h>

diff --git a/src/config/file.c b/src/config/file.c
index 0126d608ee773654f15102a53e1415e50ca030e8..6d47f321bafc89c63874b322c1357637cc5be1f5 100644 (file)
--- a/src/config/file.c
+++ b/src/config/file.c
@@ -38,7 +38,8 @@
 
 #include <vlc_common.h>
 #include "../libvlc.h"
-#include "vlc_charset.h"
+#include <vlc_charset.h>
+#include <vlc_fs.h>
 #include "vlc_keys.h"
 
 #include "configuration.h"

diff --git a/src/input/es_out_timeshift.c b/src/input/es_out_timeshift.c
index dd840fa05ac161fcf70019a72d0ff83bba5e1c24..0afc01a5b827847148108081514121bc8258ff38 100644 (file)
--- a/src/input/es_out_timeshift.c
+++ b/src/input/es_out_timeshift.c
@@ -39,8 +39,10 @@
 #endif
 
 #include <vlc_common.h>
-#include <vlc_charset.h>
-
+#include <vlc_fs.h>
+#ifdef WIN32
+#  include <vlc_charset.h>
+#endif
 #include <vlc_input.h>
 #include <vlc_es_out.h>
 #include <vlc_block.h>

diff --git a/src/input/input.c b/src/input/input.c
index 3f00f9f441e11008777aeb50a7be3ac8de069fba..191e1264480547a0667a66ccddfbfe236aa2f970 100644 (file)
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -51,6 +51,7 @@
 #include <vlc_dialog.h>
 #include <vlc_url.h>
 #include <vlc_charset.h>
+#include <vlc_fs.h>
 #include <vlc_strings.h>
 
 #ifdef HAVE_SYS_STAT_H

diff --git a/src/input/stream.c b/src/input/stream.c
index 45b39052869dc32514b0635e894d59a93b5e43e2..b36590bba577092e0bd55ac35e4137c2a22c2ce1 100644 (file)
--- a/src/input/stream.c
+++ b/src/input/stream.c
@@ -31,7 +31,6 @@
 #include <vlc_common.h>
 #include <vlc_strings.h>
 #include <vlc_osd.h>
-#include <vlc_charset.h>
 #include <vlc_memory.h>
 
 #include <libvlc.h>

diff --git a/src/input/subtitles.c b/src/input/subtitles.c
index 2b8f31af956fd8dba6b23edbed731d8b322df213..fadc067d45affdd8dec6dfbeb3f1998a3f79aa22 100644 (file)
--- a/src/input/subtitles.c
+++ b/src/input/subtitles.c
@@ -32,7 +32,7 @@
 #endif
 
 #include <vlc_common.h>
-#include <vlc_charset.h>
+#include <vlc_fs.h>
 #include <vlc_url.h>
 
 #ifdef HAVE_DIRENT_H

diff --git a/src/input/vlm.c b/src/input/vlm.c
index 678332e301b5fca331e5e218d32876c319249540..31ac195806dd081ab054e2b2bae2e7ac72fa9968 100644 (file)
--- a/src/input/vlm.c
+++ b/src/input/vlm.c
@@ -56,7 +56,6 @@
 #include "vlm_internal.h"
 #include "vlm_event.h"
 #include <vlc_vod.h>
-#include <vlc_charset.h>
 #include <vlc_sout.h>
 #include "../stream_output/stream_output.h"
 #include "../libvlc.h"

diff --git a/src/input/vlmshell.c b/src/input/vlmshell.c
index 16ce1e3362c39889a07ced8bc4fa28bb771ed735..5120443729637710d6b7d6f4283c93611c603065 100644 (file)
--- a/src/input/vlmshell.c
+++ b/src/input/vlmshell.c
@@ -47,6 +47,7 @@
 #include <vlc_stream.h>
 #include "vlm_internal.h"
 #include <vlc_charset.h>
+#include <vlc_fs.h>
 #include <vlc_sout.h>
 #include "../stream_output/stream_output.h"
 #include "../libvlc.h"

diff --git a/src/libvlc.c b/src/libvlc.c
index 4a9d5eb5da310e54cf31075a064f44b5f4c3acf3..5ed38d2bd09f28f682598150bc024c278887e6e8 100644 (file)
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -77,6 +77,7 @@
 #include "audio_output/aout_internal.h"
 
 #include <vlc_charset.h>
+#include <vlc_fs.h>
 #include <vlc_cpu.h>
 #include <vlc_url.h>
 

diff --git a/src/misc/image.c b/src/misc/image.c
index e6e3109c9b95d8518a5c9a29978e4f18cf8d2499..af2d425343f4c35753c37697acaa4d386aad91a7 100644 (file)
--- a/src/misc/image.c
+++ b/src/misc/image.c
@@ -43,7 +43,7 @@
 #include <vlc_es.h>
 #include <vlc_image.h>
 #include <vlc_stream.h>
-#include <vlc_charset.h>
+#include <vlc_fs.h>
 #include <vlc_sout.h>
 #include <libvlc.h>
 

diff --git a/src/misc/rand.c b/src/misc/rand.c
index ab257741dff06c7db6133ea8d2d6185b37bcab24..f7e571983bffbdf94132745fe6c43ab32c7e11eb 100644 (file)
--- a/src/misc/rand.c
+++ b/src/misc/rand.c
@@ -35,7 +35,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <pthread.h>
-#include <vlc_charset.h>
+#include <vlc_fs.h>
 
 #include <vlc_md5.h>
 

diff --git a/src/misc/update.c b/src/misc/update.c
index 5c55e17fab82d036b94de338a451494479bc32ee..c4ee467e389888df04bfb54a8a4e5f4b6d149f94 100644 (file)
--- a/src/misc/update.c
+++ b/src/misc/update.c
@@ -46,7 +46,7 @@
 #include <vlc_pgpkey.h>
 #include <vlc_stream.h>
 #include <vlc_strings.h>
-#include <vlc_charset.h>
+#include <vlc_fs.h>
 #include <vlc_dialog.h>
 
 #include <gcrypt.h>

diff --git a/src/misc/update_crypto.c b/src/misc/update_crypto.c
index ccf5c5770671ff94273f76e0862fd9b316e1bf3f..0ef7870569c18fa7da5c9fb1bbbef06c6685035e 100644 (file)
--- a/src/misc/update_crypto.c
+++ b/src/misc/update_crypto.c
@@ -42,7 +42,7 @@
 #include "vlc_common.h"
 #include <vlc_stream.h>
 #include <vlc_strings.h>
-#include <vlc_charset.h>
+#include <vlc_fs.h>
 
 #include "update.h"
 

diff --git a/src/modules/cache.c b/src/modules/cache.c
index ff06fa371c6327ca2e66082228b1f0518e061c08..8308e62b87ecc7b7e57abdc99e313a27c466289d 100644 (file)
--- a/src/modules/cache.c
+++ b/src/modules/cache.c
@@ -46,7 +46,7 @@
 
 #include "config/configuration.h"
 
-#include "vlc_charset.h"
+#include <vlc_fs.h>
 
 #include "modules/modules.h"
 

diff --git a/src/modules/modules.c b/src/modules/modules.c
index 42cdbeabb112f45a198d4d697a4c28b991bac857..5664521488d60295624344820925cc9a94401797 100644 (file)
--- a/src/modules/modules.c
+++ b/src/modules/modules.c
@@ -55,7 +55,7 @@
 
 #include "config/configuration.h"
 
-#include "vlc_charset.h"
+#include <vlc_fs.h>
 #include "vlc_arrays.h"
 
 #include "modules/modules.h"

diff --git a/src/network/acl.c b/src/network/acl.c
index 3c39dd7b89da542b2914cd861c3dc125b01d85e0..62fcee2ca9c0194405480ecd0779e709fcbc2a85 100644 (file)
--- a/src/network/acl.c
+++ b/src/network/acl.c
@@ -34,7 +34,7 @@
 #include <vlc_acl.h>
 
 #include <vlc_network.h>
-#include <vlc_charset.h>
+#include <vlc_fs.h>
 
 /* FIXME: rwlock on acl, but libvlc doesn't implement rwlock */
 typedef struct vlc_acl_entry_t

diff --git a/src/playlist/art.c b/src/playlist/art.c
index 89883a0e268a15b0a685eb00240461fb69d31e00..ba2fcd6d72f987f0ed4ccc15edb161a40b5ca6d4 100644 (file)
--- a/src/playlist/art.c
+++ b/src/playlist/art.c
@@ -29,7 +29,7 @@
 #include <assert.h>
 #include <vlc_common.h>
 #include <vlc_playlist.h>
-#include <vlc_charset.h>
+#include <vlc_fs.h>
 #include <vlc_strings.h>
 #include <vlc_stream.h>
 #include <vlc_url.h>

diff --git a/src/playlist/loadsave.c b/src/playlist/loadsave.c
index 847fdafadb6fabb5b4e7fd2387c120ebefe8c448..aea165b1607d69b6abc1a68d3f393637e50e4f3c 100644 (file)
--- a/src/playlist/loadsave.c
+++ b/src/playlist/loadsave.c
@@ -29,7 +29,7 @@
 #include <vlc_events.h>
 #include "playlist_internal.h"
 #include "config/configuration.h"
-#include <vlc_charset.h>
+#include <vlc_fs.h>
 #include <vlc_url.h>
 
 #include <sys/types.h>

diff --git a/src/text/filesystem.c b/src/text/filesystem.c
index 6aa499d15976f64b951b38d3cbb923ef931cfcb6..218c4a534e0cab7aa592cbb496bf427528860d0f 100644 (file)
--- a/src/text/filesystem.c
+++ b/src/text/filesystem.c
@@ -30,6 +30,7 @@
 
 #include <vlc_common.h>
 #include <vlc_charset.h>
+#include <vlc_fs.h>
 #include "libvlc.h" /* utf8_mkdir */
 #include <vlc_rand.h>
 

diff --git a/src/video_output/snapshot.c b/src/video_output/snapshot.c
index 6b666c3fcc58e48f1eb87a116f1018df8d058a1c..2550f2c78946cf1c13584a8d38b137b0027d97bb 100644 (file)
--- a/src/video_output/snapshot.c
+++ b/src/video_output/snapshot.c
@@ -27,7 +27,7 @@
 #endif
 
 #include <vlc_common.h>
-#include <vlc_charset.h>
+#include <vlc_fs.h>
 #include <vlc_strings.h>
 #include <vlc_block.h>
 

diff --git a/src/video_output/vout_intf.c b/src/video_output/vout_intf.c
index 0856b48b2850c1ba3178128007705b1876584dff..ceaa7e1d848c01761d705edc8479e1e4c6e91cfe 100644 (file)
--- a/src/video_output/vout_intf.c
+++ b/src/video_output/vout_intf.c
@@ -44,8 +44,6 @@
 #include <vlc_vout.h>
 #include <vlc_image.h>
 #include <vlc_osd.h>
-#include <vlc_charset.h>
-
 #include <vlc_strings.h>
 #include <vlc_charset.h>
 #include "../libvlc.h"

diff --git a/src/win32/specific.c b/src/win32/specific.c
index 85fcc0380e19d7a3beda0760e7e77402264c4dc3..c3783965fc2ebdb5901b997048219ecf4b6c0c09 100644 (file)
--- a/src/win32/specific.c
+++ b/src/win32/specific.c
@@ -29,7 +29,6 @@
 #include <vlc_common.h>
 #include "../libvlc.h"
 #include <vlc_playlist.h>
-#include <vlc_charset.h>
 
 #include "../extras/getopt.h"