- Fix playlist deadlock between Timer and Playlist stuff

[vlc] / modules / gui / wxwindows / messages.cpp

diff --git a/modules/gui/wxwindows/messages.cpp b/modules/gui/wxwindows/messages.cpp
index a513753218ccbbe2b8ac181793eebf996077a4d8..f4de7beafc6d04d257d5cda1ce2b31008aef2ad0 100644 (file)
--- a/modules/gui/wxwindows/messages.cpp
+++ b/modules/gui/wxwindows/messages.cpp
@@ -1,8 +1,8 @@
 /*****************************************************************************
- * playlist.cpp : wxWindows plugin for vlc
+ * messages.cpp : wxWindows plugin for vlc
  *****************************************************************************
- * Copyright (C) 2000-2001 VideoLAN
- * $Id: messages.cpp,v 1.11 2003/07/11 23:14:03 gbazin Exp $
+ * Copyright (C) 2000-2004 VideoLAN
+ * $Id$
  *
  * Authors: Olivier Teulière <ipkiss@via.ecp.fr>
  *
@@ -30,25 +30,8 @@
 #include <stdio.h>
 
 #include <vlc/vlc.h>
-
-#ifdef WIN32                                                 /* mingw32 hack */
-#undef Yield
-#undef CreateDialog
-#endif
-
-/* Let vlc take care of the i18n stuff */
-#define WXINTL_NO_GETTEXT_MACRO
-
-#include <wx/wxprec.h>
-#include <wx/wx.h>
-#include <wx/textctrl.h>
-
 #include <vlc/intf.h>
 
-#if defined MODULE_NAME_IS_skins
-#   include "../skins/src/skin_common.h"
-#endif
-
 #include "wxwindows.h"
 
 /*****************************************************************************
@@ -59,7 +42,6 @@
 enum
 {
     Close_Event,
-    Verbose_Event,
     Clear_Event,
     Save_Log_Event
 };
@@ -67,7 +49,6 @@ enum
 BEGIN_EVENT_TABLE(Messages, wxFrame)
     /* Button events */
     EVT_BUTTON(wxID_OK, Messages::OnClose)
-    EVT_CHECKBOX(Verbose_Event, Messages::OnVerbose)
     EVT_BUTTON(wxID_CLEAR, Messages::OnClear)
     EVT_BUTTON(wxID_SAVEAS, Messages::OnSaveLog)
 
