* include/configuration.h: bug fix for add_string_from_list()

* modules/gui/wxwindows/*: added a subtitles encoding combobox in the subtitles dialog.

diff --git a/include/configuration.h b/include/configuration.h
index 0c7eeccf045266b01d136aff904d1f6aacfeddc8..090e57d3f2c4dc6d897c1651e574307b9218d970 100644 (file)
--- a/include/configuration.h
+++ b/include/configuration.h
@@ -4,7 +4,7 @@
  * It includes functions allowing to declare, get or set configuration options.
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: configuration.h,v 1.29 2003/08/03 23:11:21 gbazin Exp $
+ * $Id: configuration.h,v 1.30 2003/08/10 09:22:07 gbazin Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -144,7 +144,7 @@ VLC_EXPORT( void, config_UnsetCallbacks, ( module_config_t * ) );
     { static module_config_t tmp = { CONFIG_ITEM_STRING, NULL, name, '\0', text, longtext, psz_value }; tmp.b_advanced = advc; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; } i_config++
 #define add_string_from_list( name, psz_value, ppsz_list, p_callback, text, \
       longtext, advc ) \
-    { static module_config_t tmp = { CONFIG_ITEM_STRING, NULL, name, '\0', text, longtext, psz_value, 0, 0, 0, 0, 0, 0, NULL, ppsz_list }; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; p_config[i_config].b_advanced = advc; } i_config++
+    { static module_config_t tmp = { CONFIG_ITEM_STRING, NULL, name, '\0', text, longtext, psz_value, 0, 0, 0, 0, 0, 0, NULL, NULL, ppsz_list }; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; p_config[i_config].b_advanced = advc; } i_config++
 #define add_file( name, psz_value, p_callback, text, longtext, advc ) \
     { static module_config_t tmp = { CONFIG_ITEM_FILE, NULL, name, '\0', text, longtext, psz_value, 0, 0 }; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; p_config[i_config].b_advanced = advc; } i_config++
 #define add_directory( name, psz_value, p_callback, text, longtext, advc ) \

diff --git a/modules/gui/wxwindows/open.cpp b/modules/gui/wxwindows/open.cpp
index d97883f278c9bb2443851d68495208c4c3ad184b..a6961ae4620b257f41953998693f03dda557b55d 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.35 2003/07/26 14:19:04 gbazin Exp $
+ * $Id: open.cpp,v 1.36 2003/08/10 09:22:07 gbazin Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -839,6 +839,9 @@ void OpenDialog::OnSubsFileSettings( wxCommandEvent& WXUNUSED(event) )
         subsfile_mrl.Empty();
         subsfile_mrl.Add( wxString(wxT("sub-file=")) +
                           subsfile_dialog->file_combo->GetValue() );
+        if( subsfile_dialog->encoding_combo )
+            subsfile_mrl.Add( wxString(wxT("subsdec-encoding=")) +
+                              subsfile_dialog->encoding_combo->GetValue() );
         subsfile_mrl.Add( wxString::Format( wxT("sub-delay=%i"),
                           subsfile_dialog->delay_spinctrl->GetValue() ) );
         subsfile_mrl.Add( wxString::Format( wxT("sub-fps=%i"),

diff --git a/modules/gui/wxwindows/subtitles.cpp b/modules/gui/wxwindows/subtitles.cpp
index f12cc9630449afca9100c4ca263b3c304075dcc2..7a51cc42c0474224113ecbbeab68c98d2062f758 100644 (file)
--- a/modules/gui/wxwindows/subtitles.cpp
+++ b/modules/gui/wxwindows/subtitles.cpp
@@ -2,7 +2,7 @@
  * subtitles.cpp : wxWindows plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: subtitles.cpp,v 1.2 2003/05/20 23:17:59 gbazin Exp $
+ * $Id: subtitles.cpp,v 1.3 2003/08/10 09:22:07 gbazin Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -91,6 +91,8 @@ SubsFileDialog::SubsFileDialog( intf_thread_t *_p_intf, wxWindow* _p_parent ):
     /* Create a panel to put everything in */
     wxPanel *panel = new wxPanel( this, -1 );
     panel->SetAutoLayout( TRUE );
+    wxBoxSizer *main_sizer = new wxBoxSizer( wxVERTICAL );
+    wxBoxSizer *panel_sizer = new wxBoxSizer( wxVERTICAL );
 
     /* Create the subtitles file textctrl */
     wxBoxSizer *file_sizer_sizer = new wxBoxSizer( wxHORIZONTAL );
@@ -108,6 +110,44 @@ SubsFileDialog::SubsFileDialog( intf_thread_t *_p_intf, wxWindow* _p_parent ):
     file_sizer->Add( file_combo, 1, wxALL, 5 );
     file_sizer->Add( browse_button, 0, wxALL, 5 );
     file_sizer_sizer->Add( file_sizer, 1, wxEXPAND | wxALL, 5 );
