X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fwxwidgets%2Fdialogs.cpp;h=12e964753a6db40bbbb48dbc602aacdc67ecb15e;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=655aa061cdfb3b83754252ce624952a34e33780d;hpb=cf8b7e4df17f0e7931f40dccf9a38ddc7677207c;p=vlc

diff --git a/modules/gui/wxwidgets/dialogs.cpp b/modules/gui/wxwidgets/dialogs.cpp
index 655aa061cd..12e964753a 100644
--- a/modules/gui/wxwidgets/dialogs.cpp
+++ b/modules/gui/wxwidgets/dialogs.cpp
@@ -24,18 +24,15 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
 #include <errno.h>                                                 /* ENOMEM */
-#include <string.h>                                            /* strerror() */
-#include <stdio.h>
 
 #include <vlc/vlc.h>
-#include <vlc/aout.h>
-#include <vlc/intf.h>
+#include <vlc_aout.h>
+#include <vlc_interface.h>
 
-#include "charset.h"
+#include "vlc_charset.h"
 
-#include "dialogs/vlm/vlm_panel.hpp"
+//#include "dialogs/vlm/vlm_panel.hpp"
 #include "dialogs/bookmarks.hpp"
 #include "dialogs/wizard.hpp"
 #include "dialogs/playlist.hpp"
@@ -67,7 +64,7 @@ private:
 
     /* Event handlers (these functions should _not_ be virtual) */
     void OnUpdateVLC( wxCommandEvent& event );
-    void OnVLM( wxCommandEvent& event );
+    //void OnVLM( wxCommandEvent& event );
     void OnInteraction( wxCommandEvent& event );
     void OnExit( wxCommandEvent& event );
     void OnPlaylist( wxCommandEvent& event );
@@ -112,7 +109,7 @@ public:
     wxFrame             *p_bookmarks_dialog;
     wxFileDialog        *p_file_generic_dialog;
     UpdateVLC           *p_updatevlc_dialog;
-    VLMFrame            *p_vlm_dialog;
+    //VLMFrame            *p_vlm_dialog;
 };
 }
 
@@ -161,8 +158,10 @@ BEGIN_EVENT_TABLE(DialogsProvider, wxFrame)
                 DialogsProvider::OnExitThread)
     EVT_COMMAND(INTF_DIALOG_UPDATEVLC, wxEVT_DIALOG,
                 DialogsProvider::OnUpdateVLC)
+#if 0
     EVT_COMMAND(INTF_DIALOG_VLM, wxEVT_DIALOG,
                 DialogsProvider::OnVLM)
+#endif
     EVT_COMMAND( INTF_DIALOG_INTERACTION, wxEVT_DIALOG,
                 DialogsProvider::OnInteraction )
 END_EVENT_TABLE()
@@ -191,10 +190,10 @@ DialogsProvider::DialogsProvider( intf_thread_t *_p_intf, wxWindow *p_parent )
     p_bookmarks_dialog = NULL;
     p_dir_dialog = NULL;
     p_updatevlc_dialog = NULL;
-    p_vlm_dialog = NULL;
+    //p_vlm_dialog = NULL;
 
     /* Give our interface a nice little icon */
-    p_intf->p_sys->p_icon = new wxIcon( vlc_xpm );
+    p_intf->p_sys->p_icon = new wxIcon( (const char**) vlc_xpm );
 
     /* Create the messages dialog so it can begin storing logs */
     p_messages_dialog = new Messages( p_intf, p_parent ? p_parent : this );
@@ -263,7 +262,7 @@ DialogsProvider::~DialogsProvider()
     if( p_wizard_dialog ) delete p_wizard_dialog;
     if( p_bookmarks_dialog ) delete p_bookmarks_dialog;
     if( p_updatevlc_dialog ) delete p_updatevlc_dialog;
-    if( p_vlm_dialog ) delete p_vlm_dialog;
+    //if( p_vlm_dialog ) delete p_vlm_dialog;
 
 
     if( p_intf->p_sys->p_icon ) delete p_intf->p_sys->p_icon;