@@ -85,8 +66,10 @@ Messages::Messages( intf_thread_t *_p_intf, wxWindow *p_parent ):
 {
     /* Initializations */
     p_intf = _p_intf;
+    b_verbose = VLC_FALSE;
     SetIcon( *p_intf->p_sys->p_icon );
     save_log_dialog = NULL;
+    b_verbose = VLC_FALSE;
 
     /* Create a panel to put everything in */
     wxPanel *messages_panel = new wxPanel( this, -1 );
@@ -102,30 +85,26 @@ Messages::Messages( intf_thread_t *_p_intf, wxWindow *p_parent ):
     dbg_attr = new wxTextAttr( *wxBLACK );
 
     /* Create the OK button */
-    wxButton *ok_button = new wxButton( messages_panel, wxID_OK, wxU(_("OK")));
+    wxButton *ok_button = new wxButton( messages_panel, wxID_OK,
+                                        wxU(_("Close")));
     ok_button->SetDefault();
 
     /* Create the Clear button */
-    wxButton *clear_button = new wxButton( messages_panel, wxID_CLEAR, wxU(_("Clear")));
+    wxButton *clear_button = new wxButton( messages_panel, wxID_CLEAR,
+                                           wxU(_("Clear")));
     clear_button->SetDefault();
 
     /* Create the Save Log button */
-     wxButton *save_log_button = new wxButton( messages_panel, wxID_SAVEAS, wxU(_("Save As...")));
-     save_log_button->SetDefault();
-
-    /* Create the Verbose checkbox */
-    wxCheckBox *verbose_checkbox =
-        new wxCheckBox( messages_panel, Verbose_Event, wxU(_("Verbose")) );
-    b_verbose = p_intf->p_libvlc->i_verbose > 0;
-    verbose_checkbox->SetValue( b_verbose );
+    wxButton *save_log_button = new wxButton( messages_panel, wxID_SAVEAS,
+                                              wxU(_("Save As...")));
+    save_log_button->SetDefault();
 
     /* Place everything in sizers */
     wxBoxSizer *buttons_sizer = new wxBoxSizer( wxHORIZONTAL );
     buttons_sizer->Add( ok_button, 0, wxEXPAND |wxALIGN_LEFT| wxALL, 5 );
     buttons_sizer->Add( clear_button, 0, wxEXPAND |wxALIGN_LEFT| wxALL, 5 );
-    buttons_sizer->Add( save_log_button, 0, wxEXPAND |wxALIGN_LEFT| wxALL, 5 );    
+    buttons_sizer->Add( save_log_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 );
@@ -140,8 +119,19 @@ Messages::Messages( intf_thread_t *_p_intf, wxWindow *p_parent ):
 
 Messages::~Messages()
 {
-/* Clean up */
+    /* Clean up */
     if( save_log_dialog ) delete save_log_dialog;
+
+    delete info_attr;
+    delete err_attr;
+    delete warn_attr;
+    delete dbg_attr;
+}
+
+bool Messages::Show( bool show )
+{
+    b_verbose = show;
+    return wxFrame::Show( show );
 }
 
 void Messages::UpdateLog()
@@ -153,6 +143,8 @@ void Messages::UpdateLog()
     int i_stop = *p_sub->pi_stop;
     vlc_mutex_unlock( p_sub->p_lock );
 
+    textctrl->SetInsertionPointEnd();
+
     if( p_sub->i_start != i_stop )
     {
         for( i_start = p_sub->i_start;
@@ -161,13 +153,12 @@ void Messages::UpdateLog()
         {
 
             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 )
+                VLC_MSG_ERR != p_sub->p_msg[i_start].i_type )
                 continue;
 
             /* Append all messages to log window */
             textctrl->SetDefaultStyle( *dbg_attr );
-            (*textctrl) << wxU(p_sub->p_msg[i_start].psz_module);
+            (*textctrl) << wxL2U(p_sub->p_msg[i_start].psz_module);
 
             switch( p_sub->p_msg[i_start].i_type )
             {
@@ -190,7 +181,7 @@ void Messages::UpdateLog()
             }
 
             /* Add message */
-            (*textctrl) << wxU(p_sub->p_msg[i_start].psz_msg) << wxT("\n");
+            (*textctrl) << wxL2U(p_sub->p_msg[i_start].psz_msg) << wxT("\n");
         }
 
         vlc_mutex_lock( p_sub->p_lock );
@@ -215,19 +206,15 @@ void Messages::OnClear( wxCommandEvent& WXUNUSED(event) )
 void Messages::OnSaveLog( wxCommandEvent& WXUNUSED(event) )
 {
     if( save_log_dialog == NULL )
-        save_log_dialog = new wxFileDialog( this, wxU(_("Save Messages As a file...")),
+        save_log_dialog = new wxFileDialog( this,
+            wxU(_("Save Messages As...")),
             wxT(""), wxT("messages"), wxT("*"), wxSAVE | wxOVERWRITE_PROMPT );
-    
+
     if( save_log_dialog && save_log_dialog->ShowModal() == wxID_OK )
     {
-       if( !textctrl->SaveFile( save_log_dialog->GetPath() ) )
-           {
-               // [FIX ME] should print an error message
-           }
+        if( !textctrl->SaveFile( save_log_dialog->GetPath() ) )
+        {
+            // [FIX ME] should print an error message
+        }
     }
 }
-
-void Messages::OnVerbose( wxCommandEvent& event )
-{
-    b_verbose = event.IsChecked();
-}