* 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.

diff --git a/configure.ac.in b/configure.ac.in
index d14237accd4d98e1cd97249f50c489dfffc309d9..9ba5f2ca1c3db84b0ad741f00015fa0b40517c19 100644 (file)
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -157,7 +157,7 @@ case "x${target_os}" in
     AC_CHECK_LIB( bind, inet_ntoa,
         [ LDFLAGS_access_mms="${LDFLAGS_access_mms} -lbind"
           LDFLAGS_ipv4="${LDFLAGS_ipv4} -lbind"
-          LDFALGS_httpd="${LDFLAGS_httpd} -lbind"],
+          LDFLAGS_httpd="${LDFLAGS_httpd} -lbind"],
         [])
     ;;
   x*)

diff --git a/modules/gui/beos/Interface.cpp b/modules/gui/beos/Interface.cpp
index 390dd15bb2636827d73ff19385f7c4b3d516817c..2a307fd29f1ae140c07cde6b78c0832f06f15023 100644 (file)
--- a/modules/gui/beos/Interface.cpp
+++ b/modules/gui/beos/Interface.cpp
@@ -2,7 +2,7 @@
  * intf_beos.cpp: beos interface
  *****************************************************************************
  * 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>
  *          Samuel Hocevar <sam@zoy.org>
@@ -78,7 +78,8 @@ int E_(OpenIntf) ( vlc_object_t *p_this )
     rect.right = rect.left + 350;
     p_intf->p_sys->p_window =
         new InterfaceWindow( rect,
-                             VOUT_TITLE " (BeOS interface)", p_intf );
+                             "VLC " PACKAGE_VERSION,
+                             p_intf );
     if( p_intf->p_sys->p_window == 0 )
     {
         free( p_intf->p_sys );

diff --git a/modules/gui/beos/InterfaceWindow.cpp b/modules/gui/beos/InterfaceWindow.cpp
index c0aa40f32a2023e7b021f3a404f268131617eca1..b33b5f141e350c6c74c65fe0013017ec63cf82fa 100644 (file)
--- a/modules/gui/beos/InterfaceWindow.cpp
+++ b/modules/gui/beos/InterfaceWindow.cpp
@@ -2,7 +2,7 @@
  * InterfaceWindow.cpp: beos interface
  *****************************************************************************
  * 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>
  *          Samuel Hocevar <sam@zoy.org>
@@ -216,7 +216,6 @@ InterfaceWindow::InterfaceWindow( BRect frame, const char* name,
 
     // set the title bar
     SetName( "interface" );
-    SetTitle( VOUT_TITLE );
 
     // the media control view
     p_mediaControl = new MediaControlView( BRect( 0.0, 0.0, 250.0, 50.0 ),
@@ -359,8 +358,9 @@ void InterfaceWindow::MessageReceived( BMessage * p_message )
     {
         case B_ABOUT_REQUESTED:
         {
-            BAlert* alert = new BAlert( VOUT_TITLE,
-                                        "BeOS " VOUT_TITLE "\n\n<www.videolan.org>", "Ok");
+            BAlert* alert = new BAlert( "VLC " PACKAGE_VERSION,
+                                        "VLC " PACKAGE_VERSION " for BeOS\n\n"
+                                        "<www.videolan.org>", "OK");
             alert->Go();
             break;
         }

diff --git a/modules/gui/beos/VideoOutput.cpp b/modules/gui/beos/VideoOutput.cpp
index 5b7b02d8e7f50586083b91e160127404ac90ca01..0961449d6e185eb8c930e2af63ac84e59a78bf91 100644 (file)
--- a/modules/gui/beos/VideoOutput.cpp
+++ b/modules/gui/beos/VideoOutput.cpp
@@ -2,7 +2,7 @@
  * vout_beos.cpp: beos video output display method
  *****************************************************************************
  * 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>
  *          Samuel Hocevar <sam@zoy.org>
@@ -666,7 +666,7 @@ VideoWindow::_AllocateBuffers(int width, int height, int* mode)
                                     &key, B_FOLLOW_ALL,
                                            B_OVERLAY_FILTER_HORIZONTAL|B_OVERLAY_FILTER_VERTICAL);
                       view->SetViewColor(key);
-               SetTitle(VOUT_TITLE " (Overlay)");
+               SetTitle("VLC " PACKAGE_VERSION " (Overlay)");
                break;
             }
             else
@@ -683,7 +683,7 @@ VideoWindow::_AllocateBuffers(int width, int height, int* mode)
        {
         // fallback to RGB
         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[1] = new BBitmap( bitmapFrame, colspace[colspace_index].colspace );
         bitmap[2] = new BBitmap( bitmapFrame, colspace[colspace_index].colspace );

diff --git a/src/misc/beos_specific.cpp b/src/misc/beos_specific.cpp
index f547af7cfee5d0a2aa20e36b04ecad057377bf6a..24826021d1776e0eaf1c736cb30de907c6a36413 100644 (file)
--- a/src/misc/beos_specific.cpp
+++ b/src/misc/beos_specific.cpp
@@ -2,7 +2,7 @@
  * beos_init.cpp: Initialization for BeOS specific features 
  *****************************************************************************
  * 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>
  *
@@ -150,9 +150,9 @@ VlcApplication::~VlcApplication( )
 void VlcApplication::AboutRequested( )
 {
     BAlert *alert;
-    alert = new BAlert( VOUT_TITLE,
-                        "BeOS " VOUT_TITLE "\n\n<www.videolan.org>",
-                        "Ok" );
+    alert = new BAlert( "VLC " PACKAGE_VERSION,
+                        "VLC " PACKAGE_VERSION " for BeOS\n\n"
+                                        "<www.videolan.org>", "OK");
     alert->Go( NULL );
 }