Commit 4ee99a96 authored by Gildas Bazin's avatar Gildas Bazin

* modules/access/file.c: fixed large file support on win32.
* src/libvlc.[ch]: made the description of the translation option more explicit.
parent ce825efe
......@@ -2,7 +2,7 @@
* file.c: file input (file: access plug-in)
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: file.c,v 1.18 2003/04/16 11:47:08 gbazin Exp $
* $Id: file.c,v 1.19 2003/05/08 15:58:56 gbazin Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -48,6 +48,12 @@
# include <io.h>
#endif
/* stat() support for large files on win32 */
#if defined( WIN32 ) && !defined( UNDER_CE )
#define stat(a,b) _stati64(a,b)
#define fstat(a,b) _fstati64(a,b)
#endif
/*****************************************************************************
* Exported prototypes
*****************************************************************************/
......@@ -97,7 +103,11 @@ static int Open( vlc_object_t *p_this )
char * psz_name = p_input->psz_name;
#ifdef HAVE_SYS_STAT_H
int i_stat;
#if defined( WIN32 ) && !defined( UNDER_CE )
struct _stati64 stat_info;
#else
struct stat stat_info;
#endif
#endif
_input_socket_t * p_access_data;
vlc_bool_t b_stdin, b_kfir = 0;
......@@ -365,7 +375,11 @@ static ssize_t Read( input_thread_t * p_input, byte_t * p_buffer, size_t i_len )
if ( p_input->stream.p_selected_area->i_size != 0
&& (p_access_data->i_nb_reads % INPUT_FSTAT_NB_READS) == 0 )
{
#if defined( WIN32 ) && !defined( UNDER_CE )
struct _stati64 stat_info;
#else
struct stat stat_info;
#endif
if ( fstat( p_access_data->_socket.i_handle, &stat_info ) == -1 )
{
# ifdef HAVE_ERRNO_H
......
......@@ -2,7 +2,7 @@
* libvlc.c: main libvlc source
*****************************************************************************
* Copyright (C) 1998-2002 VideoLAN
* $Id: libvlc.c,v 1.83 2003/05/08 14:15:36 titer Exp $
* $Id: libvlc.c,v 1.84 2003/05/08 15:58:44 gbazin Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -337,6 +337,9 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] )
/* Reset the default domain */
SetLanguage( psz_translation );
/* Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... */
msg_Dbg( p_vlc, "translation test: code is \"%s\"", _("C") );
textdomain( PACKAGE );
module_EndBank( p_vlc );
......
......@@ -2,7 +2,7 @@
* libvlc.h: main libvlc header
*****************************************************************************
* Copyright (C) 1998-2002 VideoLAN
* $Id: libvlc.h,v 1.62 2003/05/08 14:15:36 titer Exp $
* $Id: libvlc.h,v 1.63 2003/05/08 15:58:44 gbazin Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -57,9 +57,10 @@ static char *ppsz_sout_vcodec[] = { "", "mpeg1", "mpeg2", "mpeg4", NULL };
#define TRANSLATION_TEXT N_("Translation")
#define TRANSLATION_LONGTEXT N_( \
"This option allows you to set the language of the interface " \
"(e.g. 'fr', 'de'...). If not specified, the system language is " \
"auto-detected." )
"This option allows you to set the language of the interface or disable " \
"the translation alltogether " \
"(e.g. 'C' (for disable), 'fr', 'de', 'en_GB', ...). " \
"The system language is auto-detected if nothing is specified here." )
#define COLOR_TEXT N_("Color messages")
#define COLOR_LONGTEXT N_( \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment