* ./msvc/*, ./evc/*: moved eMbedded Visual Studio files to the toplevel evc/

    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).

Makefile.am

@@ -268,7 +268,7 @@ EXTRA_DIST += \
 	$(NULL)
 
 ###############################################################################
-# MS Visual Studio project
+# MS Visual Studio and eMbedded Visual Studio projects
 ###############################################################################
 
 EXTRA_DIST += \
@@ -276,12 +276,14 @@ 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

bootstrap

 #! /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>
 
@@ -15,18 +15,18 @@ export LANG
 ###  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
@@ -36,9 +36,9 @@ done
 ##
 ##  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
@@ -50,12 +50,11 @@ else
   M='
'
 
   #  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
@@ -65,16 +64,20 @@ else
 # 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
@@ -94,7 +97,7 @@ 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}

evc/modules_builtin_evc.h

+/*****************************************************************************
+ * 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 );
+

evc/vlc.c

+/*****************************************************************************
+ * 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;
+}
+

msvc/vlc.vcp → evc/vlc.vcp

@@ -388,7 +388,7 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Group "vlc"
 # Begin Source File
-SOURCE="..\src\vlc.c"
+SOURCE="..\evc\vlc.c"
 # End Source File
 # End Group
 # Begin Group "libvlc"

msvc/vlc.vcw → evc/vlc.vcw

@@ -3,7 +3,7 @@ Microsoft eMbedded Visual Tools Workspace File, Format Version 3.00
 
 ###############################################################################
 
-Project: "vlc"=".\vlc.vcp" - Package Owner=<4>
+Project: "vlc"=.\vlc.vcp - Package Owner=<4>
 
 Package=<5>
 {{{

include/vlc_common.h

@@ -3,7 +3,7 @@
  * 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>
@@ -528,7 +528,7 @@ static inline uint64_t U64_AT( void * _p )
 #   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)
@@ -580,7 +580,7 @@ typedef __int64 off_t;
 #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
 

include/vlc_messages.h

@@ -4,7 +4,7 @@
  * 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>
@@ -73,6 +73,11 @@ struct msg_bank_t
     /* Subscribers */
     int i_sub;
     msg_subscription_t **pp_sub;
