Removes trailing spaces. Removes tabs.

[vlc] / modules / gui / wxwidgets / extrapanel.cpp

diff --git a/modules/gui/wxwidgets/extrapanel.cpp b/modules/gui/wxwidgets/extrapanel.cpp
index 6580bb74b940e7de70acaafe78686c94c0ce2d96..8203e53bc32a3125992b82d2c28362dc3227d058 100644 (file)
--- a/modules/gui/wxwidgets/extrapanel.cpp
+++ b/modules/gui/wxwidgets/extrapanel.cpp
@@ -25,10 +25,9 @@
  * Preamble
  *****************************************************************************/
 #include <vlc/vlc.h>
-#include <vlc/aout.h>
-#include <aout_internal.h>
-#include <vlc/vout.h>
-#include <vlc/intf.h>
+#include <vlc_aout.h>
+#include <vlc_vout.h>
+#include <vlc_interface.h>
 
 #include <math.h>
 
@@ -151,6 +150,7 @@ static const struct filter vfilters[] =
     { "motionblur", N_("Blurring"), N_("Adds motion blurring to the image") },
     { "transform",  N_("Transformation"), N_("Rotates or flips the image") },
     { "magnify",  N_("Magnify"), N_("Magnifies part of the image") },
+    { "puzzle",  N_("Puzzle"), N_("Turns the image into a puzzle") },
     { NULL, NULL, NULL } /* Do not remove this line */
 };
 
@@ -482,13 +482,13 @@ wxPanel *ExtraPanel::EqzPanel( wxWindow *parent )
     top_sizer->Add( eq_restoredefaults_button, 0, wxALL, 2 );
     top_sizer->Add( 0, 0, 1, wxALL, 2 );
 
-    smooth_text = new wxStaticText( panel, -1, wxU( "Smooth :" ));
-    smooth_text->SetToolTip( wxU( SMOOTH_TIP ) );
+    smooth_text = new wxStaticText( panel, -1, wxU( _("Smooth :") ));
+    smooth_text->SetToolTip( wxU( _(SMOOTH_TIP) ) );
     top_sizer->Add( smooth_text, 0, wxALL, 2 );
 
     smooth_slider =new wxSlider( panel, Smooth_Event, 0, 0, 10 ,
                     wxDefaultPosition, wxSize( 100, -1 ) );
-    smooth_slider->SetToolTip( wxU( SMOOTH_TIP ) );
+    smooth_slider->SetToolTip( wxU( _(SMOOTH_TIP) ) );
     top_sizer->Add( smooth_slider, 0, wxALL, 2 );
     i_smooth = 0;
 
@@ -513,7 +513,7 @@ wxPanel *ExtraPanel::EqzPanel( wxWindow *parent )
         eq_gridsizer->Add( band_sliders[i], 1, wxEXPAND|wxALL, 2 );
     }
 
-    preamp_text = new wxStaticText( panel, -1, wxT( "Preamp\n12.0dB" ) );
+    preamp_text = new wxStaticText( panel, -1, wxU( _("Preamp\n12.0dB") ) );
     wxFont font= preamp_text->GetFont();
     font.SetPointSize(7);
     preamp_text->SetFont( font );
@@ -550,7 +550,7 @@ wxPanel *ExtraPanel::EqzPanel( wxWindow *parent )
         psz_af = var_GetString( p_aout, "audio-filter" );
         if( var_GetBool( p_aout, "equalizer-2pass" ) )
             eq_2p_chkbox->SetValue( true );
-       vlc_object_release( p_aout );
+    vlc_object_release( p_aout );
     }
     else
     {
@@ -980,7 +980,7 @@ void ExtraPanel::OnAdjustUpdate( wxScrollEvent &event)
 /* FIXME */
 void ExtraPanel::OnRatio( wxCommandEvent& event )
 {
-   config_PutPsz( p_intf, "aspect-ratio", ratio_combo->GetValue().mb_str() );
+   config_PutPsz( p_intf, "aspect-ratio", ratio_combo->GetValue().mb_str(wxConvUTF8) );
 }