wx/*: fix a few string additions

[vlc] / modules / gui / wxwindows / open.cpp

diff --git a/modules/gui/wxwindows/open.cpp b/modules/gui/wxwindows/open.cpp
index 4f9b7e14514ae7133e76522485a074ef32dc82a5..17033bc76a58c8f931055d672929029cb87a3585 100644 (file)
--- a/modules/gui/wxwindows/open.cpp
+++ b/modules/gui/wxwindows/open.cpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * open.cpp : wxWindows plugin for vlc
  *****************************************************************************
- * Copyright (C) 2000-2004 VideoLAN
+ * Copyright (C) 2000-2005 VideoLAN
  * $Id$
  *
  * Authors: Gildas Bazin <gbazin@videolan.org>
@@ -37,6 +37,8 @@
 
 #include <vlc/intf.h>
 
+#include <vector>
+
 #include "wxwindows.h"
 #include "preferences_widgets.h"
 
@@ -370,6 +372,7 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, wxWindow *_p_parent,
     SetIcon( *p_intf->p_sys->p_icon );
     file_dialog = NULL;
     i_disc_type_selection = 0;
+    i_disc_title = 0;
     i_open_arg = i_arg;
 
     sout_dialog = NULL;
@@ -389,8 +392,7 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, wxWindow *_p_parent,
     wxStaticText *mrl_label = new wxStaticText( panel, -1,
                                                 wxU(_("Open:")) );
     mrl_combo = new wxComboBox( panel, MRL_Event, wxT(""),
-                                wxPoint(20,25), wxSize(120, -1),
-                                0, NULL );
+                                wxPoint(20,25), wxSize(120, -1) );
     mrl_combo->SetToolTip( wxU(_("You can use this field directly by typing "
         "the full MRL you want to open.\n""Alternatively, the field will be "
         "filled automatically when you use the controls below.")) );
@@ -444,7 +446,11 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, wxWindow *_p_parent,
     common_opt_sizer->Add( caching_checkbox, 0,
                            wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
     caching_value = new wxSpinCtrl( panel, CachingChange_Event );
+#ifdef WIN32  /* WIN32 uses 16 bit integer */
+    caching_value->SetRange( 0, 32767 );
+#else
     caching_value->SetRange( 0, 1000000 );
+#endif
     caching_value->Disable();
     common_opt_sizer->Add( caching_value, 0,
                            wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
@@ -475,7 +481,8 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, wxWindow *_p_parent,
         AutoBuiltPanel *autopanel =
             new AutoBuiltPanel( notebook, this, p_intf, p_module );
         input_tab_array.Add( autopanel );
-        notebook->AddPage( autopanel, wxU( p_module->psz_shortname ),
+        notebook->AddPage( autopanel, wxU( p_module->psz_shortname ?
+                        p_module->psz_shortname : p_module->psz_object_name ),
                            i_access_method == CAPTURE_ACCESS );
     }
 
@@ -485,7 +492,8 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, wxWindow *_p_parent,
         AutoBuiltPanel *autopanel =
             new AutoBuiltPanel( notebook, this, p_intf, p_module );
         input_tab_array.Add( autopanel );
-        notebook->AddPage( autopanel, wxU( p_module->psz_shortname ),
+        notebook->AddPage( autopanel, wxU( p_module->psz_shortname ?
+                        p_module->psz_shortname : p_module->psz_object_name ),
                            i_access_method == CAPTURE_ACCESS );
     }
 
@@ -495,7 +503,8 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, wxWindow *_p_parent,
         AutoBuiltPanel *autopanel =
             new AutoBuiltPanel( notebook, this, p_intf, p_module );
         input_tab_array.Add( autopanel );
-        notebook->AddPage( autopanel, wxU( p_module->psz_shortname ),
+        notebook->AddPage( autopanel, wxU( p_module->psz_shortname ?
+                        p_module->psz_shortname : p_module->psz_object_name ),
                            i_access_method == CAPTURE_ACCESS );
     }
 
@@ -505,7 +514,8 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, wxWindow *_p_parent,
         AutoBuiltPanel *autopanel =
             new AutoBuiltPanel( notebook, this, p_intf, p_module );
         input_tab_array.Add( autopanel );
-        notebook->AddPage( autopanel, wxU( p_module->psz_shortname ),
+        notebook->AddPage( autopanel, wxU( p_module->psz_shortname ?
+                        p_module->psz_shortname : p_module->psz_object_name ),
                            i_access_method == CAPTURE_ACCESS );
     }
 
@@ -581,7 +591,7 @@ wxPanel *OpenDialog::FilePanel( wxWindow* parent )
     wxBoxSizer *file_sizer = new wxBoxSizer( wxHORIZONTAL );
 
     file_combo = new wxComboBox( panel, FileName_Event, wxT(""),
-                                 wxPoint(20,25), wxSize(200, -1), 0, NULL );
+                                 wxPoint(20,25), wxSize(200, -1) );
     wxButton *browse_button = new wxButton( panel, FileBrowse_Event,
                                             wxU(_("Browse...")) );
     file_sizer->Add( file_combo, 1, wxALL, 5 );
