with msvc can now load plugins - even compiled with mingw).
* small portability fixes.
-/* include/defs.h. Generated automatically by configure. */
-/* include/defs.h.in. Generated automatically from configure.in by autoheader 2.13. */
-
-/* Define if using alloca.c. */
-/* #undef C_ALLOCA */
-
-/* Define to empty if the keyword does not work. */
-/* #undef const */
-
-/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
- This function is required for alloca.c support on those systems. */
-/* #undef CRAY_STACKSEG_END */
-
/* Define if you have alloca, as a function or macro. */
#define HAVE_ALLOCA 1
-/* Define if you have <alloca.h> and it should be used (not on Ultrix). */
-/* #undef HAVE_ALLOCA_H */
-
-/* Define if you have a working `mmap' system call. */
-/* #undef HAVE_MMAP */
-
-/* Define as __inline if that's what the C compiler calls it. */
-/* #undef inline */
+#define PLUGIN_PATH "."
/* Define to `long' if <sys/types.h> doesn't define. */
/* #undef off_t */
/* Define to `unsigned' if <sys/types.h> doesn't define. */
/* #undef size_t */
-/* If using the C implementation of alloca, define if you know the
- direction of stack growth for your system; otherwise it will be
- automatically deduced at run-time.
- STACK_DIRECTION > 0 => grows toward higher addresses
- STACK_DIRECTION < 0 => grows toward lower addresses
- STACK_DIRECTION = 0 => direction of growth unknown
- */
-/* #undef STACK_DIRECTION */
-
/* Define if you have the ANSI C header files. */
#define STDC_HEADERS 1
-/* Define if you can safely include both <sys/time.h> and <time.h>. */
-/* #undef TIME_WITH_SYS_TIME */
-
-#define PACKAGE "vlc"
-#define VERSION "0.2.92-dev"
-#define COPYRIGHT_MESSAGE "VideoLAN Client - version 0.2.92-dev_2002-03-22 Ourumov - (c) 1996-2002 VideoLAN"
-#define MODULE_SUFFIX "__MODULE_0_2_92_dev_2002_03_22"
-#define MODULE_SYMBOL 0_2_92_dev_2002_03_22
-#define VERSION_MESSAGE "vlc 0.2.92-dev_2002-03-22 Ourumov Copyright 1996-2001 VideoLAN\n"
-
-/* Define if you have the __argz_count function. */
-/* #undef HAVE___ARGZ_COUNT */
-
-/* Define if you have the __argz_next function. */
-/* #undef HAVE___ARGZ_NEXT */
-
-/* Define if you have the __argz_stringify function. */
-/* #undef HAVE___ARGZ_STRINGIFY */
-
-/* Define if you have the dcgettext function. */
-/* #undef HAVE_DCGETTEXT */
-
-/* Define if you have the feof_unlocked function. */
-/* #undef HAVE_FEOF_UNLOCKED */
-
-/* Define if you have the fgets_unlocked function. */
-/* #undef HAVE_FGETS_UNLOCKED */
-
/* Define if you have the getcwd function. */
#define HAVE_GETCWD 1
-/* Define if you have the getegid function. */
-/* #undef HAVE_GETEGID */
-
-/* Define if you have the geteuid function. */
-/* #undef HAVE_GETEUID */
-
-/* Define if you have the getgid function. */
-/* #undef HAVE_GETGID */
-
-/* Define if you have the getpagesize function. */
-#define HAVE_GETPAGESIZE 1
-
-/* Define if you have the getpwuid function. */
-/* #undef HAVE_GETPWUID */
-
-/* Define if you have the gettimeofday function. */
-/* #undef HAVE_GETTIMEOFDAY */
-
-/* Define if you have the getuid function. */
-/* #undef HAVE_GETUID */
-
-/* Define if you have the isatty function. */
-#define HAVE_ISATTY 1
-
-/* Define if you have the memalign function. */
-/* #undef HAVE_MEMALIGN */
-
-/* Define if you have the mempcpy function. */
-/* #undef HAVE_MEMPCPY */
-
-/* Define if you have the munmap function. */
-/* #undef HAVE_MUNMAP */
-
/* Define if you have the putenv function. */
#define HAVE_PUTENV 1
-/* Define if you have the select function. */
-/* #undef HAVE_SELECT */
-
-/* Define if you have the setenv function. */
-/* #undef HAVE_SETENV */
-
/* Define if you have the setlocale function. */
#define HAVE_SETLOCALE 1
-/* Define if you have the sigrelse function. */
-/* #undef HAVE_SIGRELSE */
-
-/* Define if you have the stpcpy function. */
-/* #undef HAVE_STPCPY */
-
/* Define if you have the strcasecmp function. */
#define HAVE_STRCASECMP 1
/* Define if you have the swab function. */
#define HAVE_SWAB 1
-/* Define if you have the tsearch function. */
-/* #undef HAVE_TSEARCH */
-
-/* Define if you have the usleep function. */
-/* #undef HAVE_USLEEP */
-
-/* Define if you have the valloc function. */
-/* #undef HAVE_VALLOC */
-
-/* Define if you have the vasprintf function. */
-/* #undef HAVE_VASPRINTF */
-
-/* Define if you have the </sys/dev/scsi/scsi_ioctl.h> header file. */
-/* #undef HAVE__SYS_DEV_SCSI_SCSI_IOCTL_H */
-
-/* Define if you have the <Cocoa/Cocoa.h> header file. */
-/* #undef HAVE_COCOA_COCOA_H */
-
-/* Define if you have the <Ph.h> header file. */
-/* #undef HAVE_PH_H */
-
-/* Define if you have the <X11/Xlib.h> header file. */
-/* #undef HAVE_X11_XLIB_H */
-
-/* Define if you have the <X11/extensions/Xv.h> header file. */
-/* #undef HAVE_X11_EXTENSIONS_XV_H */
-
-/* Define if you have the <X11/extensions/dpms.h> header file. */
-/* #undef HAVE_X11_EXTENSIONS_DPMS_H */
-
-/* Define if you have the <a52dec/a52.h> header file. */
-/* #undef HAVE_A52DEC_A52_H */
-
-/* Define if you have the <argz.h> header file. */
-/* #undef HAVE_ARGZ_H */
-
-/* Define if you have the <arpa/inet.h> header file. */
-/* #undef HAVE_ARPA_INET_H */
-
-/* Define if you have the <cthreads.h> header file. */
-/* #undef HAVE_CTHREADS_H */
-
-/* Define if you have the <ddraw.h> header file. */
-/* #undef HAVE_DDRAW_H */
-
-/* Define if you have the <dlfcn.h> header file. */
-/* #undef HAVE_DLFCN_H */
-
-/* Define if you have the <dvd.h> header file. */
-/* #undef HAVE_DVD_H */
-
/* Define if you have the <fcntl.h> header file. */
#define HAVE_FCNTL_H 1
-/* Define if you have the <gdk/gdk.h> header file. */
-#define HAVE_GDK_GDK_H 1
-
-/* Define if you have the <getopt.h> header file. */
-/* #undef HAVE_GETOPT_H */
-
-/* Define if you have the <glib.h> header file. */
-#define HAVE_GLIB_H 1
-
-/* Define if you have the <gnome.h> header file. */
-/* #undef HAVE_GNOME_H */
-
-/* Define if you have the <gtk/gtk.h> header file. */
-#define HAVE_GTK_GTK_H 1
-
-/* Define if you have the <image.h> header file. */
-/* #undef HAVE_IMAGE_H */
-
-/* Define if you have the <kernel/OS.h> header file. */
-/* #undef HAVE_KERNEL_OS_H */
-
-/* Define if you have the <kernel/scheduler.h> header file. */
-/* #undef HAVE_KERNEL_SCHEDULER_H */
-
-/* Define if you have the <limits.h> header file. */
-#define HAVE_LIMITS_H 1
-
-/* Define if you have the <linux/cdrom.h> header file. */
-/* #undef HAVE_LINUX_CDROM_H */
-
-/* Define if you have the <linux/fb.h> header file. */
-/* #undef HAVE_LINUX_FB_H */
-
/* Define if you have the <locale.h> header file. */
#define HAVE_LOCALE_H 1
-/* Define if you have the <machine/param.h> header file. */
-/* #undef HAVE_MACHINE_PARAM_H */
-
-/* Define if you have the <machine/soundcard.h> header file. */
-/* #undef HAVE_MACHINE_SOUNDCARD_H */
-
-/* Define if you have the <mad.h> header file. */
-/* #undef HAVE_MAD_H */
-
/* Define if you have the <malloc.h> header file. */
#define HAVE_MALLOC_H 1
-/* Define if you have the <net/if.h> header file. */
-/* #undef HAVE_NET_IF_H */
-
-/* Define if you have the <netinet/in.h> header file. */
-/* #undef HAVE_NETINET_IN_H */
-
-/* Define if you have the <nl_types.h> header file. */
-/* #undef HAVE_NL_TYPES_H */
-
-/* Define if you have the <pthread.h> header file. */
-/* #undef HAVE_PTHREAD_H */
-
-/* Define if you have the <soundcard.h> header file. */
-/* #undef HAVE_SOUNDCARD_H */
-
/* Define if you have the <stddef.h> header file. */
#define HAVE_STDDEF_H 1
/* Define if you have the <string.h> header file. */
#define HAVE_STRING_H 1
-/* Define if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define if you have the <sys/cdio.h> header file. */
-/* #undef HAVE_SYS_CDIO_H */
-
-/* Define if you have the <sys/dvdio.h> header file. */
-/* #undef HAVE_SYS_DVDIO_H */
+/* Define if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
-/* Define if you have the <sys/ioctl.h> header file. */
-/* #undef HAVE_SYS_IOCTL_H */
+/* Package name */
+#define VLC_PACKAGE "vlc"
-/* Define if you have the <sys/param.h> header file. */
-/* #undef HAVE_SYS_PARAM_H */
-
-/* Define if you have the <sys/shm.h> header file. */
-/* #undef HAVE_SYS_SHM_H */
-
-/* Define if you have the <sys/socket.h> header file. */
-/* #undef HAVE_SYS_SOCKET_H */
-
-/* Define if you have the <sys/sockio.h> header file. */
-/* #undef HAVE_SYS_SOCKIO_H */
-
-/* Define if you have the <sys/soundcard.h> header file. */
-/* #undef HAVE_SYS_SOUNDCARD_H */
-
-/* Define if you have the <sys/time.h> header file. */
-#define HAVE_SYS_TIME_H 1
-
-/* Define if you have the <sys/times.h> header file. */
-/* #undef HAVE_SYS_TIMES_H */
-
-/* Define if you have the <unistd.h> header file. */
-/* #undef HAVE_UNISTD_H */
-
-/* Define if you have the <winioctl.h> header file. */
-#define HAVE_WINIOCTL_H 1
-
-/* Define if you have the mad library (-lmad). */
-/* #undef HAVE_LIBMAD */
-
-/* Define if you have the pth library (-lpth). */
-/* #undef HAVE_LIBPTH */
-
-/* Define if you have the st library (-lst). */
-/* #undef HAVE_LIBST */
-
-/* css decryption with player keys */
-/* #undef HAVE_CSSKEYS */
+/* Package version */
+#define VLC_VERSION "0.3.1"
/* Define if you have the iconv() function. */
/* #undef HAVE_ICONV */
/* Define as const if the declaration of iconv() needs const. */
/* #undef ICONV_CONST */
-/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
-/* #undef HAVE_LANGINFO_CODESET */
-
/* Define if your <locale.h> file defines LC_MESSAGES. */
/* #undef HAVE_LC_MESSAGES */
is requested. */
#define ENABLE_NLS 1
-/* Define if the GNU gettext() function is already present or preinstalled. */
-/* #undef HAVE_GETTEXT */
-
-/* long getopt support */
-/* #undef HAVE_GETOPT_LONG */
-
-/* getopt support */
-/* #undef HAVE_GETOPT_LONG */
-
-/* Define if <pthread.h> defines pthread_cond_t. */
-/* #undef PTHREAD_COND_T_IN_PTHREAD_H */
-
-/* Define if <strings.h> defines strncasecmp. */
-/* #undef STRNCASECMP_IN_STRINGS_H */
-
-/* Define if <X11/extensions/dpms.h> defines DPMSInfo. */
-/* #undef DPMSINFO_IN_DPMS_H */
-
-/* Define if <sys/param.h> defines ntohl. */
-/* #undef NTOHL_IN_SYS_PARAM_H */
-
/* Maximum supported data alignment */
#define ATTRIBUTE_ALIGNED_MAX 16
-/* Define if <sys/types.h> defines boolean_t. */
-/* #undef BOOLEAN_T_IN_SYS_TYPES_H */
-
-/* Define if <pthread.h> defines boolean_t. */
-/* #undef BOOLEAN_T_IN_PTHREAD_H */
-
-/* Define if <cthreads.h> defines boolean_t. */
-/* #undef BOOLEAN_T_IN_CTHREADS_H */
-
-/* Define if $CC groks 3D Now! inline assembly. */
-#define CAN_COMPILE_3DNOW 1
-
-/* Define if $CC groks SSE inline assembly. */
-#define CAN_COMPILE_SSE 1
-
-/* Define if $CC groks ALTIVEC inline assembly. */
-/* #undef CAN_COMPILE_ALTIVEC */
-
-/* Define if your compiler groks C altivec extensions. */
-/* #undef CAN_COMPILE_C_ALTIVEC */
-
-/* Define if <sys/cdio.h> defines dvd_struct. */
-/* #undef DVD_STRUCT_IN_SYS_CDIO_H */
-
-/* Define if <sys/dvdio.h> defines dvd_struct. */
-/* #undef DVD_STRUCT_IN_SYS_DVDIO_H */
-
-/* Define if <linux/cdrom.h> defines DVD_STRUCT. */
-/* #undef DVD_STRUCT_IN_LINUX_CDROM_H */
-
-/* Define if <dvd.h> defines DVD_STRUCT. */
-/* #undef DVD_STRUCT_IN_DVD_H */
-
-/* Define if <extras/BSDI_dvdioctl/dvd.h> defines DVD_STRUCT. */
-/* #undef DVD_STRUCT_IN_BSDI_DVDIOCTL_DVD_H */
-
-/* Have userspace SCSI headers. */
-/* #undef SOLARIS_USCSI */
-
-/* Define if <sys/scsi.h> defines sctl_io. */
-/* #undef HPUX_SCTL_IO */
-
-/* Define if Linux-like dvd_struct is defined. */
-/* #undef HAVE_LINUX_DVD_STRUCT */
-
-/* Define if OpenBSD-like dvd_struct is defined. */
-/* #undef HAVE_OPENBSD_DVD_STRUCT */
-
-/* Define if FreeBSD-like dvd_struct is defined. */
-/* #undef HAVE_BSD_DVD_STRUCT */
-
-/* define if compiling with satellite card support */
-/* #undef HAVE_SATELLITE */
-
-/* Indicate whether we should use SDL/SDL.h or SDL11/SDL.h */
-#define SDL_INCLUDE_FILE <SDL/SDL.h>
-
-/* big endian system */
-/* #undef WORDS_BIGENDIAN */
+/* Simple version string */
+#define VERSION_MESSAGE "vlc 0.3.1_2002-05-17 Ourumov Copyright 1996-2002 VideoLAN"
-/* Define if <pth.h> defines pth_init */
-/* #undef PTH_INIT_IN_PTH_H */
+/* Copyright string */
+#define COPYRIGHT_MESSAGE "VideoLAN Client - version 0.3.1_2002-05-03 Ourumov - (c) 1996-2002 VideoLAN"
-/* Define if <st.h> defines st_init */
-/* #undef ST_INIT_IN_ST_H */
+/* String suffix for module functions */
+#define MODULE_SUFFIX "__MODULE_0_3_1_2002_05_17"
+/* Symbol suffix for module functions */
+#define MODULE_SYMBOL 0_3_1_2002_05_17
--- /dev/null
+/*
+ * dirent.c
+ *
+ * Derived from DIRLIB.C by Matt J. Weinstein
+ * This note appears in the DIRLIB.H
+ * DIRLIB.H by M. J. Weinstein Released to public domain 1-Jan-89
+ *
+ * Updated by Jeremy Bettis <jeremy@hksys.com>
+ * Significantly revised and rewinddir, seekdir and telldir added by Colin
+ * Peters <colin@fu.is.saga-u.ac.jp>
+ *
+ * $Revision: 1.1 $
+ * $Author: gbazin $
+ * $Date: 2002/05/18 14:03:13 $
+ *
+ */
+
+#include <stdlib.h>
+#include <errno.h>
+#include <string.h>
+#include <io.h>
+#include <direct.h>
+#include <dirent.h>
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h> /* for GetFileAttributes */
+
+#define SUFFIX "*"
+#define SLASH "\\"
+
+/*
+ * opendir
+ *
+ * Returns a pointer to a DIR structure appropriately filled in to begin
+ * searching a directory.
+ */
+DIR *
+opendir (const CHAR *szPath)
+{
+ DIR *nd;
+ unsigned int rc;
+ CHAR szFullPath[MAX_PATH];
+
+ errno = 0;
+
+ if (!szPath)
+ {
+ errno = EFAULT;
+ return (DIR *) 0;
+ }
+
+ if (szPath[0] == '\0')
+ {
+ errno = ENOTDIR;
+ return (DIR *) 0;
+ }
+
+ /* Attempt to determine if the given path really is a directory. */
+ rc = GetFileAttributes (szPath);
+ if (rc == -1)
+ {
+ /* call GetLastError for more error info */
+ errno = ENOENT;
+ return (DIR *) 0;
+ }
+ if (!(rc & FILE_ATTRIBUTE_DIRECTORY))
+ {
+ /* Error, entry exists but not a directory. */
+ errno = ENOTDIR;
+ return (DIR *) 0;
+ }
+
+ /* Make an absolute pathname. */
+ _fullpath (szFullPath, szPath, MAX_PATH);
+
+ /* Allocate enough space to store DIR structure and the complete
+ * directory path given. */
+ nd = (DIR *) malloc (sizeof (DIR) + strlen (szFullPath) + strlen (SLASH) +
+ strlen (SUFFIX));
+
+ if (!nd)
+ {
+ /* Error, out of memory. */
+ errno = ENOMEM;
+ return (DIR *) 0;
+ }
+
+ /* Create the search expression. */
+ strcpy (nd->dd_name, szFullPath);
+
+ /* Add on a slash if the path does not end with one. */
+ if (nd->dd_name[0] != '\0' &&
+ nd->dd_name[strlen (nd->dd_name) - 1] != '/' &&
+ nd->dd_name[strlen (nd->dd_name) - 1] != '\\')
+ {
+ strcat (nd->dd_name, SLASH);
+ }
+
+ /* Add on the search pattern */
+ strcat (nd->dd_name, SUFFIX);
+
+ /* Initialize handle to -1 so that a premature closedir doesn't try
+ * to call _findclose on it. */
+ nd->dd_handle = -1;
+
+ /* Initialize the status. */
+ nd->dd_stat = 0;
+
+ /* Initialize the dirent structure. ino and reclen are invalid under
+ * Win32, and name simply points at the appropriate part of the
+ * findfirst_t structure. */
+ nd->dd_dir.d_ino = 0;
+ nd->dd_dir.d_reclen = 0;
+ nd->dd_dir.d_namlen = 0;
+ nd->dd_dir.d_name = nd->dd_dta.name;
+
+ return nd;
+}
+
+
+/*
+ * readdir
+ *
+ * Return a pointer to a dirent structure filled with the information on the
+ * next entry in the directory.
+ */
+struct dirent *
+readdir (DIR * dirp)
+{
+ errno = 0;
+
+ /* Check for valid DIR struct. */
+ if (!dirp)
+ {
+ errno = EFAULT;
+ return (struct dirent *) 0;
+ }
+
+ if (dirp->dd_dir.d_name != dirp->dd_dta.name)
+ {
+ /* The structure does not seem to be set up correctly. */
+ errno = EINVAL;
+ return (struct dirent *) 0;
+ }
+
+ if (dirp->dd_stat < 0)
+ {
+ /* We have already returned all files in the directory
+ * (or the structure has an invalid dd_stat). */
+ return (struct dirent *) 0;
+ }
+ else if (dirp->dd_stat == 0)
+ {
+ /* We haven't started the search yet. */
+ /* Start the search */
+ dirp->dd_handle = _findfirst (dirp->dd_name, &(dirp->dd_dta));
+
+ if (dirp->dd_handle == -1)
+ {
+ /* Whoops! Seems there are no files in that
+ * directory. */
+ dirp->dd_stat = -1;
+ }
+ else
+ {
+ dirp->dd_stat = 1;
+ }
+ }
+ else
+ {
+ /* Get the next search entry. */
+ if (_findnext (dirp->dd_handle, &(dirp->dd_dta)))
+ {
+ /* We are off the end or otherwise error. */
+ _findclose (dirp->dd_handle);
+ dirp->dd_handle = -1;
+ dirp->dd_stat = -1;
+ }
+ else
+ {
+ /* Update the status to indicate the correct
+ * number. */
+ dirp->dd_stat++;
+ }
+ }
+
+ if (dirp->dd_stat > 0)
+ {
+ /* Successfully got an entry. Everything about the file is
+ * already appropriately filled in except the length of the
+ * file name. */
+ dirp->dd_dir.d_namlen = strlen (dirp->dd_dir.d_name);
+ return &dirp->dd_dir;
+ }
+
+ return (struct dirent *) 0;
+}
+
+
+/*
+ * closedir
+ *
+ * Frees up resources allocated by opendir.
+ */
+int
+closedir (DIR * dirp)
+{
+ int rc;
+
+ errno = 0;
+ rc = 0;
+
+ if (!dirp)
+ {
+ errno = EFAULT;
+ return -1;
+ }
+
+ if (dirp->dd_handle != -1)
+ {
+ rc = _findclose (dirp->dd_handle);
+ }
+
+ /* Delete the dir structure. */
+ free (dirp);
+
+ return rc;
+}
+
+/*
+ * rewinddir
+ *
+ * Return to the beginning of the directory "stream". We simply call findclose
+ * and then reset things like an opendir.
+ */
+void
+rewinddir (DIR * dirp)
+{
+ errno = 0;
+
+ if (!dirp)
+ {
+ errno = EFAULT;
+ return;
+ }
+
+ if (dirp->dd_handle != -1)
+ {
+ _findclose (dirp->dd_handle);
+ }
+
+ dirp->dd_handle = -1;
+ dirp->dd_stat = 0;
+}
+
+/*
+ * telldir
+ *
+ * Returns the "position" in the "directory stream" which can be used with
+ * seekdir to go back to an old entry. We simply return the value in stat.
+ */
+long
+telldir (DIR * dirp)
+{
+ errno = 0;
+
+ if (!dirp)
+ {
+ errno = EFAULT;
+ return -1;
+ }
+ return dirp->dd_stat;
+}
+
+/*
+ * seekdir
+ *
+ * Seek to an entry previously returned by telldir. We rewind the directory
+ * and call readdir repeatedly until either dd_stat is the position number
+ * or -1 (off the end). This is not perfect, in that the directory may
+ * have changed while we weren't looking. But that is probably the case with
+ * any such system.
+ */
+void
+seekdir (DIR * dirp, long lPos)
+{
+ errno = 0;
+
+ if (!dirp)
+ {
+ errno = EFAULT;
+ return;
+ }
+
+ if (lPos < -1)
+ {
+ /* Seeking to an invalid position. */
+ errno = EINVAL;
+ return;
+ }
+ else if (lPos == -1)
+ {
+ /* Seek past end. */
+ if (dirp->dd_handle != -1)
+ {
+ _findclose (dirp->dd_handle);
+ }
+ dirp->dd_handle = -1;
+ dirp->dd_stat = -1;
+ }
+ else
+ {
+ /* Rewind and read forward to the appropriate index. */
+ rewinddir (dirp);
+
+ while ((dirp->dd_stat < lPos) && readdir (dirp))
+ ;
+ }
+}
--- /dev/null
+/*
+ * DIRENT.H (formerly DIRLIB.H)
+ *
+ * by M. J. Weinstein Released to public domain 1-Jan-89
+ *
+ * Because I have heard that this feature (opendir, readdir, closedir)
+ * it so useful for programmers coming from UNIX or attempting to port
+ * UNIX code, and because it is reasonably light weight, I have included
+ * it in the Mingw32 package. I have also added an implementation of
+ * rewinddir, seekdir and telldir.
+ * - Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
+ *
+ * This code is distributed in the hope that is will be useful but
+ * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
+ * DISCLAIMED. This includeds but is not limited to warranties of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * $Revision: 1.1 $
+ * $Author: gbazin $
+ * $Date: 2002/05/18 14:03:13 $
+ *
+ */
+
+#ifndef __STRICT_ANSI__
+
+#ifndef _DIRENT_H_
+#define _DIRENT_H_
+
+#include <io.h>
+
+#ifndef RC_INVOKED
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct dirent
+{
+ long d_ino; /* Always zero. */
+ unsigned short d_reclen; /* Always zero. */
+ unsigned short d_namlen; /* Length of name in d_name. */
+ char* d_name; /* File name. */
+ /* NOTE: The name in the dirent structure points to the name in the
+ * finddata_t structure in the DIR. */
+};
+
+/*
+ * This is an internal data structure. Good programmers will not use it
+ * except as an argument to one of the functions below.
+ */
+typedef struct
+{
+ /* disk transfer area for this dir */
+ struct _finddata_t dd_dta;
+
+ /* dirent struct to return from dir (NOTE: this makes this thread
+ * safe as long as only one thread uses a particular DIR struct at
+ * a time) */
+ struct dirent dd_dir;
+
+ /* _findnext handle */
+ long dd_handle;
+
+ /*
+ * Status of search:
+ * 0 = not started yet (next entry to read is first entry)
+ * -1 = off the end
+ * positive = 0 based index of next entry
+ */
+ short dd_stat;
+
+ /* given path for dir with search pattern (struct is extended) */
+ char dd_name[1];
+} DIR;
+
+
+
+DIR* opendir (const char*);
+struct dirent* readdir (DIR*);
+int closedir (DIR*);
+void rewinddir (DIR*);
+long telldir (DIR*);
+void seekdir (DIR*, long);
+
+
+/* wide char versions */
+
+struct _wdirent
+{
+ long d_ino; /* Always zero. */
+ unsigned short d_reclen; /* Always zero. */
+ unsigned short d_namlen; /* Length of name in d_name. */
+ wchar_t* d_name; /* File name. */
+ /* NOTE: The name in the dirent structure points to the name in the
+ * wfinddata_t structure in the _WDIR. */
+};
+
+/*
+ * This is an internal data structure. Good programmers will not use it
+ * except as an argument to one of the functions below.
+ */
+typedef struct
+{
+ /* disk transfer area for this dir */
+ struct _wfinddata_t dd_dta;
+
+ /* dirent struct to return from dir (NOTE: this makes this thread
+ * safe as long as only one thread uses a particular DIR struct at
+ * a time) */
+ struct _wdirent dd_dir;
+
+ /* _findnext handle */
+ long dd_handle;
+
+ /*
+ * Status of search:
+ * 0 = not started yet (next entry to read is first entry)
+ * -1 = off the end
+ * positive = 0 based index of next entry
+ */
+ short dd_stat;
+
+ /* given path for dir with search pattern (struct is extended) */
+ wchar_t dd_name[1];
+} _WDIR;
+
+
+
+_WDIR* _wopendir (const wchar_t*);
+struct _wdirent* _wreaddir (_WDIR*);
+int _wclosedir (_WDIR*);
+void _wrewinddir (_WDIR*);
+long _wtelldir (_WDIR*);
+void _wseekdir (_WDIR*, long);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* Not RC_INVOKED */
+
+#endif /* Not _DIRENT_H_ */
+
+#endif /* Not __STRICT_ANSI__ */
+
# PROP Ignore_Export_Lib 0\r
# PROP Target_Dir ""\r
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c\r
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /I . /I../../include /c\r
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "__VLC__" /YX /FD /I../../include /c\r
# ADD BASE RSC /l 0x414 /d "NDEBUG"\r
# ADD RSC /l 0x414 /d "NDEBUG"\r
BSC32=bscmake.exe\r
# PROP Ignore_Export_Lib 0\r
# PROP Target_Dir ""\r
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /I . /I../../include /c\r
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "__VLC__" /YX /FD /GZ /I../../include /c\r
# ADD BASE RSC /l 0x414 /d "_DEBUG"\r
# ADD RSC /l 0x809 /i "../" /d "_DEBUG"\r
BSC32=bscmake.exe\r
SOURCE=..\..\extras\GNUgetopt\getopt1.c\r
# End Source File\r
# End Group\r
+# Begin Group "dirent"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=.\dirent.c\r
+# End Source File\r
+# End Group\r
# Begin Group "libdvdcss"\r
\r
# PROP Default_Filter ""\r
# Begin Source File\r
\r
-SOURCE=..\..\extras\libdvdcss\css.c\r
+SOURCE=..\..\..\libdvdcss\src\common.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\libdvdcss\src\config.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\libdvdcss\src\css.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\libdvdcss\src\css.h\r
# End Source File\r
# Begin Source File\r
\r
-SOURCE=..\..\extras\libdvdcss\css.h\r
+SOURCE=..\..\..\libdvdcss\src\csstables.h\r
# End Source File\r
# Begin Source File\r
\r
-SOURCE=..\..\extras\libdvdcss\csstables.h\r
+SOURCE=..\..\..\libdvdcss\src\dvdcss\dvdcss.h\r
# End Source File\r
# Begin Source File\r
\r
-SOURCE=..\..\extras\libdvdcss\ioctl.c\r
+SOURCE=..\..\..\libdvdcss\src\ioctl.c\r
# End Source File\r
# Begin Source File\r
\r
-SOURCE=..\..\extras\libdvdcss\ioctl.h\r
+SOURCE=..\..\..\libdvdcss\src\ioctl.h\r
# End Source File\r
# Begin Source File\r
\r
-SOURCE=..\..\extras\libdvdcss\libdvdcss.c\r
+SOURCE=..\..\..\libdvdcss\src\libdvdcss.c\r
# End Source File\r
# Begin Source File\r
\r
-SOURCE=..\..\extras\libdvdcss\libdvdcss.h\r
+SOURCE=..\..\..\libdvdcss\src\libdvdcss.h\r
# End Source File\r
# End Group\r
# End Group\r
# Begin Group "plugins"\r
\r
# PROP Default_Filter ""\r
+# Begin Group "a52"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=..\..\plugins\a52\a52.c\r
+\r
+!IF "$(CFG)" == "vlc - Win32 Release"\r
+\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=a52 /D "USE_A52DEC_TREE" /I../a52dec\r
+\r
+!ELSEIF "$(CFG)" == "vlc - Win32 Debug"\r
+\r
+# PROP Exclude_From_Build 1\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=a52 /D "USE_A52DEC_TREE" /I../a52dec\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\plugins\a52\a52.h\r
+\r
+!IF "$(CFG)" == "vlc - Win32 Release"\r
+\r
+!ELSEIF "$(CFG)" == "vlc - Win32 Debug"\r
+\r
+# PROP Exclude_From_Build 1\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# End Group\r
# Begin Group "ac3_adec"\r
\r
# PROP Default_Filter ""\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\ac3_adec\ac3_adec.c\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=ac3_adec\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=ac3_adec\r
# End Source File\r
# Begin Source File\r
\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\ac3_adec\ac3_bit_allocate.c\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=ac3_adec\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=ac3_adec\r
# End Source File\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\ac3_adec\ac3_decoder.c\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=ac3_adec\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=ac3_adec\r
# End Source File\r
# Begin Source File\r
\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\ac3_adec\ac3_exponent.c\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=ac3_adec\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=ac3_adec\r
# End Source File\r
# Begin Source File\r
\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\ac3_adec\ac3_imdct.c\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=ac3_adec\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=ac3_adec\r
# End Source File\r
# Begin Source File\r
\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\ac3_adec\ac3_mantissa.c\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=ac3_adec\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=ac3_adec\r
# End Source File\r
# Begin Source File\r
\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\ac3_adec\ac3_parse.c\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=ac3_adec\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=ac3_adec\r
# End Source File\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\ac3_adec\ac3_rematrix.c\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=ac3_adec\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=ac3_adec\r
# End Source File\r
# End Group\r
# Begin Group "access"\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\access\file.c\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=file\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=file\r
# End Source File\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\access\http.c\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=http\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=http\r
# End Source File\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\access\udp.c\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=udp\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=udp\r
# End Source File\r
# End Group\r
# Begin Group "chroma"\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\chroma\i420_rgb.c\r
-# ADD CPP /D "BUILTIN" /D "MODULE_NAME_IS_chroma_i420_rgb" /D MODULE_NAME=chroma_i420_rgb\r
+# ADD CPP /D "__BUILTIN__" /D "MODULE_NAME_IS_chroma_i420_rgb" /D MODULE_NAME=chroma_i420_rgb\r
# End Source File\r
# Begin Source File\r
\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\chroma\i420_rgb16.c\r
-# ADD CPP /D "BUILTIN" /D "MODULE_NAME_IS_chroma_i420_rgb" /D MODULE_NAME=chroma_i420_rgb\r
+# ADD CPP /D "__BUILTIN__" /D "MODULE_NAME_IS_chroma_i420_rgb" /D MODULE_NAME=chroma_i420_rgb\r
# End Source File\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\chroma\i420_rgb8.c\r
-# ADD CPP /D "BUILTIN" /D "MODULE_NAME_IS_chroma_i420_rgb" /D MODULE_NAME=chroma_i420_rgb\r
+# ADD CPP /D "__BUILTIN__" /D "MODULE_NAME_IS_chroma_i420_rgb" /D MODULE_NAME=chroma_i420_rgb\r
# End Source File\r
# Begin Source File\r
\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\chroma\i420_yuy2.c\r
-# ADD CPP /D "BUILTIN" /D "MODULE_NAME_IS_chroma_i420_yuy2" /D MODULE_NAME=chroma_i420_yuy2\r
+# ADD CPP /D "__BUILTIN__" /D "MODULE_NAME_IS_chroma_i420_yuy2" /D MODULE_NAME=chroma_i420_yuy2\r
# End Source File\r
# Begin Source File\r
\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\chroma\i422_yuy2.c\r
-# ADD CPP /D "BUILTIN" /D "MODULE_NAME_IS_chroma_i422_yuy2" /D MODULE_NAME=chroma_i422_yuy2\r
+# ADD CPP /D "__BUILTIN__" /D "MODULE_NAME_IS_chroma_i422_yuy2" /D MODULE_NAME=chroma_i422_yuy2\r
# End Source File\r
# Begin Source File\r
\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\directx\aout_directx.c\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=directx\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=directx\r
# End Source File\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\directx\directx.c\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=directx\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=directx\r
# End Source File\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\directx\vout_directx.c\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=directx\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=directx\r
# End Source File\r
# Begin Source File\r
\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\directx\vout_events.c\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=directx\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=directx\r
# End Source File\r
# End Group\r
# Begin Group "downmix"\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\downmix\ac3_downmix_c.c\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=downmix\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=downmix\r
# End Source File\r
# Begin Source File\r
\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\downmix\downmix.c\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=downmix\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=downmix\r
# End Source File\r
# End Group\r
# Begin Group "dummy"\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\dummy\aout_dummy.c\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=dummy\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=dummy\r
# End Source File\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\dummy\dummy.c\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=dummy\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=dummy\r
# End Source File\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\dummy\input_dummy.c\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=dummy\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=dummy\r
# End Source File\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\dummy\intf_dummy.c\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=dummy\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=dummy\r
# End Source File\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\dummy\null.c\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=null\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=null\r
# End Source File\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\dummy\vout_dummy.c\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=dummy\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=dummy\r
# End Source File\r
# End Group\r
# Begin Group "dvd"\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\dvd\dvd.c\r
-# ADD CPP /I "../libdvdcss" /D "BUILTIN" /D MODULE_NAME=dvd\r
+# ADD CPP /I "../../include" /I "../../../libdvdcss/src" /D "__BUILTIN__" /D MODULE_NAME=dvd\r
# End Source File\r
# Begin Source File\r
\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\dvd\dvd_access.c\r
-# ADD CPP /I "../libdvdcss" /D "BUILTIN" /D MODULE_NAME=dvd\r
+# ADD CPP /I "../../include" /I "../../../libdvdcss/src" /D "__BUILTIN__" /D MODULE_NAME=dvd\r
# End Source File\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\dvd\dvd_demux.c\r
-# ADD CPP /I "../libdvdcss" /D "BUILTIN" /D MODULE_NAME=dvd\r
+# ADD CPP /I "../../include" /I "../../../libdvdcss/src" /D "__BUILTIN__" /D MODULE_NAME=dvd\r
# End Source File\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\dvd\dvd_es.c\r
-# ADD CPP /I "../libdvdcss" /D "BUILTIN" /D MODULE_NAME=dvd\r
+# ADD CPP /I "../../include" /I "../../../libdvdcss/src" /D "__BUILTIN__" /D MODULE_NAME=dvd\r
# End Source File\r
# Begin Source File\r
\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\dvd\dvd_ifo.c\r
-# ADD CPP /I "../libdvdcss" /D "BUILTIN" /D MODULE_NAME=dvd\r
+# ADD CPP /I "../../include" /I "../../../libdvdcss/src" /D "__BUILTIN__" /D MODULE_NAME=dvd\r
# End Source File\r
# Begin Source File\r
\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\dvd\dvd_seek.c\r
-# ADD CPP /I "../libdvdcss" /D "BUILTIN" /D MODULE_NAME=dvd\r
+# ADD CPP /I "../../include" /I "../../../libdvdcss/src" /D "__BUILTIN__" /D MODULE_NAME=dvd\r
# End Source File\r
# Begin Source File\r
\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\dvd\dvd_summary.c\r
-# ADD CPP /I "../libdvdcss" /D "BUILTIN" /D MODULE_NAME=dvd\r
+# ADD CPP /I "../../include" /I "../../../libdvdcss/src" /D "__BUILTIN__" /D MODULE_NAME=dvd\r
# End Source File\r
# Begin Source File\r
\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\dvd\dvd_udf.c\r
-# ADD CPP /I "../libdvdcss" /D "BUILTIN" /D MODULE_NAME=dvd\r
+# ADD CPP /I "../../include" /I "../../../libdvdcss/src" /D "__BUILTIN__" /D MODULE_NAME=dvd\r
# End Source File\r
# Begin Source File\r
\r
\r
!IF "$(CFG)" == "vlc - Win32 Release"\r
\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=deinterlace\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=deinterlace\r
\r
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"\r
\r
# PROP Exclude_From_Build 1\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=deinterlace\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=deinterlace\r
\r
!ENDIF \r
\r
\r
!IF "$(CFG)" == "vlc - Win32 Release"\r
\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=distort\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=distort\r
\r
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"\r
\r
# PROP Exclude_From_Build 1\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=distort\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=distort\r
\r
!ENDIF \r
\r
\r
!IF "$(CFG)" == "vlc - Win32 Release"\r
\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=insert\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=insert\r
\r
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"\r
\r
# PROP Exclude_From_Build 1\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=insert\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=insert\r
\r
!ENDIF \r
\r
\r
!IF "$(CFG)" == "vlc - Win32 Release"\r
\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=transform\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=transform\r
\r
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"\r
\r
# PROP Exclude_From_Build 1\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=transform\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=transform\r
\r
!ENDIF \r
\r
\r
!IF "$(CFG)" == "vlc - Win32 Release"\r
\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=wall\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=wall\r
\r
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"\r
\r
# PROP Exclude_From_Build 1\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=wall\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=wall\r
\r
!ENDIF \r
\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\fx\scope.c\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=scope\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=scope\r
# End Source File\r
# End Group\r
# Begin Group "gtk"\r
\r
!IF "$(CFG)" == "vlc - Win32 Release"\r
\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=gtk\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=gtk\r
\r
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"\r
\r
# PROP Exclude_From_Build 1\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=gtk\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=gtk\r
\r
!ENDIF \r
\r
\r
!IF "$(CFG)" == "vlc - Win32 Release"\r
\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=gtk\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=gtk\r
\r
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"\r
\r
# PROP Exclude_From_Build 1\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=gtk\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=gtk\r
\r
!ENDIF \r
\r
\r
!IF "$(CFG)" == "vlc - Win32 Release"\r
\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=gtk\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=gtk\r
\r
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"\r
\r
# PROP Exclude_From_Build 1\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=gtk\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=gtk\r
\r
!ENDIF \r
\r
\r
!IF "$(CFG)" == "vlc - Win32 Release"\r
\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=gtk\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=gtk\r
\r
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"\r
\r
# PROP Exclude_From_Build 1\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=gtk\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=gtk\r
\r
!ENDIF \r
\r
\r
!IF "$(CFG)" == "vlc - Win32 Release"\r
\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=gtk\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=gtk\r
\r
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"\r
\r
# PROP Exclude_From_Build 1\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=gtk\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=gtk\r
\r
!ENDIF \r
\r
\r
!IF "$(CFG)" == "vlc - Win32 Release"\r
\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=gtk\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=gtk\r
\r
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"\r
\r
# PROP Exclude_From_Build 1\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=gtk\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=gtk\r
\r
!ENDIF \r
\r
\r
!IF "$(CFG)" == "vlc - Win32 Release"\r
\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=gtk\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=gtk\r
\r
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"\r
\r
# PROP Exclude_From_Build 1\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=gtk\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=gtk\r
\r
!ENDIF \r
\r
\r
!IF "$(CFG)" == "vlc - Win32 Release"\r
\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=gtk\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=gtk\r
\r
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"\r
\r
# PROP Exclude_From_Build 1\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=gtk\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=gtk\r
\r
!ENDIF \r
\r
\r
!IF "$(CFG)" == "vlc - Win32 Release"\r
\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=gtk\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=gtk\r
\r
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"\r
\r
# PROP Exclude_From_Build 1\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=gtk\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=gtk\r
\r
!ENDIF \r
\r
\r
!IF "$(CFG)" == "vlc - Win32 Release"\r
\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=gtk\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=gtk\r
\r
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"\r
\r
# PROP Exclude_From_Build 1\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=gtk\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=gtk\r
\r
!ENDIF \r
\r
\r
!IF "$(CFG)" == "vlc - Win32 Release"\r
\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=gtk\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=gtk\r
\r
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"\r
\r
# PROP Exclude_From_Build 1\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=gtk\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=gtk\r
\r
!ENDIF \r
\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\idct\idct.c\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=idct\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=idct\r
# End Source File\r
# Begin Source File\r
\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\idct\idctclassic.c\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=idctclassic\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=idctclassic\r
# End Source File\r
# End Group\r
# Begin Group "imdct"\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\imdct\ac3_imdct_c.c\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=imdct\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=imdct\r
# End Source File\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\imdct\ac3_imdct_common.c\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=imdct\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=imdct\r
# End Source File\r
# Begin Source File\r
\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\imdct\ac3_srfft_c.c\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=imdct\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=imdct\r
# End Source File\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\imdct\imdct.c\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=imdct\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=imdct\r
# End Source File\r
# End Group\r
# Begin Group "lpcm_adec"\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\lpcm_adec\lpcm_adec.c\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=lpcm_adec\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=lpcm_adec\r
# End Source File\r
# Begin Source File\r
\r
\r
!IF "$(CFG)" == "vlc - Win32 Release"\r
\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=memcpy\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=memcpy\r
\r
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"\r
\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=memcpy /D "MODULE_NAME_IS_memcpy"\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=memcpy /D "MODULE_NAME_IS_memcpy"\r
\r
!ENDIF \r
\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\motion\motion.c\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=motion\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=motion\r
# End Source File\r
# End Group\r
# Begin Group "mpeg_adec"\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\mpeg_adec\adec_layer1.c\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=mpeg_adec\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=mpeg_adec\r
# End Source File\r
# Begin Source File\r
\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\mpeg_adec\adec_layer2.c\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=mpeg_adec\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=mpeg_adec\r
# End Source File\r
# Begin Source File\r
\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\mpeg_adec\adec_math.c\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=mpeg_adec\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=mpeg_adec\r
# End Source File\r
# Begin Source File\r
\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\mpeg_adec\mpeg_adec.c\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=mpeg_adec\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=mpeg_adec\r
# End Source File\r
# Begin Source File\r
\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\mpeg_adec\mpeg_adec_generic.c\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=mpeg_adec\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=mpeg_adec\r
# End Source File\r
# Begin Source File\r
\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\mpeg_system\mpeg_es.c\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=mpeg_es\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=mpeg_es\r
# End Source File\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\mpeg_system\mpeg_ps.c\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=mpeg_ps\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=mpeg_ps\r
# End Source File\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\mpeg_system\mpeg_ts.c\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=mpeg_ts\r
+\r
+!IF "$(CFG)" == "vlc - Win32 Release"\r
+\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=mpeg_ts\r
+\r
+!ELSEIF "$(CFG)" == "vlc - Win32 Debug"\r
+\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=mpeg_ts /D "MODULE_NAME_IS_mpeg_ts"\r
+\r
+!ENDIF \r
+\r
# End Source File\r
# End Group\r
# Begin Group "mpeg_vdec"\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\mpeg_vdec\video_decoder.c\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=mpeg_vdec\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=mpeg_vdec\r
# End Source File\r
# Begin Source File\r
\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\mpeg_vdec\video_parser.c\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=mpeg_vdec\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=mpeg_vdec\r
# End Source File\r
# Begin Source File\r
\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\mpeg_vdec\vpar_blocks.c\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=mpeg_vdec\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=mpeg_vdec\r
# End Source File\r
# Begin Source File\r
\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\mpeg_vdec\vpar_headers.c\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=mpeg_vdec\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=mpeg_vdec\r
# End Source File\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\mpeg_vdec\vpar_pool.c\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=mpeg_vdec\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=mpeg_vdec\r
# End Source File\r
# Begin Source File\r
\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\mpeg_vdec\vpar_synchro.c\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=mpeg_vdec\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=mpeg_vdec\r
# End Source File\r
# End Group\r
# Begin Group "network"\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\network\ipv4.c\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=ipv4\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=ipv4\r
# End Source File\r
# End Group\r
# Begin Group "sdl"\r
\r
!IF "$(CFG)" == "vlc - Win32 Release"\r
\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=sdl\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=sdl\r
\r
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"\r
\r
# PROP Exclude_From_Build 1\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=sdl\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=sdl\r
\r
!ENDIF \r
\r
\r
!IF "$(CFG)" == "vlc - Win32 Release"\r
\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=sdl\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=sdl\r
\r
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"\r
\r
# PROP Exclude_From_Build 1\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=sdl\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=sdl\r
\r
!ENDIF \r
\r
\r
!IF "$(CFG)" == "vlc - Win32 Release"\r
\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=sdl\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=sdl\r
\r
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"\r
\r
# PROP Exclude_From_Build 1\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=sdl\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=sdl\r
\r
!ENDIF \r
\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\spudec\spu_decoder.c\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=spudec\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=spudec\r
# End Source File\r
# Begin Source File\r
\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\text\logger.c\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=logger\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=logger\r
# End Source File\r
# Begin Source File\r
\r
\r
!IF "$(CFG)" == "vlc - Win32 Release"\r
\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=rc\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=rc\r
\r
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"\r
\r
# PROP Exclude_From_Build 1\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=rc\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=rc\r
\r
!ENDIF \r
\r
\r
!IF "$(CFG)" == "vlc - Win32 Release"\r
\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=vcd\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=vcd\r
\r
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"\r
\r
# PROP Exclude_From_Build 1\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=vcd\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=vcd\r
\r
!ENDIF \r
\r
\r
!IF "$(CFG)" == "vlc - Win32 Release"\r
\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=vcd\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=vcd\r
\r
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"\r
\r
# PROP Exclude_From_Build 1\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=vcd\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=vcd\r
\r
!ENDIF \r
\r
\r
!IF "$(CFG)" == "vlc - Win32 Release"\r
\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=vcd\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=vcd\r
\r
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"\r
\r
# PROP Exclude_From_Build 1\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=vcd\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=vcd\r
\r
!ENDIF \r
\r
# Begin Source File\r
\r
SOURCE=..\..\plugins\win32\waveout.c\r
-# ADD CPP /D "BUILTIN" /D MODULE_NAME=waveout\r
+# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=waveout\r
# End Source File\r
# End Group\r
# End Group\r
\r
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"\r
\r
-# ADD BASE RSC /l 0x40c /i "\vlc-win\share"\r
-# ADD RSC /l 0x40c /i "../../" /i "\vlc-win\share"\r
+# ADD BASE RSC /l 0x40c /i "\vlc-win32\share" /i "\vlc-win\share"\r
+# SUBTRACT BASE RSC /i "../"\r
+# ADD RSC /l 0x40c /i "\vlc-win32\share" /i "\vlc-win\share" /i "../../"\r
# SUBTRACT RSC /i "../"\r
\r
!ENDIF \r
/* dvd_es.c: functions to find and select ES
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
- * $Id: dvd_es.c,v 1.10 2002/05/14 19:33:54 bozo Exp $
+ * $Id: dvd_es.c,v 1.11 2002/05/18 14:03:13 gbazin Exp $
*
* Author: Stéphane Borel <stef@via.ecp.fr>
*
vts.manager_inf.p_spu_attr[i-1].i_lang_code,
sizeof(int) + 16*sizeof(u32) );
*(int*)p_es->p_demux_data = 0xBeeF;
- memcpy( (void*)p_es->p_demux_data + sizeof(int),
+ memcpy( (char*)p_es->p_demux_data + sizeof(int),
palette, 16*sizeof(u32) );
}
else
* spu_decoder.c : spu decoder thread
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
- * $Id: spu_decoder.c,v 1.20 2002/05/15 00:40:26 sam Exp $
+ * $Id: spu_decoder.c,v 1.21 2002/05/18 14:03:13 gbazin Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Rudolf Cornelissen <rag.cornelissen@inter.nl.net>
p_spu->p_sys->b_palette = 1;
for( i = 0; i < 4 ; i++ )
{
- i_color = ((u32*)((void*)p_spudec->p_config->
+ i_color = ((u32*)((char*)p_spudec->p_config->
p_demux_data + sizeof(int)))[
GetBits(&p_spudec->bit_stream, 4) ];
* modules.c : Built-in and plugin modules management functions
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: modules.c,v 1.59 2002/05/14 19:47:25 sam Exp $
+ * $Id: modules.c,v 1.60 2002/05/18 14:03:13 gbazin Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Ethan C. Baldridge <BaldridgeE@cadmus.com>
#include <videolan/vlc.h>
-#if !defined( _MSC_VER )
#include <dirent.h>
-#endif
#if defined(HAVE_DLFCN_H) /* Linux, BSD, Hurd */
# include <dlfcn.h> /* dlopen(), dlsym(), dlclose() */
#elif defined(HAVE_IMAGE_H) /* BeOS */
# include <image.h>
# define HAVE_DYNAMIC_PLUGINS
-#elif defined(WIN32) && defined( __MINGW32__ )
+#elif defined(WIN32)
# define HAVE_DYNAMIC_PLUGINS
#else
# undef HAVE_DYNAMIC_PLUGINS
projects / vlc / commitdiff