* modules/gui/wxwindows/*: small formating changes.

* modules/video_filter/deinterlace/deinterlace.c, src/libvlc.h: modified a couple of config option descriptions.

diff --git a/modules/gui/wxwindows/open.cpp b/modules/gui/wxwindows/open.cpp
index 290360ad9cc05d6734daa1c735d7de4636397a19..f7e5245e18acfe4e83f129c428f94c15585cc14f 100644 (file)
--- a/modules/gui/wxwindows/open.cpp
+++ b/modules/gui/wxwindows/open.cpp
@@ -2,7 +2,7 @@
  * open.cpp : wxWindows plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: open.cpp,v 1.9 2003/03/29 17:10:31 gbazin Exp $
+ * $Id: open.cpp,v 1.10 2003/03/30 16:26:42 gbazin Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -235,8 +235,10 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, Interface *_p_main_interface,
                        i_access_method == DISC_ACCESS );
     notebook->AddPage( NetPanel( notebook ), _("Network"),
                        i_access_method == NET_ACCESS );
+#ifndef WIN32
     notebook->AddPage( SatPanel( notebook ), _("Satellite"),
                        i_access_method == SAT_ACCESS );
+#endif
 
     /* Update Disc panel */
     wxCommandEvent dummy_event;

diff --git a/modules/gui/wxwindows/preferences.cpp b/modules/gui/wxwindows/preferences.cpp
index 36794ae4ac3a1436a3fba74aff83babbcfacde42..9ef4c5db5e1597d568d0185bce14df409e244ecb 100644 (file)
--- a/modules/gui/wxwindows/preferences.cpp
+++ b/modules/gui/wxwindows/preferences.cpp
@@ -2,7 +2,7 @@
  * preferences.cpp : wxWindows plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: preferences.cpp,v 1.7 2003/03/30 15:05:32 gbazin Exp $
+ * $Id: preferences.cpp,v 1.8 2003/03/30 16:26:42 gbazin Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -613,8 +613,8 @@ PrefsPanel::PrefsPanel( wxWindow* parent, intf_thread_t *_p_intf,
 
             combo->SetToolTip( p_item->psz_longtext );
             config_data->control.combobox = combo;
-            panel_sizer->Add( label, 0, wxALL, 5 );
-            panel_sizer->Add( combo, 1, wxALL, 5 );
+            panel_sizer->Add( label, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5 );
+            panel_sizer->Add( combo, 1, wxALIGN_CENTER_VERTICAL | wxALL, 5 );
             break;
 
         case CONFIG_ITEM_STRING:
@@ -648,13 +648,13 @@ PrefsPanel::PrefsPanel( wxWindow* parent, intf_thread_t *_p_intf,
                 combo->SetToolTip( p_item->psz_longtext );
                 config_data->control.combobox = combo;
                 config_data->b_config_list = VLC_TRUE;
-                panel_sizer->Add( combo, 1, wxALL, 5 );
+                panel_sizer->Add( combo, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
             }
 
             if( p_item->i_type == CONFIG_ITEM_FILE )
             {
                 button = new wxButton( panel, -1, _("Browse...") );
-                panel_sizer->Add( button, 0, wxALL, 5 );
+                panel_sizer->Add( button, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
                 button->SetClientData((void *)config_data);
             }
             break;
@@ -668,8 +668,8 @@ PrefsPanel::PrefsPanel( wxWindow* parent, intf_thread_t *_p_intf,
                                    0, 16000, p_item->i_value);
             spin->SetToolTip( p_item->psz_longtext );
             config_data->control.spinctrl = spin;
-            panel_sizer->Add( label, 0, wxALL, 5 );
-            panel_sizer->Add( spin, 0, wxALL, 5 );
+            panel_sizer->Add( label, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5 );
+            panel_sizer->Add( spin, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5 );
 
             spin->SetClientData((void *)config_data);
             break;
@@ -683,8 +683,8 @@ PrefsPanel::PrefsPanel( wxWindow* parent, intf_thread_t *_p_intf,
                                    0, 16000, p_item->i_value);
             spin->SetToolTip( p_item->psz_longtext );
             config_data->control.spinctrl = spin;
-            panel_sizer->Add( label, 0, wxALL, 5 );
-            panel_sizer->Add( spin, 0, wxALL, 5 );
+            panel_sizer->Add( label, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5 );
+            panel_sizer->Add( spin, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5 );
             break;
 
         case CONFIG_ITEM_BOOL:

diff --git a/modules/video_filter/deinterlace/deinterlace.c b/modules/video_filter/deinterlace/deinterlace.c
index a295d5b89720493fbfa87648d35491e139356d3f..70ca2bb4d74ed1bd1b31b84d3be898cc41abc878 100644 (file)
--- a/modules/video_filter/deinterlace/deinterlace.c
+++ b/modules/video_filter/deinterlace/deinterlace.c
@@ -2,7 +2,7 @@
  * deinterlace.c : deinterlacer plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000, 2001, 2002, 2003 VideoLAN
- * $Id: deinterlace.c,v 1.9 2003/02/20 01:52:46 sigmunau Exp $
+ * $Id: deinterlace.c,v 1.10 2003/03/30 16:26:42 gbazin Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -73,7 +73,7 @@ static int FilterCallback ( vlc_object_t *, char const *,
  * Module descriptor
  *****************************************************************************/
 #define MODE_TEXT N_("deinterlace mode")
-#define MODE_LONGTEXT N_("One of \"discard\", \"blend\", \"mean\", \"bob\" or \"linear\"")
+#define MODE_LONGTEXT N_("you can choose the default deinterlace mode")
 
 static char *mode_list[] = { "discard", "blend", "mean", "bob", "linear", NULL };
 

diff --git a/src/libvlc.h b/src/libvlc.h
index db825609392f32ac509ee10d9ff465efa2a3fc15..4adf67ed17552e9e04653b6eb937dfdc0a471b91 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -2,7 +2,7 @@
  * libvlc.h: main libvlc header
  *****************************************************************************
  * Copyright (C) 1998-2002 VideoLAN
- * $Id: libvlc.h,v 1.52 2003/03/30 14:24:20 gbazin Exp $
+ * $Id: libvlc.h,v 1.53 2003/03/30 16:26:42 gbazin Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -105,7 +105,7 @@ static char *ppsz_sout_vcodec[] = { "", "mpeg1", "mpeg2", "mpeg4", NULL };
 #define AOUT_RATE_TEXT N_("audio output frequency (Hz)")
 #define AOUT_RATE_LONGTEXT N_( \
     "You can force the audio output frequency here. Common values are " \
-    "48000, 44100, 32000, 22050, 16000, 11025, 8000.")
+    "-1 (default), 48000, 44100, 32000, 22050, 16000, 11025, 8000.")
 
 #define DESYNC_TEXT N_("compensate desynchronization of audio (in ms)")
 #define DESYNC_LONGTEXT N_( \