directory because the two project files are starting to diverge.
* ./evc/vlc.c: created a specific vlc.c file for Windows CE.
* ./src/misc/messages.c: as WinCE doesn't have stdout or stderr, the message
queue outputs to a logfile (until we have a proper interface).
$(NULL)
###############################################################################
-# MS Visual Studio project
+# MS Visual Studio and eMbedded Visual Studio projects
###############################################################################
EXTRA_DIST += \
msvc/vlc.dsw \
msvc/vlc.dsp.in \
msvc/vlc.dsp.out \
- msvc/vlc.vcp \
- msvc/vlc.vcw \
- msvc/vlc.vcp.in \
- msvc/vlc.vcp.out \
msvc/config.h \
msvc/modules_builtin_msvc.h \
+ evc/vlc.vcp \
+ evc/vlc.vcw \
+ evc/vlc.vcp.in \
+ evc/vlc.vcp.out \
+ evc/config.h \
+ evc/modules_builtin_msvc.h \
$(NULL)
show-vlc-sources: FORCE
#! /bin/sh
## bootstrap file for vlc, the VideoLAN Client
-## $Id: bootstrap,v 1.25 2002/11/10 18:04:22 sam Exp $
+## $Id: bootstrap,v 1.26 2002/11/13 15:28:23 sam Exp $
##
## Authors: Samuel Hocevar <sam@zoy.org>
### argument check
###
do_po=no
-do_msvc=no
+do_vc=no
while test $# -gt 0; do
case "$1" in
- --update-msvc)
- do_msvc=yes
+ --update-vc)
+ do_vc=yes
;;
--update-po)
do_po=yes
;;
*)
echo "$0: unknown option $1"
- echo "recognized flags are --update-msvc and --update-po"
+ echo "recognized flags are --update-vc and --update-po"
exit 1
;;
esac
##
## Update the MSVC project files
##
-if test "$do_msvc" = "no"
+if test "$do_vc" = "no"
then
- echo "not updating MSVC project file. use --update-msvc to force doing it."
+ echo "not updating MSVC or eVC project file. use --update-vc to force doing it."
else
if test ! -f Makefile
then
M='\r'
# Sources that get built under Win32
- VLC_SOURCES=`make show-vlc-sources | grep '^X: ' | cut -b3-`
LIBVLC_SOURCES=`make show-libvlc-sources | grep '^X: ' | cut -b3-`
LIBVLC_HEADERS=`make show-libvlc-headers | grep '^X: ' | cut -b3-`
LIBVLC_PKG_HEADERS=`make show-libvlc-pkg-headers | grep '^X: ' | cut -b3-`
- for target in msvc/vlc.vcp msvc/vlc.dsp
+ for target in evc/vlc.vcp msvc/vlc.dsp
do
rm -f ${target}
# Top of the project file
# Begin Group "Source Files"${M}
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"${M}
# Begin Group "vlc"${M}
+# Begin Source File${M}
EOF
- for file in ${VLC_SOURCES}
- do
+ if test "${target}" = "evc/vlc.vcp"
+ then
cat >> ${target} << EOF
-# Begin Source File${M}
-SOURCE="..\\`echo $file | sed -e 's%/%\\\\%g'`"${M}
-# End Source File${M}
+SOURCE="..\\evc\\vlc.c"${M}
EOF
- done
+ else
+ cat >> ${target} << EOF
+SOURCE="..\\src\\vlc.c"${M}
+EOF
+ fi
cat >> ${target} << EOF
+# End Source File${M}
# End Group${M}
# Begin Group "libvlc"${M}
EOF
EOF
for file in `for i in ${LIBVLC_SOURCES} ; do echo $i ; done | grep "/${subdir}/"`
do
- if test "${target}" = "msvc/vlc.vcp"
+ if test "${target}" = "evc/vlc.vcp"
then
cat >> ${target} << EOF
# Begin Source File${M}
--- /dev/null
+/* config.h. Generated by configure. */
+/* config.h.in. Generated from configure.ac by autoheader. */
+
+/* Maximum supported data alignment */
+#define ATTRIBUTE_ALIGNED_MAX 16
+
+/* Define if $CC groks 3D Now! inline assembly. */
+#define CAN_COMPILE_3DNOW 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 HAVE_ATOF 1*/
+
+/* Define if $CC groks SSE inline assembly. */
+#define CAN_COMPILE_SSE 1
+
+/* The ./configure command line */
+#define CONFIGURE_LINE "./configure --disable-dvd"
+
+/* Copyright string */
+#define COPYRIGHT_MESSAGE "VideoLAN Client - version 0.5.0-cvs-am Natalya - (c) 1996-2002 VideoLAN"
+
+/* 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 to 1 if using `alloca.c'. */
+/* #undef C_ALLOCA */
+
+/* Define if <X11/extensions/dpms.h> defines DPMSInfo. */
+#define DPMSINFO_IN_DPMS_H 1
+
+/* Define to 1 if translation of program messages to the user's native
+ language is requested. */
+/* #define ENABLE_NLS 1 */
+
+/* Define to 1 if you have the <a52dec/a52.h> header file. */
+/* #undef HAVE_A52DEC_A52_H */
+
+/* Define to 1 if you have `alloca', as a function or macro. */
+/* #define HAVE_ALLOCA 1 */
+
+/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
+ */
+/* #define HAVE_ALLOCA_H 1 */
+
+/* Define to 1 if you have the <argz.h> header file. */
+#define HAVE_ARGZ_H 1
+
+/* Define to 1 if you have the <arpa/inet.h> header file. */
+#define HAVE_ARPA_INET_H 1
+
+/* Define to 1 if you have the `atoll' function. */
+/* #undef HAVE_ATOLL */
+
+/* Define to 1 if you have the <Cocoa/Cocoa.h> header file. */
+/* #undef HAVE_COCOA_COCOA_H */
+
+/* Define to 1 if you have the <cthreads.h> header file. */
+/* #undef HAVE_CTHREADS_H */
+
+/* Define to 1 if you have the `dcgettext' function. */
+#define HAVE_DCGETTEXT 1
+
+/* Define to 1 if you have the <ddraw.h> header file. */
+/* #undef HAVE_DDRAW_H */
+
+/* Define if <time.h> defines nanosleep. */
+/* #undef HAVE_DECL_NANOSLEEP */
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+/* #define HAVE_DLFCN_H 1 */
+
+/* Define to 1 if you have the <dvbpsi/dr.h> header file. */
+/* #undef HAVE_DVBPSI_DR_H */
+
+/* Define to 1 if you have the <dvdcss/dvdcss.h> header file. */
+/* #undef HAVE_DVDCSS_DVDCSS_H */
+
+/* Define to 1 if you have the <dvdplay/dvdplay.h> header file. */
+/* #undef HAVE_DVDPLAY_DVDPLAY_H */
+
+/* Define to 1 if you have the <dvdread/dvd_reader.h> header file. */
+/* #undef HAVE_DVDREAD_DVD_READER_H */
+
+/* Define to 1 if you have the <faad.h> header file. */
+/* #undef HAVE_FAAD_H */
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+/* #define HAVE_FCNTL_H 1 */
+
+/* Define to 1 if you have the `feof_unlocked' function. */
+/* #undef HAVE_FEOF_UNLOCKED */
+
+/* Define to 1 if you have the `fgets_unlocked' function. */
+/* #undef HAVE_FGETS_UNLOCKED */
+
+/* Define to 1 if you have the <gdk/gdk.h> header file. */
+/* #undef HAVE_GDK_GDK_H */
+
+/* Define to 1 if you have the `getcwd' function. */
+#define HAVE_GETCWD 1
+
+/* Define to 1 if you have the `getegid' function. */
+#define HAVE_GETEGID 1
+
+/* Define to 1 if you have the `geteuid' function. */
+#define HAVE_GETEUID 1
+
+/* Define to 1 if you have the `getgid' function. */
+#define HAVE_GETGID 1
+
+/* Define to 1 if you have the `gethostbyname2' function. */
+/* #undef HAVE_GETHOSTBYNAME2 */
+
+/* Define to 1 if you have the <getopt.h> header file. */
+/* #define HAVE_GETOPT_H 1 */
+
+/* getopt support */
+/* #define HAVE_GETOPT_LONG 1 */
+
+/* Define to 1 if you have the `getpagesize' function. */
+#define HAVE_GETPAGESIZE 1
+
+/* Define to 1 if you have the `getpwuid' function. */
+/* #define HAVE_GETPWUID 1 */
+
+/* Define if the GNU gettext() function is already present or preinstalled. */
+#define HAVE_GETTEXT 1
+
+/* Define to 1 if you have the `gettimeofday' function. */
+#define HAVE_GETTIMEOFDAY 1
+
+/* Define to 1 if you have the `getuid' function. */
+#define HAVE_GETUID 1
+
+/* Define to 1 if you have the <glib.h> header file. */
+/* #undef HAVE_GLIB_H */
+
+/* Define to 1 if you have the <gnome.h> header file. */
+/* #undef HAVE_GNOME_H */
+
+/* Define to 1 if you have the <gtk/gtk.h> header file. */
+/* #undef HAVE_GTK_GTK_H */
+
+/* Define if you have the iconv() function. */
+#define HAVE_ICONV 1
+
+/* Define to 1 if you have the <id3tag.h> header file. */
+/* #undef HAVE_ID3TAG_H */
+
+/* Define to 1 if you have the <image.h> header file. */
+/* #undef HAVE_IMAGE_H */
+
+/* Define if we use the local libintl */
+#define HAVE_INCLUDED_GETTEXT
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+/* #undef HAVE_INTTYPES_H */
+
+/* For FreeBSD VCD support */
+/* #undef HAVE_IOC_TOC_HEADER_IN_SYS_CDIO_H */
+
+/* Define to 1 if you have the `isatty' function. */
+/* #define HAVE_ISATTY 1 */
+
+/* Define to 1 if you have the <kernel/OS.h> header file. */
+/* #undef HAVE_KERNEL_OS_H */
+
+/* Define to 1 if you have the <kernel/scheduler.h> header file. */
+/* #undef HAVE_KERNEL_SCHEDULER_H */
+
+/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
+/* #undef HAVE_LANGINFO_CODESET */
+
+/* Define if your <locale.h> file defines LC_MESSAGES. */
+#define HAVE_LC_MESSAGES 1
+
+/* Define to 1 if you have the <libdv/dv.h> header file. */
+/* #undef HAVE_LIBDV_DV_H */
+
+/* Define to 1 if you have the `pth' library (-lpth). */
+/* #undef HAVE_LIBPTH */
+
+/* Define to 1 if you have the `st' library (-lst). */
+/* #undef HAVE_LIBST */
+
+/* Define to 1 if you have the <libv4l/v4l.h> header file. */
+/* #undef HAVE_LIBV4L_V4L_H */
+
+/* Define to 1 if you have the <limits.h> header file. */
+#define HAVE_LIMITS_H 1
+
+/* Define to 1 if you have the <linux/fb.h> header file. */
+/* #undef HAVE_LINUX_FB_H */
+
+/* Define to 1 if you have the <linux/version.h> header file. */
+/* #undef HAVE_LINUX_VERSION_H */
+
+/* Define to 1 if you have the <locale.h> header file. */
+/* #define HAVE_LOCALE_H 1 */
+
+/* Define to 1 if you have the <machine/param.h> header file. */
+/* #undef HAVE_MACHINE_PARAM_H */
+
+/* Define to 1 if you have the <machine/soundcard.h> header file. */
+/* #undef HAVE_MACHINE_SOUNDCARD_H */
+
+/* Define to 1 if you have the <mad.h> header file. */
+/* #undef HAVE_MAD_H */
+
+/* Define to 1 if you have the <malloc.h> header file. */
+#define HAVE_MALLOC_H 1
+
+/* Define to 1 if you have the `memalign' function. */
+/* #define HAVE_MEMALIGN 1 */
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the `mempcpy' function. */
+/* #undef HAVE_MEMPCPY */
+
+/* Define to 1 if you have a working `mmap' system call. */
+/* #undef HAVE_MMAP */
+
+/* Define to 1 if you have the `munmap' function. */
+#define HAVE_MUNMAP 1
+
+/* Define if nanosleep is available. */
+/* #undef HAVE_NANOSLEEP */
+
+/* Define to 1 if you have the <netinet/in.h> header file. */
+#define HAVE_NETINET_IN_H 1
+
+/* Define to 1 if you have the <net/if.h> header file. */
+/* #define HAVE_NET_IF_H 1 */
+
+/* Define to 1 if you have the <nl_types.h> header file. */
+/* #undef HAVE_NL_TYPES_H */
+
+/* Define to 1 if you have the <ogg/ogg.h> header file. */
+/* #undef HAVE_OGG_OGG_H */
+
+/* Define if <xosd.h> is pre-1.0.0 */
+/* #undef HAVE_OLD_XOSD_H */
+
+/* Define to 1 if you have the <Ph.h> header file. */
+/* #undef HAVE_PH_H */
+
+/* Define to 1 if you have the `posix_memalign' function. */
+/* #undef HAVE_POSIX_MEMALIGN */
+
+/* Define to 1 if you have the <pthread.h> header file. */
+#define HAVE_PTHREAD_H 1
+
+/* Define to 1 if you have the `putenv' function. */
+/* #define HAVE_PUTENV 1 */
+
+/* Define to 1 if you have the <qt.h> header file. */
+/* #undef HAVE_QT_H */
+
+/* Define to 1 if you have the `select' function. */
+#define HAVE_SELECT 1
+
+/* Define to 1 if you have the `setenv' function. */
+#define HAVE_SETENV 1
+
+/* Define to 1 if you have the `setlocale' function. */
+#define HAVE_SETLOCALE 1
+
+/* Define to 1 if you have the `sigrelse' function. */
+/* #undef HAVE_SIGRELSE */
+
+/* Define to 1 if you have the <soundcard.h> header file. */
+/* #undef HAVE_SOUNDCARD_H */
+
+/* Define to 1 if you have the <stddef.h> header file. */
+/* #define HAVE_STDDEF_H 1 */
+
+/* Define to 1 if you have the <stdint.h> header file. */
+/* #undef HAVE_STDINT_H */
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the `stpcpy' function. */
+/* #undef HAVE_STPCPY */
+
+/* Define to 1 if you have the `strcasecmp' function. */
+/* #define HAVE_STRCASECMP 1 */
+
+/* Define to 1 if you have the `stricmp' function. */
+/* #define HAVE_STRICMP 1 */
+
+/* Define to 1 if you have the `strncasecmp' function. */
+/* #define HAVE_STRNCASECMP 1 */
+
+/* Define to 1 if you have the `strnicmp' function. */
+/* #define HAVE_STRNICMP 1 */
+
+/* Define to 1 if you have the `strchr' function. */
+#define HAVE_STRCHR 1
+
+/* Define to 1 if you have the `strdup' function. */
+/* #define HAVE_STRDUP 1 */
+
+/* Define to 1 if you have the `strerror' function. */
+/* #define HAVE_STRERROR 1 */
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the `strndup' function. */
+/* #undef HAVE_STRNDUP */
+
+/* Define to 1 if you have the `strtod' function. */
+#define HAVE_STRTOD 1
+
+/* Define to 1 if you have the `strtol' function. */
+#define HAVE_STRTOL 1
+
+/* Define to 1 if you have the `strtoul' function. */
+#define HAVE_STRTOUL 1
+
+/* Define if <sys/time.h> defines struct timespec. */
+#define HAVE_STRUCT_TIMESPEC 1
+
+/* Define to 1 if you have the `swab' function. */
+#define HAVE_SWAB 1
+
+/* Define to 1 if you have the <sys/int_types.h> header file. */
+/* #undef HAVE_SYS_INT_TYPES_H */
+
+/* Define to 1 if you have the <sys/ioctl.h> header file. */
+#define HAVE_SYS_IOCTL_H 1
+
+/* Define to 1 if you have the <sys/param.h> header file. */
+#define HAVE_SYS_PARAM_H 1
+
+/* Define to 1 if you have the <sys/shm.h> header file. */
+/* #undef HAVE_SYS_SHM_H */
+
+/* Define to 1 if you have the <sys/socket.h> header file. */
+#define HAVE_SYS_SOCKET_H 1
+
+/* Define to 1 if you have the <sys/sockio.h> header file. */
+/* #undef HAVE_SYS_SOCKIO_H */
+
+/* Define to 1 if you have the <sys/soundcard.h> header file. */
+#define HAVE_SYS_SOUNDCARD_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+/* #define HAVE_SYS_STAT_H 1 */
+
+/* Define to 1 if you have the <sys/times.h> header file. */
+/* #define HAVE_SYS_TIMES_H 1 */
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+/* #define HAVE_SYS_TIME_H 1 */
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+/* #define HAVE_SYS_TYPES_H 1 */
+
+/* Define to 1 if you have the `tsearch' function. */
+/* #undef HAVE_TSEARCH */
+
+/* Define to 1 if you have the <unistd.h> header file. */
+/* #define HAVE_UNISTD_H 1 */
+
+/* Support for variadic macros */
+/* #define HAVE_VARIADIC_MACROS 1 */
+
+/* Define to 1 if you have the `vasprintf' function. */
+/* #undef HAVE_VASPRINTF */
+
+/* Define to 1 if you have the <vorbis/codec.h> header file. */
+/* #undef HAVE_VORBIS_CODEC_H */
+
+/* Define to 1 if you have the <X11/extensions/dpms.h> header file. */
+#define HAVE_X11_EXTENSIONS_DPMS_H 1
+
+/* Define to 1 if you have the <X11/extensions/Xv.h> header file. */
+#define HAVE_X11_EXTENSIONS_XV_H 1
+
+/* Define to 1 if you have the <X11/Xlib.h> header file. */
+#define HAVE_X11_XLIB_H 1
+
+/* Define to 1 if you have the <xvid.h> header file. */
+/* #undef HAVE_XVID_H */
+
+/* Define to 1 if you have the <zlib.h> header file. */
+#define HAVE_ZLIB_H 1
+
+/* Define to 1 if you have the `__argz_count' function. */
+/* #undef HAVE___ARGZ_COUNT */
+
+/* Define to 1 if you have the `__argz_next' function. */
+/* #undef HAVE___ARGZ_NEXT */
+
+/* Define to 1 if you have the `__argz_stringify' function. */
+/* #undef HAVE___ARGZ_STRINGIFY */
+
+/* Define as const if the declaration of iconv() needs const. */
+#define ICONV_CONST const
+
+/* Dynamic object extension */
+#define LIBEXT ".dll"
+
+/* String suffix for module functions */
+#define MODULE_SUFFIX "__0_5_0_cvs_am"
+
+/* Symbol suffix for module functions */
+#define MODULE_SYMBOL 0_5_0_cvs_am
+
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+/* #undef NO_MINUS_C_MINUS_O */
+
+/* Define if <sys/param.h> defines ntohl. */
+/* #undef NTOHL_IN_SYS_PARAM_H */
+
+/* Name of package */
+#define PACKAGE "vlc"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT ""
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "vlc"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "vlc 0.5.0-cvs-am"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "vlc"
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "0.5.0-cvs-am"
+
+/* Define if <pthread.h> defines pthread_cond_t. */
+#define PTHREAD_COND_T_IN_PTHREAD_H 1
+
+/* Define if <pthread.h> defines pthread_once. */
+#define PTHREAD_ONCE_IN_PTHREAD_H 1
+
+/* Define if <pth.h> defines pth_init */
+/* #undef PTH_INIT_IN_PTH_H */
+
+/* Define as the return type of signal handlers (`int' or `void'). */
+#define RETSIGTYPE void
+
+/* Indicate whether we should use SDL/SDL.h or SDL11/SDL.h */
+/* #undef SDL_INCLUDE_FILE */
+
+/* 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 to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Define if <strings.h> defines strncasecmp. */
+#define STRNCASECMP_IN_STRINGS_H 1
+
+/* Define if <st.h> defines st_init */
+/* #undef ST_INIT_IN_ST_H */
+
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+#define TIME_WITH_SYS_TIME 1
+
+/* Version number of package */
+#define VERSION "0.5.0-cvs-am"
+
+/* Simple version string */
+#define VERSION_MESSAGE "0.5.0-cvs-am Natalya"
+
+/* big endian system */
+/* #undef WORDS_BIGENDIAN */
+
+/* Define to empty if `const' does not conform to ANSI C. */
+/* #undef const */
+
+/* Define as `__inline' if that's what the C compiler calls it, or to nothing
+ if it is not supported. */
+#define inline __inline
+
+/* Define to `long' if <sys/types.h> does not define. */
+/* #undef off_t */
+
+/* Define to `unsigned' if <sys/types.h> does not define. */
+/* #undef size_t */
--- /dev/null
+/*****************************************************************************
+ * modules_builtin.h: built-in modules list
+ *****************************************************************************
+ * Copyright (C) 2001 VideoLAN
+ *
+ * Authors: Samuel Hocevar <sam@zoy.org>
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ *****************************************************************************/
+
+#define ALLOCATE_BUILTIN( NAME ) \
+ AllocateBuiltinModule( p_this, vlc_entry__ ## NAME );
+
+/* We also consider the main program as a module (useful for config stuff) */
+int vlc_entry__main( module_t* );
+
+/* Add stuff here */
+#define ALLOCATE_ALL_BUILTINS() \
+ do \
+ { \
+ } while( 0 );
+
--- /dev/null
+/*****************************************************************************
+ * vlc.c: the vlc player, WinCE version
+ *****************************************************************************
+ * Copyright (C) 2002 VideoLAN
+ * $Id: vlc.c,v 1.1 2002/11/13 15:28:24 sam Exp $
+ *
+ * Authors: Samuel Hocevar <sam@zoy.org>
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ *****************************************************************************/
+
+#include "config.h"
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <commctrl.h>
+
+#include "../share/resource.h"
+
+#include <vlc/vlc.h>
+
+/*****************************************************************************
+ * Local prototypes.
+ *****************************************************************************/
+static LRESULT CALLBACK About ( HWND hDlg, UINT message,
+ WPARAM wParam, LPARAM lParam );
+static long FAR PASCAL WndProc ( HWND hWnd, UINT message,
+ WPARAM wParam, LPARAM lParam );
+
+/*****************************************************************************
+ * Global variables.
+ *****************************************************************************/
+HINSTANCE hInst;
+HWND hwndCB;
+
+/*****************************************************************************
+ * main: parse command line, start interface and spawn threads
+ *****************************************************************************/
+int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
+ LPTSTR lpCmdLine, int nCmdShow )
+{
+ int i_ret;
+ int i_argc = 2;
+ char * ppsz_argv[] = { lpCmdLine, "-vv", NULL };
+ HWND window;
+ MSG message;
+
+ HACCEL hAccelTable;
+ WNDCLASS wc;
+
+ char psz_title[100];
+ wchar_t pwz_title[100];
+
+ /* Store our instance for future reference */
+ hInst = hInstance;
+
+ /* Register window class */
+ wc.style = CS_HREDRAW | CS_VREDRAW;
+ wc.lpfnWndProc = (WNDPROC) WndProc;
+ wc.cbClsExtra = 0;
+ wc.cbWndExtra = 0;
+ wc.hInstance = hInst;
+ wc.hIcon = 0;
+ wc.hCursor = 0;
+ wc.hbrBackground = (HBRUSH) GetStockObject(WHITE_BRUSH);
+ wc.lpszMenuName = 0;
+ wc.lpszClassName = L"VLC";
+
+ RegisterClass(&wc);
+
+ /* Print the version information */
+ sprintf( psz_title, "VideoLAN Client %s", VLC_Version() );
+ MultiByteToWideChar( CP_ACP, 0, psz_title, -1, pwz_title, 100 );
+
+ /* Create our nice window */
+ window = CreateWindow( L"VLC", pwz_title,
+ WS_VISIBLE | WS_SIZEBOX | WS_CAPTION,
+ CW_USEDEFAULT, CW_USEDEFAULT,
+ CW_USEDEFAULT, CW_USEDEFAULT,
+ NULL, NULL, hInst, NULL );
+
+ ShowWindow( window, nCmdShow );
+ UpdateWindow( window );
+
+ hAccelTable = LoadAccelerators( hInst, (LPCTSTR)IDC_NIOUP );
+
+ /* Create a libvlc structure */
+ i_ret = VLC_Create();
+ if( i_ret < 0 )
+ {
+ DestroyWindow( window );
+ return i_ret;
+ }
+
+ /* Initialize libvlc */
+ i_ret = VLC_Init( 0, i_argc, ppsz_argv );
+ if( i_ret < 0 )
+ {
+ VLC_Destroy( 0 );
+ DestroyWindow( window );
+ return i_ret;
+ }
+
+ /* Run libvlc, in non-blocking mode */
+ i_ret = VLC_Play( 0 );
+
+ /* Add a non-blocking interface and keep the return value */
+ i_ret = VLC_AddIntf( 0, NULL, VLC_FALSE );
+
+ while( GetMessage( &message, NULL, 0, 0 ) )
+ {
+ if( !TranslateAccelerator(message.hwnd, hAccelTable, &message) )
+ {
+ TranslateMessage( &message );
+ DispatchMessage( &message );
+ }
+ }
+
+ /* Kill the threads */
+ VLC_Die( 0 );
+
+ /* Finish the threads */
+ VLC_Stop( 0 );
+
+ /* Destroy the libvlc structure */
+ VLC_Destroy( 0 );
+
+ DestroyWindow( window );
+
+ return i_ret;
+}
+
+/*****************************************************************************
+ * Message handler for the About box.
+ *****************************************************************************/
+static LRESULT CALLBACK About ( HWND hDlg, UINT message,
+ WPARAM wParam, LPARAM lParam)
+{
+ RECT rt, rt1;
+ int DlgWidth, DlgHeight; // dialog width and height in pixel units
+ int NewPosX, NewPosY;
+
+ switch( message )
+ {
+ case WM_INITDIALOG:
+ /* trying to center the About dialog */
+ if( GetWindowRect( hDlg, &rt1 ) )
+ {
+ GetClientRect( GetParent(hDlg), &rt );
+ DlgWidth = rt1.right - rt1.left;
+ DlgHeight = rt1.bottom - rt1.top ;
+ NewPosX = ( rt.right - rt.left - DlgWidth ) / 2;
+ NewPosY = ( rt.bottom - rt.top - DlgHeight ) / 2;
+
+ /* if the About box is larger than the physical screen */
+ if( NewPosX < 0 ) NewPosX = 0;
+ if( NewPosY < 0 ) NewPosY = 0;
+ SetWindowPos( hDlg, 0, NewPosX, NewPosY,
+ 0, 0, SWP_NOZORDER | SWP_NOSIZE );
+ }
+ return TRUE;
+
+ case WM_COMMAND:
+ if ((LOWORD(wParam) == IDOK) || (LOWORD(wParam) == IDCANCEL))
+ {
+ EndDialog(hDlg, LOWORD(wParam));
+ return TRUE;
+ }
+ break;
+ }
+ return FALSE;
+}
+
+/*****************************************************************************
+ * Message handler for the main window
+ *****************************************************************************/
+static long FAR PASCAL WndProc ( HWND hWnd, UINT message,
+ WPARAM wParam, LPARAM lParam )
+{
+ HDC hdc;
+ int wmId, wmEvent;
+ PAINTSTRUCT ps;
+
+ switch( message )
+ {
+ case WM_COMMAND:
+ wmId = LOWORD(wParam);
+ wmEvent = HIWORD(wParam);
+ // Parse the menu selections:
+ switch( wmId )
+ {
+ case IDM_HELP_ABOUT:
+ DialogBox( hInst, (LPCTSTR)IDD_ABOUTBOX,
+ hWnd, (DLGPROC)About );
+ break;
+ case IDM_PLOP:
+ /* Do random stuff */
+ break;
+ case IDM_FILE_EXIT:
+ DestroyWindow(hWnd);
+ break;
+ default:
+ return DefWindowProc( hWnd, message, wParam, lParam );
+ }
+ break;
+ case WM_CREATE:
+ hwndCB = CommandBar_Create(hInst, hWnd, 1);
+ CommandBar_InsertMenubar(hwndCB, hInst, IDM_MENU, 0);
+ CommandBar_AddAdornments(hwndCB, 0, 0);
+ break;
+ case WM_PAINT:
+ {
+ RECT rt;
+ hdc = BeginPaint(hWnd, &ps);
+ GetClientRect(hWnd, &rt);
+ DrawText( hdc, L"VLC roulaize!", _tcslen(L"VLC roulaize!"), &rt,
+ DT_SINGLELINE | DT_VCENTER | DT_CENTER );
+ EndPaint(hWnd, &ps);
+ break;
+ }
+ case WM_DESTROY:
+ CommandBar_Destroy(hwndCB);
+ PostQuitMessage(0);
+ break;
+ default:
+ return DefWindowProc(hWnd, message, wParam, lParam);
+ }
+ return 0;
+}
+
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
# Begin Group "vlc"\r
# Begin Source File\r
-SOURCE="..\src\vlc.c"\r
+SOURCE="..\evc\vlc.c"\r
# End Source File\r
# End Group\r
# Begin Group "libvlc"\r
\r
###############################################################################\r
\r
-Project: "vlc"=".\vlc.vcp" - Package Owner=<4>\r
+Project: "vlc"=.\vlc.vcp - Package Owner=<4>\r
\r
Package=<5>\r
{{{\r
* Collection of useful common types and macros definitions
*****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: vlc_common.h,v 1.37 2002/11/11 14:39:11 sam Exp $
+ * $Id: vlc_common.h,v 1.38 2002/11/13 15:28:24 sam Exp $
*
* Authors: Samuel Hocevar <sam@via.ecp.fr>
* Vincent Seguin <seguin@via.ecp.fr>
# define I64C(x) x##i64
#endif /* defined(WIN32)||defined(UNDER_CE) */
-#if defined(WIN32) && !defined(UNDER_CE)
+#if defined(WIN32) || defined(UNDER_CE)
/* win32, cl and icl support */
# if defined( _MSC_VER ) || !defined( __MINGW32__ )
# define __attribute__(x)
#endif
/* lseek (defined in src/extras/libc.c) */
-#ifndef HAVE_ATOF
+#ifndef HAVE_LSEEK
off_t lseek( int fildes, off_t offset, int whence );
#endif
* interface, such as message output.
*****************************************************************************
* Copyright (C) 1999, 2000, 2001, 2002 VideoLAN
- * $Id: vlc_messages.h,v 1.6 2002/08/26 09:12:46 sam Exp $
+ * $Id: vlc_messages.h,v 1.7 2002/11/13 15:28:24 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
/* Subscribers */
int i_sub;
msg_subscription_t **pp_sub;
+
+ /* Logfile for WinCE */
+#ifdef UNDER_CE
+ FILE *logfile;
+#endif
};
/*****************************************************************************
/* #undef HAVE_STPCPY */
/* Define to 1 if you have the `strcasecmp' function. */
-#define HAVE_STRCASECMP 1
+/* #define HAVE_STRCASECMP 1 */
+
+/* Define to 1 if you have the `stricmp' function. */
+#define HAVE_STRICMP 1
+
+/* Define to 1 if you have the `strncasecmp' function. */
+/* #define HAVE_STRNCASECMP 1 */
+
+/* Define to 1 if you have the `strnicmp' function. */
+#define HAVE_STRNICMP 1
/* Define to 1 if you have the `strchr' function. */
#define HAVE_STRCHR 1
/* Define to `unsigned' if <sys/types.h> does not define. */
/* #undef size_t */
+
+#define HAVE_LSEEK 1
+
+#define HAVE_ERRNO_H 1
+
+#define HAVE_GETENV 1
+
--- /dev/null
+#ifndef __NEWRES_H__\r
+#define __NEWRES_H__\r
+\r
+#if !defined(UNDER_CE)\r
+ #define UNDER_CE _WIN32_WCE\r
+#endif\r
+\r
+#if defined(_WIN32_WCE)\r
+ #if !defined(WCEOLE_ENABLE_DIALOGEX)\r
+ #define DIALOGEX DIALOG DISCARDABLE\r
+ #endif\r
+ #include <commctrl.h>\r
+ #define SHMENUBAR RCDATA\r
+ #if defined(WIN32_PLATFORM_PSPC) && (_WIN32_WCE >= 300)\r
+ #include <aygshell.h> \r
+ #else\r
+ #define I_IMAGENONE (-2)\r
+ #define NOMENU 0xFFFF\r
+ #define IDS_SHNEW 1\r
+\r
+ #define IDM_SHAREDNEW 10\r
+ #define IDM_SHAREDNEWDEFAULT 11\r
+ #endif\r
+#endif // _WIN32_WCE\r
+\r
+\r
+#ifdef RC_INVOKED\r
+#ifndef _INC_WINDOWS\r
+#define _INC_WINDOWS\r
+ #include "winuser.h" // extract from windows header\r
+#endif\r
+#endif\r
+\r
+#ifdef IDC_STATIC\r
+#undef IDC_STATIC\r
+#endif\r
+#define IDC_STATIC (-1)\r
+\r
+#endif //__NEWRES_H__\r
--- /dev/null
+//{{NO_DEPENDENCIES}}\r
+// Microsoft Developer Studio generated include file.\r
+// Used by vlc_wince_rc.rc\r
+//\r
+#define IDS_APP_TITLE 1\r
+#define IDS_HELLO 2\r
+#define IDC_NIOUP 3\r
+#define IDI_NIOUP 101\r
+#define IDM_MENU 102\r
+#define IDD_ABOUTBOX 103\r
+#define IDM_FILE_EXIT 40002\r
+#define IDM_HELP_ABOUT 40003\r
+#define IDM_PLOP 40004\r
+\r
+// Next default values for new objects\r
+// \r
+#ifdef APSTUDIO_INVOKED\r
+#ifndef APSTUDIO_READONLY_SYMBOLS\r
+#define _APS_NEXT_RESOURCE_VALUE 104\r
+#define _APS_NEXT_COMMAND_VALUE 40005\r
+#define _APS_NEXT_CONTROL_VALUE 1001\r
+#define _APS_NEXT_SYMED_VALUE 101\r
+#endif\r
+#endif\r
-VLC_ICON ICON "vlc48x48.ico"
+//Microsoft Developer Studio generated resource script.\r
+//\r
+#include "resource.h"\r
+\r
+#define APSTUDIO_READONLY_SYMBOLS\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// Generated from the TEXTINCLUDE 2 resource.\r
+//\r
+#include "newres.h"\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+#undef APSTUDIO_READONLY_SYMBOLS\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+// English (U.S.) resources\r
+\r
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r
+#ifdef _WIN32\r
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US\r
+#pragma code_page(1252)\r
+#endif //_WIN32\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// Icon\r
+//\r
+\r
+// Icon with lowest ID value placed first to ensure application icon\r
+// remains consistent on all systems.\r
+IDI_NIOUP ICON DISCARDABLE "nioup.ICO"\r
+\r
+#ifdef APSTUDIO_INVOKED\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// TEXTINCLUDE\r
+//\r
+\r
+1 TEXTINCLUDE DISCARDABLE \r
+BEGIN\r
+ "resource.h\0"\r
+END\r
+\r
+2 TEXTINCLUDE DISCARDABLE \r
+BEGIN\r
+ "#include ""newres.h""\r\n"\r
+ "\0"\r
+END\r
+\r
+3 TEXTINCLUDE DISCARDABLE \r
+BEGIN\r
+ "\r\n"\r
+ "\0"\r
+END\r
+\r
+#endif // APSTUDIO_INVOKED\r
+\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// Menubar\r
+//\r
+\r
+IDM_MENU MENU DISCARDABLE \r
+BEGIN\r
+ POPUP "&File"\r
+ BEGIN\r
+ MENUITEM "E&xit", IDM_FILE_EXIT\r
+ END\r
+ MENUITEM "View", 65535\r
+ MENUITEM "Settings", 65535\r
+ POPUP "&Help"\r
+ BEGIN\r
+ MENUITEM "&About", IDM_HELP_ABOUT\r
+ END\r
+END\r
+\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// Dialog\r
+//\r
+\r
+IDD_ABOUTBOX DIALOGEX 0, 0, 127, 42\r
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
+EXSTYLE 0x80000000L\r
+CAPTION "About PocketVLC"\r
+FONT 8, "System"\r
+BEGIN\r
+ ICON IDI_NIOUP,IDC_STATIC,7,7,21,20\r
+ LTEXT "VLC Version Tarass",IDC_STATIC,38,10,70,8,SS_NOPREFIX\r
+ LTEXT "Copyright (C) VideoLAN",IDC_STATIC,30,27,80,8\r
+END\r
+\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// DESIGNINFO\r
+//\r
+\r
+#ifdef APSTUDIO_INVOKED\r
+GUIDELINES DESIGNINFO DISCARDABLE \r
+BEGIN\r
+ IDD_ABOUTBOX, DIALOG\r
+ BEGIN\r
+ LEFTMARGIN, 7\r
+ RIGHTMARGIN, 120\r
+ TOPMARGIN, 7\r
+ BOTTOMMARGIN, 35\r
+ END\r
+END\r
+#endif // APSTUDIO_INVOKED\r
+\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// Accelerator\r
+//\r
+\r
+IDC_NIOUP ACCELERATORS DISCARDABLE \r
+BEGIN\r
+ VK_F1, IDM_PLOP, VIRTKEY, NOINVERT\r
+ VK_F4, IDM_FILE_EXIT, VIRTKEY, ALT, NOINVERT\r
+ VK_F8, IDM_HELP_ABOUT, VIRTKEY, NOINVERT\r
+END\r
+\r
+#endif // English (U.S.) resources\r
+/////////////////////////////////////////////////////////////////////////////\r
+\r
+\r
+\r
+#ifndef APSTUDIO_INVOKED\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// Generated from the TEXTINCLUDE 3 resource.\r
+//\r
+\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+#endif // not APSTUDIO_INVOKED\r
+\r
* modules, especially intf modules. See config.h for output configuration.
*****************************************************************************
* Copyright (C) 1998-2002 VideoLAN
- * $Id: messages.c,v 1.22 2002/11/11 14:39:12 sam Exp $
+ * $Id: messages.c,v 1.23 2002/11/13 15:28:24 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
p_this->p_libvlc->msg_bank.i_sub = 0;
p_this->p_libvlc->msg_bank.pp_sub = NULL;
+
+#ifdef UNDER_CE
+ p_this->p_libvlc->msg_bank.logfile =
+ CreateFile( L"vlc-log.txt", GENERIC_WRITE,
+ FILE_SHARE_READ|FILE_SHARE_WRITE, NULL,
+ OPEN_ALWAYS, 0, NULL );
+ SetFilePointer( p_this->p_libvlc->msg_bank.logfile, 0, NULL, FILE_END );
+#endif
}
/*****************************************************************************
FlushMsg( &p_this->p_libvlc->msg_bank );
}
+#ifdef UNDER_CE
+ CloseHandle( p_this->p_libvlc->msg_bank.logfile );
+#endif
+
/* Destroy lock */
vlc_mutex_destroy( &p_this->p_libvlc->msg_bank.lock );
}
# define WHITE COL(37)
# define GRAY "\033[0m"
+#ifdef UNDER_CE
+ int i_dummy;
+#endif
static const char * ppsz_type[4] = { "", " error", " warning", " debug" };
static const char *ppsz_color[4] = { WHITE, RED, YELLOW, GRAY };
char *psz_object = "private";
case VLC_OBJECT_SOUT: psz_object = "stream output"; break;
}
+#ifdef UNDER_CE
+# define CE_WRITE(str) WriteFile( p_this->p_libvlc->msg_bank.logfile, \
+ str, strlen(str), &i_dummy, NULL );
+ CE_WRITE( p_item->psz_module );
+ CE_WRITE( " " );
+ CE_WRITE( psz_object );
+ CE_WRITE( ppsz_type[i_type] );
+ CE_WRITE( ": " );
+ CE_WRITE( p_item->psz_msg );
+ CE_WRITE( "\n" );
+ FlushFileBuffers( p_this->p_libvlc->msg_bank.logfile );
+
+#else
/* Send the message to stderr */
if( p_this->p_libvlc->b_color )
{
p_item->psz_msg );
}
-#if defined(WIN32) || defined(UNDER_CE)
+# if defined(WIN32)
fflush( stderr );
+# endif
#endif
}
* modules.c : Builtin and plugin modules management functions
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: modules.c,v 1.103 2002/11/11 14:39:12 sam Exp $
+ * $Id: modules.c,v 1.104 2002/11/13 15:28:24 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Ethan C. Baldridge <BaldridgeE@cadmus.com>
# include "modules_plugin.h"
#endif
-#if !defined( _MSC_VER )
-# include "modules_builtin.h"
-#else
+#if defined( UNDER_CE )
+# include "modules_builtin_evc.h"
+#elif defined( _MSC_VER )
# include "modules_builtin_msvc.h"
+#else
+# include "modules_builtin.h"
#endif
/*****************************************************************************
* vlc.c: the vlc player
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
- * $Id: vlc.c,v 1.17 2002/11/10 23:41:53 sam Exp $
+ * $Id: vlc.c,v 1.18 2002/11/13 15:28:24 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
# include <time.h> /* time() */
#endif
-#ifdef UNDER_CE
- /* WinCE needs a WINAPI declaration */
-# define WIN32_LEAN_AND_MEAN
-# include <windows.h>
-#endif
-
#include <vlc/vlc.h>
/*****************************************************************************
/*****************************************************************************
* main: parse command line, start interface and spawn threads
*****************************************************************************/
-#ifdef UNDER_CE
-int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
- LPTSTR lpCmdLine, int nCmdShow )
-#else
int main( int i_argc, char *ppsz_argv[] )
-#endif
{
int i_ret;
-#ifdef UNDER_CE
- int i_argc = 1;
- char *ppsz_argv[] = { lpCmdLine, NULL };
-#endif
fprintf( stderr, "VideoLAN Client %s\n", VLC_Version() );
/* Add a blocking interface and keep the return value */
i_ret = VLC_AddIntf( 0, NULL, VLC_TRUE );
-
+
/* Finish the threads */
VLC_Stop( 0 );
projects / vlc / commitdiff