Commit f60d5d58 authored by Sam Hocevar's avatar Sam Hocevar

* ./include/main.h, ./plugins/beos/intf_beos.cpp: BeOS compilation fixes.

  * ./bootstrap.sh, ./src/libvlc.h, ./po/*: fixed bootstrap.sh so that it does
    not include CVS Id lines in automatically created files.
parent 1dedf688
......@@ -4,6 +4,9 @@
HEAD
* ./include/main.h, ./plugins/beos/intf_beos.cpp: BeOS compilation fixes.
* ./bootstrap.sh, ./src/libvlc.h, ./po/*: fixed bootstrap.sh so that it does
not include CVS Id lines in automatically created files.
* ./plugins/dummy/intf_dummy.c, ./plugins/chroma/i420_yuy2.c,
src/interface/intf_eject.c, src/misc/threads.c: win32 compilation fix.
* ./plugins/directx/aout_directx.c, plugins/directx/vout_directx.c,
......
#! /bin/sh
## bootstrap.sh file for vlc, the VideoLAN Client
## $Id: bootstrap.sh,v 1.1 2002/06/01 12:31:57 sam Exp $
## $Id: bootstrap.sh,v 1.2 2002/06/01 17:09:25 sam Exp $
##
## Authors: Samuel Hocevar <sam@zoy.org>
......@@ -21,7 +21,8 @@ echo "autoheader."
file=src/misc/modules_plugin.h
echo -n "creating headers: "
rm -f $file
cp $file.in $file
sed 's#.*\$Id: bootstrap.sh,v 1.2 2002/06/01 17:09:25 sam Exp $file'.in by bootstrap.sh#' \
< $file.in > $file
echo '#define STORE_SYMBOLS( p_symbols ) \' >> $file
cat include/*.h | grep '^ *VLC_EXPORT.*;' | \
sed 's/VLC_EXPORT( *\([^,]*\), *\([^,]*\), *\(.*\));.*/ (p_symbols)->\2_inner = \2; \\/' >> $file
......
......@@ -3,7 +3,7 @@
* Declaration and extern access to global program object.
*****************************************************************************
* Copyright (C) 1999, 2000, 2001, 2002 VideoLAN
* $Id: main.h,v 1.37 2002/06/01 14:31:32 sam Exp $
* $Id: main.h,v 1.38 2002/06/01 17:09:25 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
*
......@@ -79,7 +79,7 @@ struct vlc_s
/* Private data */
#if defined( SYS_BEOS )
vlc_object_t p_appthread;
vlc_object_t * p_appthread;
#elif defined( WIN32 )
SIGNALOBJECTANDWAIT SignalObjectAndWait;
vlc_bool_t b_fast_pthread;
......
......@@ -2,7 +2,7 @@
* intf_beos.cpp: beos interface
*****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN
* $Id: intf_beos.cpp,v 1.39 2002/06/01 12:31:58 sam Exp $
* $Id: intf_beos.cpp,v 1.40 2002/06/01 17:09:25 sam Exp $
*
* Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -124,12 +124,8 @@ static void intf_Close( intf_thread_t *p_intf )
*****************************************************************************/
static void intf_Run( intf_thread_t *p_intf )
{
while( !p_intf->p_vlc->b_die )
{
/* Manage core vlc functions through the callback */
p_intf->pf_manage( p_intf );
/* Manage the slider */
if( p_intf->p_vlc->p_input_bank->pp_input[0] != NULL
&& p_intf->p_sys->p_window != NULL)
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -2,7 +2,7 @@
* libvlc.h: main libvlc header
*****************************************************************************
* Copyright (C) 1998-2002 VideoLAN
* $Id: libvlc.h,v 1.1 2002/06/01 12:32:01 sam Exp $
* $Id: libvlc.h,v 1.2 2002/06/01 17:09:25 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -23,6 +23,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#define Nothing here, this is just to prevent update-po from being stupid
/*****************************************************************************
* Configuration options for the main program. Each module will also separatly
* define its own configuration options.
......
......@@ -2,7 +2,7 @@
* modules_plugin.h : Plugin management functions used by the core application.
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: modules_plugin.h,v 1.29 2002/06/01 16:45:35 sam Exp $
* Automatically generated from src/misc/modules_plugin.h.in by bootstrap.sh
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......
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