Don't abort windows position remembering if small playlist size is invalid at the...

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

diff --git a/modules/gui/wxwidgets/extrapanel.cpp b/modules/gui/wxwidgets/extrapanel.cpp
index e459d8f08bfc2a94bdf0b453e74f2a5dacb0d28b..baf4ae250eb1feada1d5542b4cd24d7939d2c5c5 100644 (file)
--- a/modules/gui/wxwidgets/extrapanel.cpp
+++ b/modules/gui/wxwidgets/extrapanel.cpp
@@ -4,7 +4,7 @@
  * Copyright (C) 2000-2004, 2003 the VideoLAN team
  * $Id$
  *
- * Authors: Clément Stenac <zorglub@videolan.org>
+ * Authors: Clément Stenac <zorglub@videolan.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -32,7 +32,7 @@
 
 #include <math.h>
 
-#include "wxwidgets.h"
+#include "extrapanel.hpp"
 
 /*****************************************************************************
  * Local class declarations.
@@ -150,9 +150,9 @@ static const struct filter vfilters[] =
     { "clone", N_("Image clone"), N_("Creates several clones of the image") },
     { "distort", N_("Distortion"), N_("Adds distorsion effects") },
     { "invert", N_("Image inversion") , N_("Inverts the image colors") },
-    { "crop", N_("Image cropping"), N_("Crops the image") },
     { "motionblur", N_("Blurring"), N_("Creates a motion blurring on the image") },
     { "transform",  N_("Transformation"), N_("Rotates or flips the image") },
+    { "magnify",  N_("Magnify"), N_("Magnifies part of the image") },
     { NULL, NULL, NULL } /* Do not remove this line */
 };
 
@@ -171,7 +171,7 @@ ExtraPanel::ExtraPanel( intf_thread_t *_p_intf, wxWindow *_p_parent ):
 
     notebook = new wxNotebook( this, Notebook_Event );
 
-#if (!wxCHECK_VERSION(2,5,0))
+#if (!wxCHECK_VERSION(2,5,2))
     wxNotebookSizer *notebook_sizer = new wxNotebookSizer( notebook );
 #endif
 
@@ -179,7 +179,7 @@ ExtraPanel::ExtraPanel( intf_thread_t *_p_intf, wxWindow *_p_parent ):
     notebook->AddPage( EqzPanel( notebook ), wxU(_("Equalizer")) );
     notebook->AddPage( AudioPanel( notebook ), wxU(_("Audio")) );
 
-#if (!wxCHECK_VERSION(2,5,0))
+#if (!wxCHECK_VERSION(2,5,2))
     extra_sizer->Add( notebook_sizer, 1, wxEXPAND, 0 );
 #else
     extra_sizer->Add( notebook, 1, wxEXPAND, 0 );
@@ -299,7 +299,7 @@ wxPanel *ExtraPanel::VideoPanel( wxWindow *parent )
 #endif
 
     wxStaticBox *filter_box =
-                  new wxStaticBox( panel, -1, wxU(_("Video Filters")) );
+                  new wxStaticBox( panel, -1, wxU(_("Video filters")) );
     wxStaticBoxSizer *filter_sizer =
                    new wxStaticBoxSizer( filter_box, wxHORIZONTAL );
 
@@ -310,7 +310,7 @@ wxPanel *ExtraPanel::VideoPanel( wxWindow *parent )
     {
         wxCheckBox *box = new wxCheckBox( panel, Filter0_Event + i,
                                           wxU( _( vfilters[i].psz_name ) ) );
-        t_col_sizer->Add( box, 0, wxALL, 4 );
+        t_col_sizer->Add( box, 0, wxALL, 2 );
         box->SetToolTip( wxU( _( vfilters[i].psz_help ) ) );
     }
 
@@ -472,7 +472,7 @@ wxPanel *ExtraPanel::EqzPanel( wxWindow *parent )
     eq_2p_chkbox =  new wxCheckBox( panel, Eq2Pass_Event,
                             wxU(_("2 Pass") ) );
 
-    eq_2p_chkbox->SetToolTip( wxU(_("If you enable this settting, the "
+    eq_2p_chkbox->SetToolTip( wxU(_("If you enable this setting, the "
      "equalizer filter will be applied twice. The effect will be sharper.") ) );
 
     top_sizer->Add( eq_2p_chkbox, 0, wxALL, 2 );
@@ -544,7 +544,7 @@ wxPanel *ExtraPanel::EqzPanel( wxWindow *parent )
 
     CheckAout();
 
-    aout_instance_t *p_aout= (aout_instance_t *)vlc_object_find(p_intf,
+    aout_instance_t *p_aout = (aout_instance_t *)vlc_object_find(p_intf,
                                  VLC_OBJECT_AOUT, FIND_ANYWHERE);
     char *psz_af = NULL;
     if( p_aout )
@@ -552,6 +552,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 );
     }
     else
     {
@@ -818,7 +819,7 @@ void ExtraPanel::OnHeadphone( wxCommandEvent &event )
 {
     aout_instance_t *p_aout= (aout_instance_t *)vlc_object_find(p_intf,
                                  VLC_OBJECT_AOUT, FIND_ANYWHERE);
-    ChangeFiltersString( p_intf , p_aout, "headphone",
+    ChangeFiltersString( p_intf , p_aout, "headphone_channel_mixer",
                          event.IsChecked() ? VLC_TRUE : VLC_FALSE );
     if( p_aout != NULL )
         vlc_object_release( p_aout );
@@ -1005,7 +1006,7 @@ void ExtraPanel::OnFiltersInfo(wxCommandEvent& event)
                   "You can then configure each filter.\n"
                   "If you want fine control over the filters ( to choose "
                   "the order in which they are applied ), you need to enter "
-                  "manually a filters string (Preferences / General / Video)."
+                  "manually a filters string (Preferences / Video / Filters)."
                   ) ),
                     wxU( _("More information" ) ), wxOK | wxICON_INFORMATION,
                     this->p_parent );
@@ -1213,13 +1214,11 @@ ExtraWindow::ExtraWindow( intf_thread_t *_p_intf, wxWindow *p_parent,
        wxFrame( p_parent, -1, wxU(_("Extended controls")), wxDefaultPosition,
                  wxDefaultSize, wxDEFAULT_FRAME_STYLE )
 {
-        fprintf(stderr,"Creating extrawindow\n");
     p_intf = _p_intf;
     SetIcon( *p_intf->p_sys->p_icon );
 
     wxBoxSizer *window_sizer = new wxBoxSizer( wxVERTICAL );
     SetSizer( window_sizer );
-//    panel = new ExtraPanel(  p_intf, this );//_extra_panel;
 
     panel = _extra_panel;
     window_sizer->Add( panel );