Removed the old streaming wizard\nSplitted the interface file into...

Removed the old streaming wizard\nSplitted the interface file into interface+extrapanel\nExtrapanel is now a notebook\nReworked the video extrapanel (removed ratio,added filters)\nImplemented a graphical equaliwer

modules/gui/wxwindows/Modules.am

@@ -2,10 +2,10 @@ SOURCES_wxwindows = \
 	wxwindows.cpp \
 	wxwindows.h \
 	interface.cpp \
+	extrapanel.cpp \
 	dialogs.cpp \
 	open.cpp \
 	streamout.cpp \
-	streamwizard.cpp \
 	wizard.cpp \
 	messages.cpp \
 	playlist.cpp \

modules/gui/wxwindows/dialogs.cpp

@@ -55,7 +55,6 @@ private:
     void OnMessages( wxCommandEvent& event );
     void OnFileInfo( wxCommandEvent& event );
     void OnPreferences( wxCommandEvent& event );
-    void OnStreamWizardDialog( wxCommandEvent& event );
     void OnWizardDialog( wxCommandEvent& event );
     void OnBookmarks( wxCommandEvent& event );
 
@@ -84,7 +83,6 @@ public:
     Playlist            *p_playlist_dialog;
     Messages            *p_messages_dialog;
     FileInfo            *p_fileinfo_dialog;
-    StreamDialog        *p_streamwizard_dialog;
     WizardDialog        *p_wizard_dialog;
     wxFrame             *p_prefs_dialog;
     wxWindow            *p_bookmarks_dialog;
@@ -114,8 +112,6 @@ BEGIN_EVENT_TABLE(DialogsProvider, wxFrame)
                 DialogsProvider::OnMessages)
     EVT_COMMAND(INTF_DIALOG_PREFS, wxEVT_DIALOG,
                 DialogsProvider::OnPreferences)
-    EVT_COMMAND(INTF_DIALOG_STREAMWIZARD, wxEVT_DIALOG,
-                DialogsProvider::OnStreamWizardDialog)
     EVT_COMMAND(INTF_DIALOG_WIZARD, wxEVT_DIALOG,
                 DialogsProvider::OnWizardDialog)
     EVT_COMMAND(INTF_DIALOG_FILEINFO, wxEVT_DIALOG,
@@ -148,7 +144,6 @@ DialogsProvider::DialogsProvider( intf_thread_t *_p_intf, wxWindow *p_parent )
     p_fileinfo_dialog = NULL;
     p_prefs_dialog = NULL;
     p_file_generic_dialog = NULL;
-    p_streamwizard_dialog = NULL;
     p_wizard_dialog = NULL;
     p_bookmarks_dialog = NULL;
 
@@ -177,7 +172,6 @@ DialogsProvider::~DialogsProvider()
     if( p_messages_dialog ) delete p_messages_dialog;
     if( p_fileinfo_dialog ) delete p_fileinfo_dialog;
     if( p_file_generic_dialog ) delete p_file_generic_dialog;
-    if( p_streamwizard_dialog ) delete p_streamwizard_dialog;
     if( p_wizard_dialog ) delete p_wizard_dialog;
     if( p_bookmarks_dialog ) delete p_bookmarks_dialog;
 
@@ -254,18 +248,6 @@ void DialogsProvider::OnPreferences( wxCommandEvent& WXUNUSED(event) )
     }
 }
 