@@ -380,8 +379,8 @@ void DialogsProvider::OnOpenFileGeneric( wxCommandEvent& event )
     {
         p_file_generic_dialog->SetMessage( wxU(p_arg->psz_title) );
         p_file_generic_dialog->SetWildcard( wxU(p_arg->psz_extensions) );
-        p_file_generic_dialog->SetStyle( (p_arg->b_save ? wxSAVE : wxOPEN) |
-                                         (p_arg->b_multiple ? wxMULTIPLE:0) );
+        p_file_generic_dialog->SetWindowStyle( (p_arg->b_save ? wxSAVE : wxOPEN) |
+                                               (p_arg->b_multiple ? wxMULTIPLE:0) );
     }
 
     if( p_file_generic_dialog &&
@@ -396,7 +395,7 @@ void DialogsProvider::OnOpenFileGeneric( wxCommandEvent& event )
                                               sizeof(char *) );
         for( size_t i = 0; i < paths.GetCount(); i++ )
         {
-            p_arg->psz_results[i] = strdup( paths[i].mb_str() );
+            p_arg->psz_results[i] = strdup( paths[i].mb_str(wxConvUTF8) );
         }
     }
 
@@ -434,10 +433,10 @@ void DialogsProvider::OnOpenFileSimple( wxCommandEvent& event )
         p_file_dialog = new wxFileDialog( NULL, wxU(_("Open File")),
             wxT(""), wxT(""), wxT("*"), wxOPEN | wxMULTIPLE );
 
-	p_file_dialog->SetWildcard(wxU(_("All Files (*.*)|*"
-        "|Sound Files (*.mp3, *.ogg, etc.)|" EXTENSIONS_AUDIO 
-        "|Video Files (*.avi, *.mpg, etc.)|" EXTENSIONS_VIDEO 
-        "|Playlist Files (*.m3u, *.pls, etc.)|" EXTENSIONS_PLAYLIST 
+    p_file_dialog->SetWildcard(wxU(_("All Files (*.*)|*"
+        "|Sound Files (*.mp3, *.ogg, etc.)|" EXTENSIONS_AUDIO
+        "|Video Files (*.avi, *.mpg, etc.)|" EXTENSIONS_VIDEO
+        "|Playlist Files (*.m3u, *.pls, etc.)|" EXTENSIONS_PLAYLIST
         "|Subtitle Files (*.srt, *.sub, etc.)|" EXTENSIONS_SUBTITLE)));
 
     if( p_file_dialog && p_file_dialog->ShowModal() == wxID_OK )
@@ -450,13 +449,13 @@ void DialogsProvider::OnOpenFileSimple( wxCommandEvent& event )
         {
             char *psz_utf8 = wxFromLocale( paths[i] );
             if( event.GetInt() )
-                playlist_PlaylistAdd( p_playlist, psz_utf8, NULL,
+                playlist_Add( p_playlist, psz_utf8, NULL,
                               PLAYLIST_APPEND | (i ? 0 : PLAYLIST_GO) |
                               (i ? PLAYLIST_PREPARSE : 0 ),
-                              PLAYLIST_END );
+                              PLAYLIST_END, VLC_TRUE, VLC_FALSE );
             else
-                playlist_PlaylistAdd( p_playlist, psz_utf8, NULL,
-                              PLAYLIST_APPEND | PLAYLIST_PREPARSE , PLAYLIST_END );
+                playlist_Add( p_playlist, psz_utf8, NULL,
+                              PLAYLIST_APPEND | PLAYLIST_PREPARSE , PLAYLIST_END , VLC_TRUE, VLC_FALSE );
             wxLocaleFree( psz_utf8 );
         }
     }
@@ -481,9 +480,9 @@ void DialogsProvider::OnOpenDirectory( wxCommandEvent& event )
     {
         wxString path = p_dir_dialog->GetPath();
         char *psz_utf8 = wxFromLocale( path );
-        playlist_PlaylistAdd( p_playlist, psz_utf8, NULL,
+        playlist_Add( p_playlist, psz_utf8, NULL,
                       PLAYLIST_APPEND | (event.GetInt() ? PLAYLIST_GO : 0),
-                      PLAYLIST_END );
+                      PLAYLIST_END, VLC_TRUE, VLC_FALSE );
         wxLocaleFree( psz_utf8 );
     }
 
@@ -562,6 +561,7 @@ void DialogsProvider::OnUpdateVLC( wxCommandEvent& WXUNUSED(event) )
     }
 }
 
+#if 0
 void DialogsProvider::OnVLM( wxCommandEvent& WXUNUSED(event) )
 {
     /* Show/hide the file info window */
@@ -573,6 +573,7 @@ void DialogsProvider::OnVLM( wxCommandEvent& WXUNUSED(event) )
         p_vlm_dialog->Show( !p_vlm_dialog->IsShown() );
     }
 }
+#endif
 
 void DialogsProvider::OnInteraction( wxCommandEvent& event )
 {