+    panel_sizer->Add( file_sizer, 0, wxEXPAND | wxALL, 5 );
+
+    /* Subtitles encoding */
+    encoding_combo = NULL;
+    module_config_t *p_item =
+        config_FindConfig( VLC_OBJECT(p_intf), "subsdec-encoding" );
+    if( p_item )
+    {
+        wxBoxSizer *enc_sizer_sizer = new wxBoxSizer( wxHORIZONTAL );
+        wxStaticBox *enc_box = new wxStaticBox( panel, -1,
+                                                wxU(_("Subtitles encoding")) );
+        wxStaticBoxSizer *enc_sizer = new wxStaticBoxSizer( enc_box,
+                                                            wxHORIZONTAL );
+        wxStaticText *label =
+            new wxStaticText(panel, -1, wxU(_("Text encoding")));
+        encoding_combo = new wxComboBox( panel, -1, wxU(p_item->psz_value),
+                                         wxDefaultPosition, wxDefaultSize,
+                                         0, NULL, wxCB_READONLY | wxCB_SORT );
+
+        /* build a list of available options */
+        for( int i_index = 0; p_item->ppsz_list && p_item->ppsz_list[i_index];
+             i_index++ )
+        {
+            encoding_combo->Append( wxU(p_item->ppsz_list[i_index]) );
+            if( p_item->psz_value && !strcmp( p_item->psz_value,
+                                              p_item->ppsz_list[i_index] ) )
+                encoding_combo->SetSelection( i_index );
+        }
+
+        if( p_item->psz_value )
+        encoding_combo->SetValue( wxU(p_item->psz_value) );
+        encoding_combo->SetToolTip( wxU(p_item->psz_longtext) );
+
+        enc_sizer->Add( label, 0, wxALL, 5 );
+        enc_sizer->Add( encoding_combo, 0, wxALL, 5 );
+        enc_sizer_sizer->Add( enc_sizer, 1, wxEXPAND | wxALL, 5 );
+        panel_sizer->Add( enc_sizer, 0, wxEXPAND | wxALL, 5 );
+    }
 
     /* Misc Subtitles options */
     wxBoxSizer *misc_sizer_sizer = new wxBoxSizer( wxHORIZONTAL );
@@ -141,6 +181,7 @@ SubsFileDialog::SubsFileDialog( intf_thread_t *_p_intf, wxWindow* _p_parent ):
     misc_sizer->Add( fps_spinctrl, 0, wxALL, 5 );
 
     misc_sizer_sizer->Add( misc_sizer, 1, wxEXPAND | wxALL, 5 );
+    panel_sizer->Add( misc_sizer, 0, wxEXPAND | wxALL, 5 );
 
     /* Separation */
     wxStaticLine *static_line = new wxStaticLine( panel, wxID_OK );
@@ -156,10 +197,7 @@ SubsFileDialog::SubsFileDialog( intf_thread_t *_p_intf, wxWindow* _p_parent ):
     button_sizer->Add( ok_button, 0, wxALL, 5 );
     button_sizer->Add( cancel_button, 0, wxALL, 5 );
     button_sizer->Layout();
-    wxBoxSizer *main_sizer = new wxBoxSizer( wxVERTICAL );
-    wxBoxSizer *panel_sizer = new wxBoxSizer( wxVERTICAL );
-    panel_sizer->Add( file_sizer, 0, wxEXPAND | wxALL, 5 );
-    panel_sizer->Add( misc_sizer, 0, wxEXPAND | wxALL, 5 );
+
     panel_sizer->Add( static_line, 0, wxEXPAND | wxALL, 5 );
     panel_sizer->Add( button_sizer, 0, wxALIGN_LEFT | wxALIGN_BOTTOM |
                       wxALL, 5 );

diff --git a/modules/gui/wxwindows/wxwindows.h b/modules/gui/wxwindows/wxwindows.h
index c62e45bfb6d30b096d084433701f5c216d6ec756..7875907adfbcfbdcb0bd37a4f855733440457e7b 100644 (file)
--- a/modules/gui/wxwindows/wxwindows.h
+++ b/modules/gui/wxwindows/wxwindows.h
@@ -2,7 +2,7 @@
  * wxwindows.h: private wxWindows interface description
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: wxwindows.h,v 1.50 2003/07/26 12:41:52 gbazin Exp $
+ * $Id: wxwindows.h,v 1.51 2003/08/10 09:22:07 gbazin Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -430,6 +430,7 @@ public:
     virtual ~SubsFileDialog();
 
     wxComboBox *file_combo;
+    wxComboBox *encoding_combo;
     wxSpinCtrl *delay_spinctrl;
     wxSpinCtrl *fps_spinctrl;