Commit 2bb1112c authored by Sam Hocevar's avatar Sam Hocevar

* ./plugins/access/file.c, plugins/dvd/dvd_seek.c: readability changes.

  * ./Makefile: the vlc rule depends on modules_builtin.h.
  * ./include/modules_inner.h: removed useless code.
parent 8bf866ed
......@@ -550,7 +550,7 @@ endif
#
# Main application target
#
vlc: Makefile.opts Makefile.dep Makefile $(VLC_OBJ) $(BUILTIN_OBJ)
vlc: Makefile.config Makefile.opts Makefile.dep Makefile $(VLC_OBJ) $(BUILTIN_OBJ)
$(CC) $(CFLAGS) -o $@ $(VLC_OBJ) $(BUILTIN_OBJ) $(LDFLAGS) $(vlc_LDFLAGS) $(builtins_LDFLAGS)
ifeq ($(SYS),beos)
xres -o $@ ./share/vlc_beos.rsrc
......
......@@ -2,7 +2,7 @@
* modules_inner.h : Macros used from within a module.
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: modules_inner.h,v 1.20 2002/05/22 11:23:56 lool Exp $
* $Id: modules_inner.h,v 1.21 2002/05/22 17:17:45 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -92,7 +92,6 @@
#define MODULE_INIT_STOP \
} while( 0 ); \
STORE_SYMBOLS; \
p_module->pp_shortcuts[ i_shortcut ] = NULL; \
p_module->i_config_items = 0; \
for( p_item = p_config; \
......@@ -152,7 +151,6 @@
{ \
return( -1 ); \
} \
STORE_SYMBOLS; \
config_SetCallbacks( p_module->p_config, p_config ); \
do {
......
......@@ -2,7 +2,7 @@
* file.c: file input (file: access plug-in)
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: file.c,v 1.5 2002/04/19 13:56:10 sam Exp $
* $Id: file.c,v 1.6 2002/05/22 17:17:45 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -99,8 +99,7 @@ static int FileOpen( input_thread_t * p_input )
p_input->i_mtu = 0;
b_stdin = ( strlen( p_input->psz_name ) == 1 )
&& *p_input->psz_name == '-';
b_stdin = psz_name[0] == '-' && psz_name[1] == '\0';
if( !b_stdin && (i_stat = stat( psz_name, &stat_info )) == (-1) )
{
......
/* dvd_seek.c: functions to navigate through DVD.
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: dvd_seek.c,v 1.8 2002/05/21 00:34:41 sam Exp $
* $Id: dvd_seek.c,v 1.9 2002/05/22 17:17:45 sam Exp $
*
* Author: Stphane Borel <stef@via.ecp.fr>
*
......@@ -200,13 +200,15 @@ int LbMaxOnce( thread_dvd_data_t * p_dvd )
p_dvd->i_map_cell++;
p_dvd->i_angle_cell++;
if( ( p_dvd->i_prg_cell = NextCellPrg( p_dvd ) ) < 0 )
p_dvd->i_prg_cell = NextCellPrg( p_dvd );
if( p_dvd->i_prg_cell < 0 )
{
/* EOF */
return 0;
}
if( ( p_dvd->i_map_cell = CellPrg2Map( p_dvd ) ) < 0 )
p_dvd->i_map_cell = CellPrg2Map( p_dvd );
if( p_dvd->i_map_cell < 0 )
{
return 0;
}
......@@ -214,15 +216,16 @@ int LbMaxOnce( thread_dvd_data_t * p_dvd )
p_dvd->i_vts_lb = CellFirstSector( p_dvd );
p_dvd->i_last_lb = CellLastSector( p_dvd );
if( ( p_dvd->i_chapter = NextChapter( p_dvd ) ) < 0)
p_dvd->i_chapter = NextChapter( p_dvd );
if( p_dvd->i_chapter < 0 )
{
return 0;
}
/* Position the fd pointer on the right address */
if( ( dvdcss_seek( p_dvd->dvdhandle,
p_dvd->i_vts_start + p_dvd->i_vts_lb,
DVDCSS_SEEK_MPEG ) ) < 0 )
if( dvdcss_seek( p_dvd->dvdhandle,
p_dvd->i_vts_start + p_dvd->i_vts_lb,
DVDCSS_SEEK_MPEG ) < 0 )
{
intf_ErrMsg( "dvd error: %s",
dvdcss_error( p_dvd->dvdhandle ) );
......
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