@@ -663,7 +673,7 @@ wxPanel *OpenDialog::DiscPanel( wxWindow* parent )
     sizer->Add( disc_sub_label, 0, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL );
     sizer->Add( disc_sub, 1, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL );
     disc_sub->SetRange( -1, 255 );
-    i_disc_sub = config_GetInt( p_intf, "spu-channel" );
+    i_disc_sub = config_GetInt( p_intf, "sub-track" );
     disc_sub->SetValue( i_disc_sub );
 
     sizer_row->Add( sizer, 0, wxEXPAND | wxALL, 5 );
@@ -685,7 +695,7 @@ wxPanel *OpenDialog::NetPanel( wxWindow* parent )
     {
         wxU(_("UDP/RTP")),
         wxU(_("UDP/RTP Multicast")),
-        wxU(_("HTTP/FTP/MMS")),
+        wxU(_("HTTP/HTTPS/FTP/MMS")),
         wxU(_("RTSP"))
     };
 
@@ -710,7 +720,7 @@ wxPanel *OpenDialog::NetPanel( wxWindow* parent )
                                    wxString::Format(wxT("%d"), i_net_ports[0]),
                                    wxDefaultPosition, wxDefaultSize,
                                    wxSP_ARROW_KEYS,
-                                   0, 16000, i_net_ports[0] );
+                                   0, 65535, i_net_ports[0] );
 
     subpanel_sizer->Add( label, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
     subpanel_sizer->Add( net_ports[0], 1,
@@ -738,7 +748,7 @@ wxPanel *OpenDialog::NetPanel( wxWindow* parent )
                                    wxString::Format(wxT("%d"), i_net_ports[1]),
                                    wxDefaultPosition, wxDefaultSize,
                                    wxSP_ARROW_KEYS,
-                                   0, 16000, i_net_ports[1] );
+                                   0, 65535, i_net_ports[1] );
 
     subpanel_sizer->Add( label, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
     subpanel_sizer->Add( net_ports[1], 1,
@@ -820,7 +830,7 @@ void OpenDialog::UpdateMRL( int i_access_method )
             }
 
             if( i_disc_sub >= 0 )
-                mrltemp += wxString::Format( wxT("  :spu-channel=%d"),
+                mrltemp += wxString::Format( wxT("  :sub-track=%d"),
                                              i_disc_sub );
             break;
 
@@ -838,14 +848,20 @@ void OpenDialog::UpdateMRL( int i_access_method )
 #endif
 
             if( i_disc_sub >= 0 )
-                mrltemp += wxString::Format( wxT("  :spu-channel=%d"),
+                mrltemp += wxString::Format( wxT("  :sub-track=%d"),
                                              i_disc_sub );
 
             caching_name = wxT("vcd-caching");
             break;
 
         case 3: /* CD-DA */
-            mrltemp = wxT("cdda://") + disc_device->GetValue();
+            mrltemp = 
+#ifdef HAVE_CDDAX
+              wxT("cddax://") 
+#else
+              wxT("cdda://") 
+#endif
+              + disc_device->GetValue();
             if( i_disc_title > 0 )
                 mrltemp += wxString::Format( wxT("@%d"), i_disc_title );
 
@@ -863,15 +879,15 @@ void OpenDialog::UpdateMRL( int i_access_method )
         switch( i_net_type )
         {
         case 0:
-            mrltemp = wxT("udp://");
+            mrltemp = wxT("udp://@");
             if ( net_ipv6->GetValue() )
             {
-                mrltemp += wxT("@[::]");
+                mrltemp += wxT("[::]");
             }
             if( i_net_ports[0] !=
                 config_GetInt( p_intf, "server-port" ) )
             {
-                mrltemp += wxString::Format( wxT("@:%d"), i_net_ports[0] );
+                mrltemp += wxString::Format( wxT(":%d"), i_net_ports[0] );
             }
 
             caching_name = wxT("udp-caching");
@@ -1050,8 +1066,7 @@ void OpenDialog::OnOk( wxCommandEvent& WXUNUSED(event) )
 
         if( b_start )
         {
-            int i_pos = playlist_GetPositionById( p_playlist , i_id );
-            playlist_Command( p_playlist, PLAYLIST_GOTO, i_pos );
+            playlist_Control( p_playlist, PLAYLIST_ITEMPLAY , p_item );
         }
     }