-void DialogsProvider::OnStreamWizardDialog( wxCommandEvent& WXUNUSED(event) )
-{
-    /* Show/hide the stream window */
-    if( !p_streamwizard_dialog )
-        p_streamwizard_dialog = new StreamDialog( p_intf, this );
-
-    if( p_streamwizard_dialog )
-    {
-        p_streamwizard_dialog->Show( !p_streamwizard_dialog->IsShown() );
-    }
-}
-
 void DialogsProvider::OnWizardDialog( wxCommandEvent& WXUNUSED(event) )
 {
     p_wizard_dialog = new WizardDialog( p_intf, this, NULL, 0, 0 );

modules/gui/wxwindows/menus.cpp

@@ -897,7 +897,6 @@ void MenuEvtHandler::OnMenuEvent( wxCommandEvent& event )
 
         /* Get the key combination and send it to the hotkey handler */
         var_Set( p_intf->p_vlc, "key-pressed", val );
-	msg_Err( p_intf, "received key event: %i", event.GetId() );
         return;
     }
 

modules/gui/wxwindows/messages.cpp

@@ -2,7 +2,7 @@
  * messages.cpp : wxWindows plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000-2004 VideoLAN
- * $Id: messages.cpp,v 1.20 2004/01/25 03:29:01 hartman Exp $
+ * $Id$
  *
  * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
  *

modules/gui/wxwindows/streamwizard.cpp

