* modules/gui/wxwindows/open.cpp: small fixes.

* modules/access/vcd/cdrom.c: win32 fix for cue file parsing.
* modules/video_filter/osd_text.c: small win32 fix.

diff --git a/modules/access/vcd/cdrom.c b/modules/access/vcd/cdrom.c
index be74917d06872d49bc5397481c80364429cf06bd..8c7bfc87b1ad7e1d02e714354e81411ddc9831da 100644 (file)
--- a/modules/access/vcd/cdrom.c
+++ b/modules/access/vcd/cdrom.c
@@ -2,7 +2,7 @@
  * cdrom.c: cdrom tools
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: cdrom.c,v 1.9 2003/05/17 20:30:31 gbazin Exp $
+ * $Id: cdrom.c,v 1.10 2003/05/18 12:18:46 gbazin Exp $
  *
  * Authors: Johan Bilien <jobi@via.ecp.fr>
  *          Gildas Bazin <gbazin@netcourrier.com>
@@ -824,7 +824,8 @@ static int OpenVCDImage( vlc_object_t * p_this, const char *psz_dev,
             *p_pos = 0;
 
             /* Take care of path standardization */
-            if( *line != '/' && (p_pos = strrchr( psz_cuefile, '/' )) )
+            if( *line != '/' && ((p_pos = strrchr( psz_cuefile, '/' ))
+                || (p_pos = strrchr( psz_cuefile, '\\' ) )) )
             {
                 psz_vcdfile = malloc( strlen(line) +
                                       (p_pos - psz_cuefile + 1) + 1 );

diff --git a/modules/gui/wxwindows/open.cpp b/modules/gui/wxwindows/open.cpp
index c36952b919dc91b7e723b539b17c79c3cd9fe4c9..3364440274426522cce131cae253f7f266a2f387 100644 (file)
--- a/modules/gui/wxwindows/open.cpp
+++ b/modules/gui/wxwindows/open.cpp
@@ -2,7 +2,7 @@
  * open.cpp : wxWindows plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: open.cpp,v 1.23 2003/05/17 22:48:09 gbazin Exp $
+ * $Id: open.cpp,v 1.24 2003/05/18 12:18:46 gbazin Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -512,8 +512,8 @@ void OpenDialog::UpdateMRL( int i_access_method )
         mrl = wxT("file") + demux + wxT("://") + file_combo->GetValue();
         break;
     case DISC_ACCESS:
-        mrl = ( disc_type->GetSelection() == 0 ? wxT("dvdsimple") :
-                disc_type->GetSelection() == 1 ? wxT("dvd") :
+        mrl = ( disc_type->GetSelection() == 0 ? wxT("dvd") :
+                disc_type->GetSelection() == 1 ? wxT("dvdsimple") :
                 disc_type->GetSelection() == 2 ? wxT("vcd") : wxT("cdda") )
                   + demux + wxT("://")
                   + disc_device->GetLineText(0)
@@ -639,7 +639,7 @@ void OpenDialog::OnDiscTypeChange( wxCommandEvent& WXUNUSED(event) )
 
     switch( disc_type->GetSelection() )
     {
-    case 1:
+    case 0:
         disc_title->SetRange( 0, 255 );
         disc_title->SetValue( 0 );
         break;

diff --git a/modules/video_filter/osd_text.c b/modules/video_filter/osd_text.c
index 6d66f7866f14c1bebdbc60450fb0c9acc4f4c0f6..d71cf8b4ba3875deb52b278a8100b85f215004f7 100644 (file)
--- a/modules/video_filter/osd_text.c
+++ b/modules/video_filter/osd_text.c
@@ -2,7 +2,7 @@
  * osd_text.c : Filter to put text on the video, using freetype2
  *****************************************************************************
  * Copyright (C) 2002, 2003 VideoLAN
- * $Id: osd_text.c,v 1.3 2003/05/11 08:42:59 sigmunau Exp $
+ * $Id: osd_text.c,v 1.4 2003/05/18 12:18:46 gbazin Exp $
  *
  * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
  *
@@ -38,6 +38,10 @@
 #include FT_FREETYPE_H
 #include FT_GLYPH_H
 
+#ifdef WIN32
+#define FT_RENDER_MODE_NORMAL 0
+#endif
+
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/