* include/vlc_config.h: removed unused config stuff.

* include/vlc_interface.h, modules/gui/wxwindows/interface.cpp: new common INTF_ABOUT_MSG message shared by interfaces.

diff --git a/include/vlc_config.h b/include/vlc_config.h
index 693d4b3bb9f57a46d15d15cbeced20929935afab..ba1c2e4c1c3e4a9c6a515e4635f7ceaced1009a7 100644 (file)
--- a/include/vlc_config.h
+++ b/include/vlc_config.h
@@ -202,10 +202,6 @@
  * joined. */
 #define VOUT_MAX_AREAS                  5
 
-/* Default fonts */
-#define VOUT_DEFAULT_FONT               "default8x9.psf"
-#define VOUT_LARGE_FONT                 "default8x16.psf"
-
 /* Statistics are displayed every n loops (=~ pictures) */
 #define VOUT_STATS_NB_LOOPS             100
 

diff --git a/include/vlc_interface.h b/include/vlc_interface.h
index 9b7c2562456854e8b8adc7b8485988f1b2dfeb43..90b69fbf19d19d9abd60ed5b6ef4c63537881e56 100644 (file)
--- a/include/vlc_interface.h
+++ b/include/vlc_interface.h
@@ -4,7 +4,7 @@
  * interface, such as message output.
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: vlc_interface.h,v 1.4 2003/07/20 10:38:49 gbazin Exp $
+ * $Id: vlc_interface.h,v 1.5 2003/08/30 13:59:15 gbazin Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *
@@ -127,3 +127,14 @@ VLC_EXPORT( void,              intf_Destroy,    ( intf_thread_t * ) );
 #define INTF_DIALOG_FILE_GENERIC 30
 
 #define INTF_DIALOG_EXIT       99
+
+/* Useful text messages shared by interfaces */
+#define INTF_ABOUT_MSG \
+    _( "VLC is an open-source and cross-platform multimedia " \
+       "player for various audio and video formats (MPEG-1, MPEG-2, MPEG-4, " \
+       "DivX, mp3, Ogg, ...) as well as DVDs, VCDs, CD audio, and various " \
+       "streaming protocols.\n\n" \
+       "VLC is also a streaming server with transcoding capabilities " \
+       "(UDP unicast and multicast, HTTP, ...) mainly designed for " \
+       "high-bandwidth networks.\n\n"\
+       "For more information, have a look at the web site." )

diff --git a/modules/gui/wxwindows/interface.cpp b/modules/gui/wxwindows/interface.cpp
index 3eeb816a8d0bd6553a1bd936ff791e0e3d8f31d4..a2c23fd5379c2ab3fe770437efaecd01590789f8 100644 (file)
--- a/modules/gui/wxwindows/interface.cpp
+++ b/modules/gui/wxwindows/interface.cpp
@@ -2,7 +2,7 @@
  * interface.cpp : wxWindows plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: interface.cpp,v 1.58 2003/08/28 15:59:04 gbazin Exp $
+ * $Id: interface.cpp,v 1.59 2003/08/30 13:59:15 gbazin Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -606,11 +606,9 @@ void Interface::OnAbout( wxCommandEvent& WXUNUSED(event) )
     msg.Printf( wxString(wxT("VLC media player " VERSION)) +
         wxU(_(" (wxWindows interface)\n\n")) +
         wxU(_("(C) 1996-2003 - the VideoLAN Team\n\n")) +
+        wxU( INTF_ABOUT_MSG ) + wxT("\n\n") +
         wxU(_("The VideoLAN team <videolan@videolan.org>\n"
-              "http://www.videolan.org/\n\n")) +
-        wxU(_("This is the VideoLAN Client, a DVD, MPEG and DivX player."
-              "\nIt can play MPEG and MPEG2 files from a file or from a "
-              "network source.")) );
+              "http://www.videolan.org/\n\n")) );
 
     wxMessageBox( msg, wxString::Format(wxU(_("About %s")),
                   wxT("VLC media player")), wxOK | wxICON_INFORMATION, this );