From: Gildas Bazin Date: Sun, 6 Apr 2003 16:30:43 +0000 (+0000) Subject: * modules/gui/wxwindows/messages.cpp: added a verbose checkbox which enables the... X-Git-Tag: 0.5.3~29 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=2719605819874a9bbcd57169a644498a3ceda10e;p=vlc * modules/gui/wxwindows/messages.cpp: added a verbose checkbox which enables the warning and debug messages (disabled by default). * NEWS: updated the NEWS file. --- diff --git a/NEWS b/NEWS index 9c7d72a62c..d1ba320c5a 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -$Id: NEWS,v 1.34 2003/04/06 15:43:02 massiot Exp $ +$Id: NEWS,v 1.35 2003/04/06 16:30:43 gbazin Exp $ Changes between 0.5.2 and 0.5.3: --------------------------------- @@ -7,6 +7,9 @@ Core Support: * fixed DTS S/PDIF output on little-endian machines * support for skins at the interface level * new OSD module using Freetype2 + * video outputs are now destroyed when the associated input ends + * the video output takes into account the caching delay introduced at the + input level before dropping out of date frames. Input access: * fixed HTTP redirects @@ -26,6 +29,12 @@ Codecs: * support for SAMI subtitles (untested and incomplete) * better SSA4 subtitles recognition * new codec for raw I420 video + * improvements to the libmpeg2 based MPEG video decoder + +Interfaces: + * improvements to wxWindows based interface + (although it still misses some important features) + * skeleton for a Gnome2/GTK2 plug-in Stream output: * new HTTP output support @@ -37,7 +46,6 @@ Miscellaneous: UNIX ports: * the SDL vout plug-in will now work on big-endian machines - * skeleton for a GTK2 plug-in Mac OS X port: * reorderable playlist @@ -53,6 +61,7 @@ Mac OS X port: Win32 port: * new skinnable interface + * the directx video output doesn't crash anymore on ctrl+alt+del events. iPAQ familiar Linux port: * support for FLAC audio format diff --git a/modules/gui/wxwindows/messages.cpp b/modules/gui/wxwindows/messages.cpp index bb1701f95b..68a6df0064 100644 --- a/modules/gui/wxwindows/messages.cpp +++ b/modules/gui/wxwindows/messages.cpp @@ -2,7 +2,7 @@ * playlist.cpp : wxWindows plugin for vlc ***************************************************************************** * Copyright (C) 2000-2001 VideoLAN - * $Id: messages.cpp,v 1.2 2003/04/01 16:11:43 gbazin Exp $ + * $Id: messages.cpp,v 1.3 2003/04/06 16:30:43 gbazin Exp $ * * Authors: Olivier Teulière * @@ -54,12 +54,14 @@ /* IDs for the controls and the menu commands */ enum { - Close_Event + Close_Event, + Verbose_Event }; BEGIN_EVENT_TABLE(Messages, wxFrame) /* Button events */ EVT_BUTTON(wxID_OK, Messages::OnClose) + EVT_CHECKBOX(Verbose_Event, Messages::OnVerbose) /* Special events : we don't want to destroy the window when the user * clicks on (X) */ @@ -76,6 +78,7 @@ Messages::Messages( intf_thread_t *_p_intf, Interface *_p_main_interface ): /* Initializations */ p_intf = _p_intf; p_main_interface = _p_main_interface; + b_verbose = VLC_FALSE; SetIcon( *p_intf->p_sys->p_icon ); /* Create a panel to put everything in */ @@ -92,17 +95,23 @@ Messages::Messages( intf_thread_t *_p_intf, Interface *_p_main_interface ): dbg_attr = new wxTextAttr( *wxBLACK ); /* Create the OK button */ - ok_button = new wxButton( messages_panel, wxID_OK, _("OK") ); + wxButton *ok_button = new wxButton( messages_panel, wxID_OK, _("OK") ); ok_button->SetDefault(); + /* Create the Verbose checkbox */ + wxCheckBox *verbose_checkbox = + new wxCheckBox( messages_panel, Verbose_Event, _("Verbose") ); + /* Place everything in sizers */ - wxBoxSizer *ok_button_sizer = new wxBoxSizer( wxHORIZONTAL ); - ok_button_sizer->Add( ok_button, 0, wxALL, 5 ); - ok_button_sizer->Layout(); + wxBoxSizer *buttons_sizer = new wxBoxSizer( wxHORIZONTAL ); + buttons_sizer->Add( ok_button, 0, wxEXPAND |wxALIGN_LEFT| wxALL, 5 ); + buttons_sizer->Add( new wxPanel( this, -1 ), 1, wxALL, 5 ); + buttons_sizer->Add( verbose_checkbox, 0, wxEXPAND |wxALIGN_RIGHT | wxALL, 5 ); + buttons_sizer->Layout(); wxBoxSizer *main_sizer = new wxBoxSizer( wxVERTICAL ); wxBoxSizer *panel_sizer = new wxBoxSizer( wxVERTICAL ); panel_sizer->Add( textctrl, 1, wxEXPAND | wxALL, 5 ); - panel_sizer->Add( ok_button_sizer, 0, wxALIGN_CENTRE ); + panel_sizer->Add( buttons_sizer, 0, wxEXPAND | wxALL, 5 ); panel_sizer->Layout(); messages_panel->SetSizerAndFit( panel_sizer ); main_sizer->Add( messages_panel, 1, wxGROW, 0 ); @@ -129,6 +138,12 @@ void Messages::UpdateLog() i_start != i_stop; i_start = (i_start+1) % VLC_MSG_QSIZE ) { + + if( !b_verbose && + VLC_MSG_ERR != p_sub->p_msg[i_start].i_type && + VLC_MSG_INFO != p_sub->p_msg[i_start].i_type ) + continue; + /* Append all messages to log window */ textctrl->SetDefaultStyle( *dbg_attr ); (*textctrl) << p_sub->p_msg[i_start].psz_module; @@ -171,3 +186,7 @@ void Messages::OnClose( wxCommandEvent& WXUNUSED(event) ) Hide(); } +void Messages::OnVerbose( wxCommandEvent& event ) +{ + b_verbose = event.IsChecked(); +} diff --git a/modules/gui/wxwindows/wxwindows.h b/modules/gui/wxwindows/wxwindows.h index e269f463c4..9c14cf8dab 100644 --- 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.15 2003/04/01 16:11:43 gbazin Exp $ + * $Id: wxwindows.h,v 1.16 2003/04/06 16:30:43 gbazin Exp $ * * Authors: Gildas Bazin * @@ -347,17 +347,19 @@ public: private: /* Event handlers (these functions should _not_ be virtual) */ void OnClose( wxCommandEvent& event ); + void OnVerbose( wxCommandEvent& event ); DECLARE_EVENT_TABLE(); intf_thread_t *p_intf; Interface *p_main_interface; - wxButton *ok_button; wxTextCtrl *textctrl; wxTextAttr *info_attr; wxTextAttr *err_attr; wxTextAttr *warn_attr; wxTextAttr *dbg_attr; + + vlc_bool_t b_verbose; }; /* Playlist */