Commit 86d1e8f7 authored by Eric Petit's avatar Eric Petit

* configure.ac.in: compile fix for BeOS/BONE (s/LDFALGS/LDFLAGS/...)

 * beos_specific.cpp, modules/gui/beos/*: add VLC version number in the
   "About" window and in the titles of the others windows.
parent 73092d77
...@@ -157,7 +157,7 @@ case "x${target_os}" in ...@@ -157,7 +157,7 @@ case "x${target_os}" in
AC_CHECK_LIB( bind, inet_ntoa, AC_CHECK_LIB( bind, inet_ntoa,
[ LDFLAGS_access_mms="${LDFLAGS_access_mms} -lbind" [ LDFLAGS_access_mms="${LDFLAGS_access_mms} -lbind"
LDFLAGS_ipv4="${LDFLAGS_ipv4} -lbind" LDFLAGS_ipv4="${LDFLAGS_ipv4} -lbind"
LDFALGS_httpd="${LDFLAGS_httpd} -lbind"], LDFLAGS_httpd="${LDFLAGS_httpd} -lbind"],
[]) [])
;; ;;
x*) x*)
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* intf_beos.cpp: beos interface * intf_beos.cpp: beos interface
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN * Copyright (C) 1999, 2000, 2001 VideoLAN
* $Id: Interface.cpp,v 1.10 2003/02/09 11:51:36 titer Exp $ * $Id: Interface.cpp,v 1.11 2003/03/12 23:15:03 titer Exp $
* *
* Authors: Jean-Marc Dressler <polux@via.ecp.fr> * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org> * Samuel Hocevar <sam@zoy.org>
...@@ -78,7 +78,8 @@ int E_(OpenIntf) ( vlc_object_t *p_this ) ...@@ -78,7 +78,8 @@ int E_(OpenIntf) ( vlc_object_t *p_this )
rect.right = rect.left + 350; rect.right = rect.left + 350;
p_intf->p_sys->p_window = p_intf->p_sys->p_window =
new InterfaceWindow( rect, new InterfaceWindow( rect,
VOUT_TITLE " (BeOS interface)", p_intf ); "VLC " PACKAGE_VERSION,
p_intf );
if( p_intf->p_sys->p_window == 0 ) if( p_intf->p_sys->p_window == 0 )
{ {
free( p_intf->p_sys ); free( p_intf->p_sys );
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* InterfaceWindow.cpp: beos interface * InterfaceWindow.cpp: beos interface
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN * Copyright (C) 1999, 2000, 2001 VideoLAN
* $Id: InterfaceWindow.cpp,v 1.30 2003/02/10 15:23:46 titer Exp $ * $Id: InterfaceWindow.cpp,v 1.31 2003/03/12 23:15:03 titer Exp $
* *
* Authors: Jean-Marc Dressler <polux@via.ecp.fr> * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org> * Samuel Hocevar <sam@zoy.org>
...@@ -216,7 +216,6 @@ InterfaceWindow::InterfaceWindow( BRect frame, const char* name, ...@@ -216,7 +216,6 @@ InterfaceWindow::InterfaceWindow( BRect frame, const char* name,
// set the title bar // set the title bar
SetName( "interface" ); SetName( "interface" );
SetTitle( VOUT_TITLE );
// the media control view // the media control view
p_mediaControl = new MediaControlView( BRect( 0.0, 0.0, 250.0, 50.0 ), p_mediaControl = new MediaControlView( BRect( 0.0, 0.0, 250.0, 50.0 ),
...@@ -359,8 +358,9 @@ void InterfaceWindow::MessageReceived( BMessage * p_message ) ...@@ -359,8 +358,9 @@ void InterfaceWindow::MessageReceived( BMessage * p_message )
{ {
case B_ABOUT_REQUESTED: case B_ABOUT_REQUESTED:
{ {
BAlert* alert = new BAlert( VOUT_TITLE, BAlert* alert = new BAlert( "VLC " PACKAGE_VERSION,
"BeOS " VOUT_TITLE "\n\n<www.videolan.org>", "Ok"); "VLC " PACKAGE_VERSION " for BeOS\n\n"
"<www.videolan.org>", "OK");
alert->Go(); alert->Go();
break; break;
} }
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* vout_beos.cpp: beos video output display method * vout_beos.cpp: beos video output display method
***************************************************************************** *****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN * Copyright (C) 2000, 2001 VideoLAN
* $Id: VideoOutput.cpp,v 1.12 2003/02/09 17:10:52 stippi Exp $ * $Id: VideoOutput.cpp,v 1.13 2003/03/12 23:15:03 titer Exp $
* *
* Authors: Jean-Marc Dressler <polux@via.ecp.fr> * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org> * Samuel Hocevar <sam@zoy.org>
...@@ -666,7 +666,7 @@ VideoWindow::_AllocateBuffers(int width, int height, int* mode) ...@@ -666,7 +666,7 @@ VideoWindow::_AllocateBuffers(int width, int height, int* mode)
&key, B_FOLLOW_ALL, &key, B_FOLLOW_ALL,
B_OVERLAY_FILTER_HORIZONTAL|B_OVERLAY_FILTER_VERTICAL); B_OVERLAY_FILTER_HORIZONTAL|B_OVERLAY_FILTER_VERTICAL);
view->SetViewColor(key); view->SetViewColor(key);
SetTitle(VOUT_TITLE " (Overlay)"); SetTitle("VLC " PACKAGE_VERSION " (Overlay)");
break; break;
} }
else else
...@@ -683,7 +683,7 @@ VideoWindow::_AllocateBuffers(int width, int height, int* mode) ...@@ -683,7 +683,7 @@ VideoWindow::_AllocateBuffers(int width, int height, int* mode)
{ {
// fallback to RGB // fallback to RGB
colspace_index = DEFAULT_COL; // B_RGB32 colspace_index = DEFAULT_COL; // B_RGB32
SetTitle( VOUT_TITLE " (Bitmap)" ); SetTitle( "VLC " PACKAGE_VERSION " (Bitmap)" );
bitmap[0] = new BBitmap( bitmapFrame, colspace[colspace_index].colspace ); bitmap[0] = new BBitmap( bitmapFrame, colspace[colspace_index].colspace );
bitmap[1] = new BBitmap( bitmapFrame, colspace[colspace_index].colspace ); bitmap[1] = new BBitmap( bitmapFrame, colspace[colspace_index].colspace );
bitmap[2] = new BBitmap( bitmapFrame, colspace[colspace_index].colspace ); bitmap[2] = new BBitmap( bitmapFrame, colspace[colspace_index].colspace );
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* beos_init.cpp: Initialization for BeOS specific features * beos_init.cpp: Initialization for BeOS specific features
***************************************************************************** *****************************************************************************
* Copyright (C) 1999-2001 VideoLAN * Copyright (C) 1999-2001 VideoLAN
* $Id: beos_specific.cpp,v 1.29 2003/01/19 03:16:24 sam Exp $ * $Id: beos_specific.cpp,v 1.30 2003/03/12 23:15:03 titer Exp $
* *
* Authors: Jean-Marc Dressler <polux@via.ecp.fr> * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* *
...@@ -150,9 +150,9 @@ VlcApplication::~VlcApplication( ) ...@@ -150,9 +150,9 @@ VlcApplication::~VlcApplication( )
void VlcApplication::AboutRequested( ) void VlcApplication::AboutRequested( )
{ {
BAlert *alert; BAlert *alert;
alert = new BAlert( VOUT_TITLE, alert = new BAlert( "VLC " PACKAGE_VERSION,
"BeOS " VOUT_TITLE "\n\n<www.videolan.org>", "VLC " PACKAGE_VERSION " for BeOS\n\n"
"Ok" ); "<www.videolan.org>", "OK");
alert->Go( NULL ); alert->Go( NULL );
} }
......
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