+
+    /* Logfile for WinCE */
+#ifdef UNDER_CE
+    FILE *logfile;
+#endif
 };
 
 /*****************************************************************************

msvc/config.h

@@ -291,7 +291,16 @@
 /* #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
@@ -490,3 +499,10 @@
 
 /* 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
+

share/newres.h

+#ifndef __NEWRES_H__
+#define __NEWRES_H__
+
+#if !defined(UNDER_CE)
+	#define UNDER_CE _WIN32_WCE
+#endif
+
+#if defined(_WIN32_WCE)
+	#if !defined(WCEOLE_ENABLE_DIALOGEX)
+		#define DIALOGEX DIALOG DISCARDABLE
+	#endif
+	#include <commctrl.h>
+	#define  SHMENUBAR RCDATA
+	#if defined(WIN32_PLATFORM_PSPC) && (_WIN32_WCE >= 300)
+		#include <aygshell.h> 
+	#else
+		#define I_IMAGENONE		(-2)
+		#define NOMENU			0xFFFF
+		#define IDS_SHNEW		1
+
+		#define IDM_SHAREDNEW        10
+		#define IDM_SHAREDNEWDEFAULT 11
+	#endif
+#endif // _WIN32_WCE
+
+
+#ifdef RC_INVOKED
+#ifndef _INC_WINDOWS
+#define _INC_WINDOWS
+	#include "winuser.h"           // extract from windows header
+#endif
+#endif
+
+#ifdef IDC_STATIC
+#undef IDC_STATIC
+#endif
+#define IDC_STATIC      (-1)
+
+#endif //__NEWRES_H__

share/resource.h

+//{{NO_DEPENDENCIES}}
+// Microsoft Developer Studio generated include file.
+// Used by vlc_wince_rc.rc
+//
+#define IDS_APP_TITLE                   1
+#define IDS_HELLO                       2
+#define IDC_NIOUP                       3
+#define IDI_NIOUP                       101
+#define IDM_MENU                        102
+#define IDD_ABOUTBOX                    103
+#define IDM_FILE_EXIT                   40002
+#define IDM_HELP_ABOUT                  40003
+#define IDM_PLOP                        40004
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        104
+#define _APS_NEXT_COMMAND_VALUE         40005
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif

share/vlc_wince_rc.rc

-VLC_ICON ICON "vlc48x48.ico"
+//Microsoft Developer Studio generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "newres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_NIOUP               ICON    DISCARDABLE     "nioup.ICO"
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "#include ""newres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Menubar
+//
+
+IDM_MENU MENU DISCARDABLE 
+BEGIN
+    POPUP "&File"
+    BEGIN
+        MENUITEM "E&xit",                       IDM_FILE_EXIT
+    END
+    MENUITEM "View",                        65535
+    MENUITEM "Settings",                    65535
+    POPUP "&Help"
+    BEGIN
+        MENUITEM "&About",                      IDM_HELP_ABOUT
+    END
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_ABOUTBOX DIALOGEX 0, 0, 127, 42
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+EXSTYLE 0x80000000L
+CAPTION "About PocketVLC"
+FONT 8, "System"
+BEGIN
+    ICON            IDI_NIOUP,IDC_STATIC,7,7,21,20
+    LTEXT           "VLC Version Tarass",IDC_STATIC,38,10,70,8,SS_NOPREFIX
+    LTEXT           "Copyright (C) VideoLAN",IDC_STATIC,30,27,80,8
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO DISCARDABLE 
+BEGIN
+    IDD_ABOUTBOX, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 120
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 35
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Accelerator
+//
+
+IDC_NIOUP ACCELERATORS DISCARDABLE 
+BEGIN
+    VK_F1,          IDM_PLOP,               VIRTKEY, NOINVERT
+    VK_F4,          IDM_FILE_EXIT,          VIRTKEY, ALT, NOINVERT
+    VK_F8,          IDM_HELP_ABOUT,         VIRTKEY, NOINVERT
+END
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+

src/misc/messages.c

@@ -4,7 +4,7 @@
  * 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>
@@ -75,6 +75,14 @@ void __msg_Create( vlc_object_t *p_this )
 
     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
 }
 
 /*****************************************************************************
@@ -124,6 +132,10 @@ void __msg_Destroy( vlc_object_t *p_this )
         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 );
 }
@@ -403,6 +415,9 @@ static void PrintMsg ( vlc_object_t * p_this, msg_item_t * p_item )
 #   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";
@@ -439,6 +454,19 @@ static void PrintMsg ( vlc_object_t * p_this, msg_item_t * p_item )
         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 )
     {
@@ -454,7 +482,8 @@ static void PrintMsg ( vlc_object_t * p_this, msg_item_t * p_item )
                          p_item->psz_msg );
     }
 
-#if defined(WIN32) || defined(UNDER_CE)
+#   if defined(WIN32)
     fflush( stderr );
+#   endif
 #endif
 }

src/misc/modules.c

@@ -2,7 +2,7 @@
  * 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>
@@ -91,10 +91,12 @@
 #   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
 
 /*****************************************************************************

src/vlc.c

@@ -2,7 +2,7 @@
  * 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>
@@ -35,12 +35,6 @@
 #   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>
 
 /*****************************************************************************
@@ -53,18 +47,9 @@ static void SigHandler  ( int i_signal );
 /*****************************************************************************
  * 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() );
 
@@ -118,7 +103,7 @@ int main( int i_argc, char *ppsz_argv[] )
 
     /* Add a blocking interface and keep the return value */
     i_ret = VLC_AddIntf( 0, NULL, VLC_TRUE );
-
+ 
     /* Finish the threads */
     VLC_Stop( 0 );