-/*****************************************************************************
- * stream.cpp : wxWindows plugin for vlc
- *****************************************************************************
- * Copyright (C) 2000-2004 VideoLAN
- * $Id$
- *
- * Authors: Clment 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * 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.
- *****************************************************************************/
-
-/*****************************************************************************
- * Preamble
- *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
-#include <errno.h>                                                 /* ENOMEM */
-#include <string.h>                                            /* strerror() */
-#include <stdio.h>
-
-#include <vlc/vlc.h>
-#include <vlc/intf.h>
-
-#include "wxwindows.h"
-
-#include <wx/statline.h>
-
-#define STREAM_INTRO N_( "Stream with VLC in three steps." )
-#define STREAM_STEP1 N_( "Step 1: Select what to stream." )
-#define STREAM_STEP2 N_( "Step 2: Define streaming method." )
-#define STREAM_STEP3 N_( "Step 3: Start streaming." )
-
-/*****************************************************************************
- * Event Table.
- *****************************************************************************/
-
-/* IDs for the controls and the menu commands */
-enum
-{
-    Open_Event,
-    Sout_Event,
-    Start_Event,
-    Close_Event
-};
-
-BEGIN_EVENT_TABLE(StreamDialog, wxFrame)
-    /* Button events */
-    EVT_BUTTON(wxID_OK, StreamDialog::OnClose)
-
-    EVT_BUTTON(Open_Event,StreamDialog::OnOpen)
-    EVT_BUTTON(Sout_Event,StreamDialog::OnSout)
-    EVT_BUTTON(Start_Event,StreamDialog::OnStart)
-
-    /* Hide the window when the user closes the window */
-    EVT_CLOSE(StreamDialog::OnClose)
-
-END_EVENT_TABLE()
-
-/*****************************************************************************
- * Constructor.
- *****************************************************************************/
-StreamDialog::StreamDialog( intf_thread_t *_p_intf, wxWindow *p_parent ):
-    wxFrame( p_parent, -1, wxU(_("Stream")), wxDefaultPosition,
-             wxDefaultSize, wxDEFAULT_FRAME_STYLE )
-{
-    /* Initializations */
-    p_intf = _p_intf;
-    SetIcon( *p_intf->p_sys->p_icon );
-    SetAutoLayout( TRUE );
-
-    p_open_dialog = NULL;
-    p_sout_dialog = NULL;
-
-    /* Create a panel to put everything in */
-    wxPanel *panel = new wxPanel( this, -1 );
-    panel->SetAutoLayout( TRUE );
-
-    wxStaticText *intro_label = new wxStaticText( panel,
-                          -1 , wxU(_( STREAM_INTRO )));
-
-
-    wxStaticText *step1_label = new wxStaticText( panel,
-                           -1 , wxU(_( STREAM_STEP1 )));
-
-    step2_label = new wxStaticText( panel,
-                 -1 , wxU(_( STREAM_STEP2 )));
-
-    step3_label = new wxStaticText( panel,
-                 -1 , wxU(_( STREAM_STEP3 )));
-
-    wxButton *open_button = new wxButton( panel,
-                  Open_Event, wxU(_("Open...")));
-
-    sout_button = new wxButton( panel,
-                   Sout_Event, wxU(_("Choose...")));
-
-    start_button = new wxButton( panel,
-                   Start_Event, wxU(_("Start!")));
-
-    step2_label->Disable();
-    step3_label->Disable();
-
-    sout_button->Disable();
-    start_button->Disable();
-
-    /* Place everything in sizers */
-    wxBoxSizer *main_sizer = new wxBoxSizer( wxVERTICAL );
-    wxBoxSizer *panel_sizer = new wxBoxSizer( wxVERTICAL );
-
-    wxBoxSizer *step1_sizer = new wxBoxSizer( wxHORIZONTAL );
-    wxBoxSizer *step2_sizer = new wxBoxSizer( wxHORIZONTAL );
-    wxBoxSizer *step3_sizer = new wxBoxSizer( wxHORIZONTAL );
-
-    step1_sizer->Add( step1_label, 1, wxALL | wxEXPAND | wxALIGN_LEFT, 10 );
-    step1_sizer->Add( open_button, 1, wxALL | wxEXPAND | wxALIGN_RIGHT, 10 );
-
-    step2_sizer->Add( step2_label, 1, wxALL | wxEXPAND | wxALIGN_LEFT, 10 );
-    step2_sizer->Add( sout_button, 1, wxALL | wxEXPAND | wxALIGN_RIGHT, 10 );
-
-    step3_sizer->Add( step3_label,  1, wxALL | wxEXPAND | wxLEFT, 10 );
-    step3_sizer->Add( start_button, 1, wxALL | wxEXPAND | wxLEFT, 10 );
-
-    panel_sizer->Add( intro_label, 0, wxEXPAND | wxALL, 10 );
-
-    panel_sizer->Add( new wxStaticLine( panel, 0), 0,
-                      wxEXPAND | wxLEFT | wxRIGHT, 2 );
-    panel_sizer->Add( step1_sizer, 0, wxEXPAND, 10 );
-    panel_sizer->Add( new wxStaticLine( panel, 0), 0,
-                      wxEXPAND | wxLEFT | wxRIGHT, 2 );
-    panel_sizer->Add( step2_sizer, 0, wxEXPAND, 10 );
-    panel_sizer->Add( new wxStaticLine( panel, 0), 0,
-                      wxEXPAND | wxLEFT | wxRIGHT, 2 );
-    panel_sizer->Add( step3_sizer, 0, wxEXPAND, 10 );
-
-    panel_sizer->Layout();
-    panel->SetSizerAndFit( panel_sizer );
-    main_sizer->Add( panel, 1, wxEXPAND, 0 );
-    main_sizer->Layout();
-    SetSizerAndFit( main_sizer );
-
-}
-
-/*****************************************************************************
- * Destructor.
- *****************************************************************************/
-StreamDialog::~StreamDialog()
-{
-    if( p_open_dialog ) delete p_open_dialog;
-    if( p_sout_dialog ) delete p_sout_dialog;
-}
-
-void StreamDialog::OnOpen( wxCommandEvent& event )
-{
-    if( !p_open_dialog )
-    {
-        p_open_dialog =
-            new OpenDialog( p_intf, this, FILE_ACCESS, 1 , OPEN_STREAM );
-    }
-
-    if( p_open_dialog)
-    {
-       p_open_dialog->Show();
-       p_open_dialog->Enable();
-       mrl = p_open_dialog->mrl;
-       sout_button->Enable();
-       step2_label->Enable();
-    }
-}
-
-void StreamDialog::OnSout( wxCommandEvent& event )
-{
-    /* Show/hide the sout dialog */
-    if( p_sout_dialog == NULL )
-        p_sout_dialog = new SoutDialog( p_intf, this );
-
-    if( p_sout_dialog && p_sout_dialog->ShowModal() == wxID_OK )
-    {
-        sout_mrl = p_sout_dialog->GetOptions();
-        start_button->Enable();
-        step3_label->Enable();
-    }
-}
-
-void StreamDialog::OnStart( wxCommandEvent& event )
-{
-    /* Update the playlist */
-    playlist_t *p_playlist =
-        (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
-                                       FIND_ANYWHERE );
-    if( p_playlist == NULL ) return;
-
-    for( int i = 0; i < (int)p_open_dialog->mrl.GetCount(); i++ )
-    {
-        playlist_item_t *p_item = playlist_ItemNew( p_intf,
-                      (const char *)p_open_dialog->mrl[i].mb_str(),
-                      (const char *)p_open_dialog->mrl[i].mb_str() );
-        int i_options = 0;
-
-        /* Count the input options */
-        while( i + i_options + 1 < (int)p_open_dialog->mrl.GetCount() &&
-               ((const char *)p_open_dialog->mrl[i + i_options + 1].
-                                             mb_str())[0] == ':' )
-        {
-            i_options++;
-        }
-
-        /* Insert options */
-        for( int j = 0; j < i_options; j++ )
-        {
-            playlist_ItemAddOption( p_item ,
-                                p_open_dialog->mrl[i + j  + 1].mb_str() );
-        }
-
-        /* Get the options from the stream output dialog */
-        if( sout_mrl.GetCount() )
-        {
-            for( int j = 0; j < (int)sout_mrl.GetCount(); j++ )
-            {
-                playlist_ItemAddOption( p_item , sout_mrl[j].mb_str() );
-            }
-        }
-
-        playlist_AddItem( p_playlist, p_item,
-                          PLAYLIST_APPEND | (i ? 0 : PLAYLIST_GO),
-                          PLAYLIST_END );
-
-        msg_Dbg( p_intf,"playings %s",
-                 (const char *)p_open_dialog->mrl[i].mb_str() );
-
-        i += i_options;
-    }
-    vlc_object_release( p_playlist );
-
-    Hide();
-}
-
-void StreamDialog::OnClose( wxCommandEvent& event )
-{
-    Hide();
-}

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.11 2004/02/14 12:36:16 gbazin Exp $
+ * $Id$
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *

