Skip to content

V
vlc-2-2
Commit 9498c61e authored by Eric Petit's avatar Eric Petit
Browse files
Options

+ configure.ac: 

     fixed a link issue on BeOS
 + modules/demux/util/sub.c:
     gcc != 3 fix
 + modules/gui/beos/*:
     compile fixes; never replace int32 with int32_t, these are not the
     same on BeOS (long/int)
parent ea33ac4c
Show whitespace changes
Inline Side-by-side
Showing with 23 additions and 21 deletions
configure.ac
View file @ 9498c61e
dnl Autoconf settings for vlc
dnl $Id: configure.ac,v 1.103 2003/11/03 23:05:03 fenrir Exp $
dnl $Id: configure.ac,v 1.104 2003/11/04 11:11:29 titer Exp $
AC_INIT(vlc,0.6.3-cvs)
......@@ -140,9 +140,10 @@ case "${target_os}" in
dnl Check for BONE presence
AC_CHECK_LIB(socket, connect,
AX_ADD_LDFLAGS([vlc access_mms ipv4 httpd],[-lsocket -lbind]))
AX_ADD_LDFLAGS([vlc ipv4 access_http access_mms access_udp access_ftp sap http access_output_udp],
[-lbind]))
dnl Kludgy check for Zeta
dnl Ugly check for Zeta
if test -f /boot/beos/system/lib/libzeta.so; then
AX_ADD_LDFLAGS([beos],[-lzeta])
fi
......
modules/demux/util/sub.c
View file @ 9498c61e
......@@ -2,7 +2,7 @@
* sub.c
*****************************************************************************
* Copyright (C) 1999-2003 VideoLAN
* $Id: sub.c,v 1.32 2003/11/02 01:41:12 hartman Exp $
* $Id: sub.c,v 1.33 2003/11/04 11:11:30 titer Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
......@@ -1065,12 +1065,13 @@ static int sub_VobSub( text_t *txt, subtitle_t *p_subtitle, mtime_t i_microsecp
for( ;; )
{
unsigned int h, m, s, ms, loc;
if( ( p = text_get_line( txt ) ) == NULL )
{
return( VLC_EGENERIC );
}
i_start = 0;
unsigned int h, m, s, ms, loc;
memset( buffer_text, '\0', MAX_LINE );
if( sscanf( p, "timestamp: %d:%d:%d:%d, filepos: %x%[^\r\n]",
......
modules/gui/beos/VideoOutput.cpp
View file @ 9498c61e
......@@ -2,7 +2,7 @@
* vout_beos.cpp: beos video output display method
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
* $Id: VideoOutput.cpp,v 1.23 2003/10/25 00:49:14 sam Exp $
* $Id: VideoOutput.cpp,v 1.24 2003/11/04 11:11:30 titer Exp $
*
* Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -165,10 +165,10 @@ VideoSettings::VideoSettings()
if ( ret == B_OK )
{
uint32_t flags;
if ( fSettings->FindInt32( "flags", (int32_t*)&flags ) == B_OK )
if ( fSettings->FindInt32( "flags", (int32*)&flags ) == B_OK )
SetFlags( flags );
uint32_t size;
if ( fSettings->FindInt32( "video size", (int32_t*)&size ) == B_OK )
if ( fSettings->FindInt32( "video size", (int32*)&size ) == B_OK )
SetVideoSize( size );
}
else
......@@ -310,7 +310,7 @@ VideoWindow::VideoWindow(int v_width, int v_height, BRect frame,
VideoWindow::~VideoWindow()
{
int32_t result;
int32 result;
teardownwindow = true;
wait_for_thread(fDrawThreadID, &result);
......@@ -345,7 +345,7 @@ VideoWindow::MessageReceived( BMessage *p_message )
case WINDOW_FEEL:
{
window_feel winFeel;
if (p_message->FindInt32("WinFeel", (int32_t*)&winFeel) == B_OK)
if (p_message->FindInt32("WinFeel", (int32*)&winFeel) == B_OK)
{
SetFeel(winFeel);
fCachedFeel = winFeel;
......@@ -916,7 +916,7 @@ VideoWindow::_SaveScreenShot( BBitmap* bitmap, char* path,
/*****************************************************************************
* VideoWindow::_save_screen_shot
*****************************************************************************/
int32_t
int32
VideoWindow::_save_screen_shot( void* cookie )
{
screen_shot_info* info = (screen_shot_info*)cookie;
......@@ -968,7 +968,7 @@ VideoWindow::_save_screen_shot( void* cookie )
// find suitable translator
translator_id* ids = NULL;
int32_t count = 0;
int32 count = 0;
status = roster->GetAllTranslators( &ids, &count );
if ( status >= B_OK )
......@@ -976,7 +976,7 @@ VideoWindow::_save_screen_shot( void* cookie )
for ( int tix = 0; tix < count; tix++ )
{
const translation_format *formats = NULL;
int32_t num_formats = 0;
int32 num_formats = 0;
bool ok = false;
status = roster->GetInputFormats( ids[tix],
&formats, &num_formats );
......@@ -1029,7 +1029,7 @@ VideoWindow::_save_screen_shot( void* cookie )
if ( nodeInfo.InitCheck() == B_OK )
{
translation_format* formats;
int32_t count;
int32 count;
status = roster->GetOutputFormats( translator,
(const translation_format **) &formats,
&count);
......@@ -1105,10 +1105,10 @@ VLCView::MouseDown(BPoint where)
{
VideoWindow* videoWindow = dynamic_cast<VideoWindow*>(Window());
BMessage* msg = Window()->CurrentMessage();
int32_t clicks;
int32 clicks;
uint32_t buttons;
msg->FindInt32("clicks", &clicks);
msg->FindInt32("buttons", (int32_t*)&buttons);
msg->FindInt32("buttons", (int32*)&buttons);
if (videoWindow)
{
......@@ -1274,7 +1274,7 @@ VLCView::Pulse()
system_time() - fLastMouseMovedTime > 29000000 )
{
BPoint where;
uint32_t buttons;
uint32 buttons;
GetMouse(&where, &buttons, false);
ConvertToScreen(&where);
set_mouse_position((int32_t) where.x, (int32_t) where.y);
......
modules/gui/beos/VideoWindow.h
View file @ 9498c61e
......@@ -2,7 +2,7 @@
* VideoWindow.h: BeOS video window class prototype
*****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN
* $Id: VideoWindow.h,v 1.7 2003/10/25 00:49:14 sam Exp $
* $Id: VideoWindow.h,v 1.8 2003/11/04 11:11:30 titer Exp $
*
* Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Tony Castley <tcastley@mail.powerup.com.au>
......@@ -192,7 +192,7 @@ private:
void _SaveScreenShot( BBitmap* bitmap,
char* path,
uint32_t translatorID ) const;
static int32_t _save_screen_shot( void* cookie );
static int32 _save_screen_shot( void* cookie );
struct screen_shot_info
{
......
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