/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* malloc(), free() */
#include <errno.h> /* ENOMEM */
-#include <string.h> /* strerror() */
-#include <stdio.h>
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
#include <vlc_aout.h>
#include <vlc_interface.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"
void Open( int i_access_method, int i_arg );
/* Event handlers (these functions should _not_ be virtual) */
+#ifdef UPDATE_CHECK
void OnUpdateVLC( wxCommandEvent& event );
- void OnVLM( wxCommandEvent& event );
+#endif
+ //void OnVLM( wxCommandEvent& event );
void OnInteraction( wxCommandEvent& event );
void OnExit( wxCommandEvent& event );
void OnPlaylist( wxCommandEvent& event );
wxFrame *p_prefs_dialog;
wxFrame *p_bookmarks_dialog;
wxFileDialog *p_file_generic_dialog;
+#ifdef UPDATE_CHECK
UpdateVLC *p_updatevlc_dialog;
- VLMFrame *p_vlm_dialog;
+#endif
+ //VLMFrame *p_vlm_dialog;
};
}
EVT_COMMAND(INTF_DIALOG_EXIT, wxEVT_DIALOG,
DialogsProvider::OnExitThread)
+#ifdef UPDATE_CHECK
EVT_COMMAND(INTF_DIALOG_UPDATEVLC, wxEVT_DIALOG,
DialogsProvider::OnUpdateVLC)
+#endif
+#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_wizard_dialog = NULL;
p_bookmarks_dialog = NULL;
p_dir_dialog = NULL;
+#ifdef UPDATE_CHECK
p_updatevlc_dialog = NULL;
- p_vlm_dialog = NULL;
+#endif
+ //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 );
PopEventHandler(true);
/* Clean up */
- if( p_open_dialog ) delete p_open_dialog;
+ delete p_open_dialog;
if( p_prefs_dialog ) p_prefs_dialog->Destroy();
- if( p_file_dialog ) delete p_file_dialog;
- if( p_playlist_dialog ) delete p_playlist_dialog;
- 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_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;
+ delete p_file_dialog;
+ delete p_playlist_dialog;
+ delete p_messages_dialog;
+ delete p_fileinfo_dialog;
+ delete p_file_generic_dialog;
+ delete p_wizard_dialog;
+ delete p_bookmarks_dialog;
+#ifdef UPDATE_CHECK
+ delete p_updatevlc_dialog;
+#endif
+ //delete p_vlm_dialog;
- if( p_intf->p_sys->p_icon ) delete p_intf->p_sys->p_icon;
+ delete p_intf->p_sys->p_icon;
/* We must set this here because on win32 this destructor will be
* automatically called so we must not call it again on wxApp->OnExit().
{
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 &&
}
free( p_arg->psz_results );
}
- if( p_arg->psz_title ) free( p_arg->psz_title );
- if( p_arg->psz_extensions ) free( p_arg->psz_extensions );
+ free( p_arg->psz_title );
+ free( p_arg->psz_extensions );
free( p_arg );
}
void DialogsProvider::OnOpenFileSimple( wxCommandEvent& event )
{
- playlist_t *p_playlist =
- (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
+ playlist_t *p_playlist = pl_Yield( p_intf );
if( p_playlist == NULL )
{
return;
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 )
playlist_Add( p_playlist, psz_utf8, NULL,
PLAYLIST_APPEND | (i ? 0 : PLAYLIST_GO) |
(i ? PLAYLIST_PREPARSE : 0 ),
- PLAYLIST_END, VLC_TRUE );
+ PLAYLIST_END, true, false );
else
playlist_Add( p_playlist, psz_utf8, NULL,
- PLAYLIST_APPEND | PLAYLIST_PREPARSE , PLAYLIST_END , VLC_TRUE);
+ PLAYLIST_APPEND | PLAYLIST_PREPARSE , PLAYLIST_END , true, false );
wxLocaleFree( psz_utf8 );
}
}
-
- vlc_object_release( p_playlist );
+ pl_Release( p_playlist );
}
void DialogsProvider::OnOpenDirectory( wxCommandEvent& event )
{
- playlist_t *p_playlist =
- (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
+ playlist_t *p_playlist = pl_Yield( p_intf );
if( p_playlist == NULL )
{
return;
char *psz_utf8 = wxFromLocale( path );
playlist_Add( p_playlist, psz_utf8, NULL,
PLAYLIST_APPEND | (event.GetInt() ? PLAYLIST_GO : 0),
- PLAYLIST_END, VLC_TRUE );
+ PLAYLIST_END, true, false );
wxLocaleFree( psz_utf8 );
}
-
- vlc_object_release( p_playlist );
+ pl_Release( p_playlist );
}
void DialogsProvider::OnOpenFile( wxCommandEvent& event )
wxTheApp->ExitMainLoop();
}
+#ifdef UPDATE_CHECK
void DialogsProvider::OnUpdateVLC( wxCommandEvent& WXUNUSED(event) )
{
/* Show/hide the file info window */
p_updatevlc_dialog->Show( !p_updatevlc_dialog->IsShown() );
}
}
+#endif
+#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 )
{