modules/gui/wxwindows/wxwindows.h

@@ -137,6 +137,9 @@ struct intf_sys_t
     /* Embedded vout */
     VideoWindow         *p_video_window;
     wxBoxSizer          *p_video_sizer;
+
+    /* Aout */
+    aout_instance_t     *p_aout;
 };
 
 /*****************************************************************************
@@ -183,6 +186,104 @@ private:
     vlc_bool_t b_old_seekable;
 };
 
+
+/* Extended panel */
+class ExtraPanel: public wxPanel
+{
+public:
+    /* Constructor */
+    ExtraPanel( intf_thread_t *p_intf, wxWindow *p_parent );
+    virtual ~ExtraPanel();
+
+    wxStaticBox *adjust_box;
+    wxButton *restoredefaults_button;
+    wxSlider *brightness_slider;
+    wxSlider *contrast_slider;
+    wxSlider *saturation_slider;
+    wxSlider *hue_slider;
+    wxSlider *gamma_slider;
+
+    wxStaticBox *other_box;
+    wxComboBox *ratio_combo;
+
+    char *psz_bands;
+    float f_preamp;
+    vlc_bool_t b_update;
+
+private:
+
+    wxPanel *VideoPanel( wxWindow * );
+    wxPanel *EqzPanel( wxWindow * );
+    wxPanel *AudioPanel( wxWindow * );
+
+    wxNotebook *notebook;
+
+    wxCheckBox *eq_chkbox;
+
+    wxCheckBox *eq_2p_chkbox;
+
+    wxSlider *smooth_slider;
+
+    wxSlider *preamp_slider;
+    wxStaticText * preamp_text;
+
+    int i_smooth;
+    wxWindow *p_parent;
+
+    wxSlider *band_sliders[10];
+    wxStaticText *band_texts[10];
+
+    int i_values[10];
+
+    void CheckAout();
+
+    /* Event handlers (these functions should _not_ be virtual) */
+
+    void OnEnableAdjust( wxCommandEvent& );
+    void OnEnableEqualizer( wxCommandEvent& );
+    void OnRestoreDefaults( wxCommandEvent& );
+    void OnChangeEqualizer( wxScrollEvent& );
+    void OnAdjustUpdate( wxScrollEvent& );
+    void OnRatio( wxCommandEvent& );
+    void OnFiltersInfo( wxCommandEvent& );
+    void OnSelectFilter( wxCommandEvent& );
+
+    void OnEqSmooth( wxScrollEvent& );
+    void OnPreamp( wxScrollEvent& );
+    void OnEq2Pass( wxCommandEvent& );
+    void OnEqRestore( wxCommandEvent& );
+
+    void OnHeadphone( wxCommandEvent& );
+    void OnNormvol( wxCommandEvent& );
+    void OnNormvolSlider( wxScrollEvent& );
+
+    void OnIdle( wxIdleEvent& );
+
+    DECLARE_EVENT_TABLE();
+
+    intf_thread_t *p_intf;
+    vlc_bool_t b_my_update;
+};
+
+#if 0
+/* Extended Window  */
+class ExtraWindow: public wxFrame
+{
+public:
+    /* Constructor */
+    ExtraWindow( intf_thread_t *p_intf, wxWindow *p_parent, wxPanel *panel );
+    virtual ~ExtraWindow();
+
+private:
+
+    wxPanel *panel;
+
+    DECLARE_EVENT_TABLE();
+
+    intf_thread_t *p_intf;
+};
+#endif
+
 /* Main Interface */
 class Interface: public wxFrame
 {
@@ -198,20 +299,13 @@ public:
 
     wxSlider    *slider;
     wxWindow    *slider_frame;
-    wxWindow    *extra_frame;
+    wxPanel     *extra_frame;
 
-    vlc_bool_t b_extra;
+    wxFrame    *extra_window;
 
-    wxStaticBox *adjust_box;
-    wxButton *restoredefaults_button;
-    wxSlider *brightness_slider;
-    wxSlider *contrast_slider;
-    wxSlider *saturation_slider;
-    wxSlider *hue_slider;
-    wxSlider *gamma_slider;
+    vlc_bool_t b_extra;
+    vlc_bool_t b_undock;
 
-    wxStaticBox *other_box;
-    wxComboBox *ratio_combo;
 
     wxGauge     *volctrl;
 
@@ -232,7 +326,10 @@ private:
     void OnOpenDisc( wxCommandEvent& event );
     void OnOpenNet( wxCommandEvent& event );
     void OnOpenSat( wxCommandEvent& event );
+
     void OnExtended( wxCommandEvent& event );
+    //void OnUndock( wxCommandEvent& event );
+
     void OnBookmarks( wxCommandEvent& event );
     void OnShowDialog( wxCommandEvent& event );
     void OnPlayStream( wxCommandEvent& event );
@@ -243,13 +340,6 @@ private:
     void OnSlowStream( wxCommandEvent& event );
     void OnFastStream( wxCommandEvent& event );
 
-    void OnEnableAdjust( wxCommandEvent& event );
-    void OnRestoreDefaults( wxCommandEvent& event);
-    void OnAdjustUpdate( wxScrollEvent& event );
-
-    void OnRatio( wxCommandEvent& event );
-    void OnEnableVisual( wxCommandEvent& event );
-
     void OnMenuOpen( wxMenuEvent& event );
 
 #if defined( __WXMSW__ ) || defined( __WXMAC__ )