/*****************************************************************************
* 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"
/* include the icon graphic */
#include "../../../share/vlc32x32.xpm"
+
/* Dialogs Provider */
+namespace wxvlc
+{
class DialogsProvider: public wxFrame
{
public:
/* 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 );
void OnOpenSat( wxCommandEvent& event );
void OnPopupMenu( wxCommandEvent& event );
+ void OnAudioPopupMenu( wxCommandEvent& event );
+ void OnVideoPopupMenu( wxCommandEvent& event );
+ void OnMiscPopupMenu( wxCommandEvent& event );
void OnIdle( wxIdleEvent& event );
wxFrame *p_bookmarks_dialog;
wxFileDialog *p_file_generic_dialog;
UpdateVLC *p_updatevlc_dialog;
- VLMFrame *p_vlm_dialog;
+ //VLMFrame *p_vlm_dialog;
};
+}
DEFINE_LOCAL_EVENT_TYPE( wxEVT_DIALOG );
DialogsProvider::OnFileInfo)
EVT_COMMAND(INTF_DIALOG_BOOKMARKS, wxEVT_DIALOG,
DialogsProvider::OnBookmarks)
+
EVT_COMMAND(INTF_DIALOG_POPUPMENU, wxEVT_DIALOG,
DialogsProvider::OnPopupMenu)
+ EVT_COMMAND(INTF_DIALOG_AUDIOPOPUPMENU, wxEVT_DIALOG,
+ DialogsProvider::OnAudioPopupMenu)
+ EVT_COMMAND(INTF_DIALOG_VIDEOPOPUPMENU, wxEVT_DIALOG,
+ DialogsProvider::OnVideoPopupMenu)
+ EVT_COMMAND(INTF_DIALOG_MISCPOPUPMENU, wxEVT_DIALOG,
+ DialogsProvider::OnMiscPopupMenu)
+
EVT_COMMAND(INTF_DIALOG_EXIT, wxEVT_DIALOG,
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()
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 );
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;
{
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 &&
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) );
}
}
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
+ "|Subtitle Files (*.srt, *.sub, etc.)|" EXTENSIONS_SUBTITLE)));
+
if( p_file_dialog && p_file_dialog->ShowModal() == wxID_OK )
{
wxArrayString paths;
{
char *psz_utf8 = wxFromLocale( paths[i] );
if( event.GetInt() )
- playlist_Add( p_playlist, psz_utf8, psz_utf8,
- PLAYLIST_APPEND | (i ? 0 : PLAYLIST_GO),
- PLAYLIST_END );
+ playlist_Add( p_playlist, psz_utf8, NULL,
+ PLAYLIST_APPEND | (i ? 0 : PLAYLIST_GO) |
+ (i ? PLAYLIST_PREPARSE : 0 ),
+ PLAYLIST_END, VLC_TRUE, VLC_FALSE );
else
- playlist_Add( p_playlist, psz_utf8, psz_utf8,
- PLAYLIST_APPEND, PLAYLIST_END );
+ playlist_Add( p_playlist, psz_utf8, NULL,
+ PLAYLIST_APPEND | PLAYLIST_PREPARSE , PLAYLIST_END , VLC_TRUE, VLC_FALSE );
wxLocaleFree( psz_utf8 );
}
}
}
if( p_dir_dialog == NULL )
- p_dir_dialog = new wxDirDialog( NULL );
+ p_dir_dialog = new wxDirDialog( NULL, wxU(_("Select a directory")) );
if( p_dir_dialog && p_dir_dialog->ShowModal() == wxID_OK )
{
wxString path = p_dir_dialog->GetPath();
char *psz_utf8 = wxFromLocale( path );
- playlist_Add( p_playlist, psz_utf8, psz_utf8,
+ 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 );
}
::PopupMenu( p_intf, this, mousepos );
}
+void DialogsProvider::OnAudioPopupMenu( wxCommandEvent& event )
+{
+ wxPoint mousepos = ScreenToClient( wxGetMousePosition() );
+ ::AudioPopupMenu( p_intf, this, mousepos );
+}
+void DialogsProvider::OnVideoPopupMenu( wxCommandEvent& event )
+{
+ wxPoint mousepos = ScreenToClient( wxGetMousePosition() );
+ ::VideoPopupMenu( p_intf, this, mousepos );
+}
+void DialogsProvider::OnMiscPopupMenu( wxCommandEvent& event )
+{
+ wxPoint mousepos = ScreenToClient( wxGetMousePosition() );
+ ::MiscPopupMenu( p_intf, this, mousepos );
+}
+
void DialogsProvider::OnExitThread( wxCommandEvent& WXUNUSED(event) )
{
wxTheApp->ExitMainLoop();
}
}
+#if 0
void DialogsProvider::OnVLM( wxCommandEvent& WXUNUSED(event) )
{
/* Show/hide the file info window */
p_vlm_dialog->Show( !p_vlm_dialog->IsShown() );
}
}
+#endif
void DialogsProvider::OnInteraction( wxCommandEvent& event )
{
interaction_dialog_t *p_dialog;
InteractionDialog *p_wxdialog;
+ return;
+
if( p_arg == NULL )
{
msg_Dbg( p_intf, "OnInteraction() called with NULL arg" );
break;
case INTERACT_UPDATE:
p_wxdialog = (InteractionDialog*)(p_dialog->p_private);
- p_wxdialog->Update();
+ if( p_wxdialog)
+ p_wxdialog->Update();
break;
case INTERACT_HIDE:
p_wxdialog = (InteractionDialog*)(p_dialog->p_private);
- p_wxdialog->Hide();
+ if( p_wxdialog )
+ p_wxdialog->Hide();
p_dialog->i_status = HIDDEN_DIALOG;
break;
case INTERACT_DESTROY: