* INSTALL.win32, include/vlc_config.h, src/libvlc.h: changes to reflect the

   fact that libdvdcss now needs a colon after the DVD drive letter (on Win32).

* src/misc/messages.c: on Win32 only use fflush() if in debug mode.

* src/misc/win32_specific.c: try to raise the our process priority slightly
   above normal. This prevent us from suffering too much from normal activity
   of the OS.

diff --git a/INSTALL.win32 b/INSTALL.win32
index b159be953412d04197a5eee88b34c10bef1ba1ef..25963c2b6b70dc51f39eb274018b814e0ea47925 100644 (file)
--- a/INSTALL.win32
+++ b/INSTALL.win32
@@ -14,8 +14,8 @@ To store a debug log of the current vlc session, you can use
 disable the GUI. You will end-up with a vlc.log file in your current directory.
 
 If you want to play a DVD, run vlc and click on the Disc option in the
-interface. You then have to type your drive letter in the 'Device name'
-box (eg. 'D' if this is the letter for your dvdrom drive).
+interface. You then have to type your drive letter followed by a colon in
+the 'Device name' box (eg. 'D:' if this is the letter for your dvdrom drive).
 
 Building VideoLAN Client from the source code
 =============================================

diff --git a/include/codecs.h b/include/codecs.h
index 6b774815409e6d7afaa0a6e7cb0111b8f0a905fb..44ffe49a2f69945447fda9e0b7ce201069caaeda 100644 (file)
--- a/include/codecs.h
+++ b/include/codecs.h
@@ -2,7 +2,7 @@
  * codecs.h: codec related structures needed by the demuxers and decoders
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: codecs.h,v 1.1 2002/11/03 23:00:32 gbazin Exp $
+ * $Id: codecs.h,v 1.2 2002/11/07 19:31:07 gbazin Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -39,7 +39,7 @@ typedef struct __attribute__((__packed__)) _WAVEFORMATEX {
 } WAVEFORMATEX, *PWAVEFORMATEX, *NPWAVEFORMATEX, *LPWAVEFORMATEX;
 #endif /* _WAVEFORMATEX_ */
 
-#ifndef _BITMAPINFOHEADER_
+#if !defined(_BITMAPINFOHEADER_) && !defined(WIN32)
 #define _BITMAPINFOHEADER_
 typedef struct __attribute__((__packed__))
 {

diff --git a/include/vlc_config.h b/include/vlc_config.h
index 53680185ba2abd5b6b0a43fe2b35a92420edffd2..5b743c6063780f99a2d31beb86e1e02acfcedd46 100644 (file)
--- a/include/vlc_config.h
+++ b/include/vlc_config.h
@@ -112,8 +112,8 @@
 #   define DVD_DEVICE "/dev/dvd"
 #   define VCD_DEVICE "/dev/cdrom"
 #else
-#   define DVD_DEVICE "D"
-#   define VCD_DEVICE "D"
+#   define DVD_DEVICE "D:"
+#   define VCD_DEVICE "D:"
 #endif
 
 /*****************************************************************************

diff --git a/src/libvlc.h b/src/libvlc.h
index 060868ad41b1dd40069b34aeda873acb2a9b7502..d3e8f464271714e1d6a8b852c2c757ff803f863e 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -2,7 +2,7 @@
  * libvlc.h: main libvlc header
  *****************************************************************************
  * Copyright (C) 1998-2002 VideoLAN
- * $Id: libvlc.h,v 1.20 2002/10/15 12:30:00 sam Exp $
+ * $Id: libvlc.h,v 1.21 2002/11/07 19:31:08 gbazin Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -215,8 +215,14 @@
     "DVD (from 1 to n).")
 
 #define DVD_DEV_TEXT N_("DVD device")
+#ifdef WIN32
+#define DVD_DEV_LONGTEXT N_( \
+    "This is the default DVD drive (or file) to use. Don't forget the colon " \
+    "after the drive letter (eg D:)")
+#else
 #define DVD_DEV_LONGTEXT N_( \
     "This is the default DVD device to use.")
+#endif
 
 #define VCD_DEV_TEXT N_("VCD device")
 #define VCD_DEV_LONGTEXT N_( \

diff --git a/src/misc/messages.c b/src/misc/messages.c
index 85e04192c9b4349aada64cfcd55a49cd06f3dd05..1db7069785aa3fdb75a8002630bf97427466ddb5 100644 (file)
--- a/src/misc/messages.c
+++ b/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.18 2002/10/29 13:22:48 sam Exp $
+ * $Id: messages.c,v 1.19 2002/11/07 19:31:08 gbazin Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -461,7 +461,7 @@ static void PrintMsg ( vlc_object_t * p_this, msg_item_t * p_item )
                          p_item->psz_msg );
     }
 
-#ifdef WIN32
+#if defined(WIN32) && defined(DEBUG)
     fflush( stderr );
 #endif
 }

diff --git a/src/misc/win32_specific.c b/src/misc/win32_specific.c
index 98d88d3856715cee8ad3823796264d4049e45976..2fcc9339114c38b8affad161d6a7520d6eb6f388 100644 (file)
--- a/src/misc/win32_specific.c
+++ b/src/misc/win32_specific.c
@@ -2,7 +2,7 @@
  * win32_specific.c: Win32 specific features 
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: win32_specific.c,v 1.16 2002/10/04 12:01:40 gbazin Exp $
+ * $Id: win32_specific.c,v 1.17 2002/11/07 19:31:08 gbazin Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Gildas Bazin <gbazin@netcourrier.com>
@@ -57,6 +57,20 @@ void system_Configure( vlc_t *p_this )
 {
     p_this->p_libvlc->b_fast_mutex = config_GetInt( p_this, "fast-mutex" );
     p_this->p_libvlc->i_win9x_cv = config_GetInt( p_this, "win9x-cv-method" );
+
+    /* Raise default priority of the current process */
+#ifndef ABOVE_NORMAL_PRIORITY_CLASS
+#   define ABOVE_NORMAL_PRIORITY_CLASS 0x00008000
+#endif
+    if( !SetPriorityClass( GetCurrentProcess(),
+                          ABOVE_NORMAL_PRIORITY_CLASS ) )
+    {
+        if( !SetPriorityClass( GetCurrentProcess(),
+                              HIGH_PRIORITY_CLASS ) )
+           msg_Dbg( p_this, "can't raise process priority" );
+       else
+           msg_Dbg( p_this, "raised process priority" );
+    }
 }
 
 /*****************************************************************************