X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fwxwindows%2Fwxwindows.h;h=e64cf0013d0e86dfa535c3bf9e7a612cc1317221;hb=e9050e582a93be48596c9f8a7835bfff19f0bf0a;hp=d6a7951c1a808a818e0c78728c28f71f08418e61;hpb=5cd4178ed840ba02b8d7d8acd198e833beed827c;p=vlc diff --git a/modules/gui/wxwindows/wxwindows.h b/modules/gui/wxwindows/wxwindows.h index d6a7951c1a..e64cf0013d 100644 --- a/modules/gui/wxwindows/wxwindows.h +++ b/modules/gui/wxwindows/wxwindows.h @@ -1,8 +1,8 @@ /***************************************************************************** * wxwindows.h: private wxWindows interface description ***************************************************************************** - * Copyright (C) 1999, 2000 VideoLAN - * $Id: wxwindows.h,v 1.30 2003/05/20 23:17:59 gbazin Exp $ + * Copyright (C) 1999-2004 VideoLAN + * $Id: wxwindows.h,v 1.95 2004/03/01 18:31:13 gbazin Exp $ * * Authors: Gildas Bazin * @@ -21,27 +21,82 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. *****************************************************************************/ +#ifdef WIN32 /* mingw32 hack */ +#undef Yield +#undef CreateDialog +#endif + +/* Let vlc take care of the i18n stuff */ +#define WXINTL_NO_GETTEXT_MACRO + +#include +#include + #include #include #include #include #include #include +#include +#include +#include +#include "vlc_keys.h" + +/* Hmmm, work-around for newest wxWin */ +#ifdef wxStaticCastEvent +# undef wxStaticCastEvent +# define wxStaticCastEvent(type, val) ((type)(val)) +#endif + +DECLARE_LOCAL_EVENT_TYPE( wxEVT_DIALOG, 0 ); +class OpenDialog; class Playlist; class Messages; class FileInfo; #define SLIDER_MAX_POS 10000 -/* wxU is used to convert ansi strings to unicode strings (wchar_t) */ +/* wxU is used to convert ansi/utf8 strings to unicode strings (wchar_t) */ +#if defined( ENABLE_NLS ) && defined( ENABLE_UTF8 ) +#if wxUSE_UNICODE +# define wxU(utf8) wxString(utf8, wxConvUTF8) +#else +# define wxU(utf8) wxString(wxConvUTF8.cMB2WC(utf8), *wxConvCurrent) +#endif +#define ISUTF8 1 + +#else // ENABLE_NLS && ENABLE_UTF8 #if wxUSE_UNICODE # define wxU(ansi) wxString(ansi, *wxConvCurrent) #else # define wxU(ansi) ansi +#endif +#define ISUTF8 0 + #endif -#if !defined(MODULE_NAME_IS_skins) +/* wxL2U (locale to unicode) is used to convert ansi strings to unicode + * strings (wchar_t) */ +#if wxUSE_UNICODE +# define wxL2U(ansi) wxString(ansi, *wxConvCurrent) +#else +# define wxL2U(ansi) ansi +#endif + +#define WRAPCOUNT 80 + +#define OPEN_NORMAL 0 +#define OPEN_STREAM 1 + +#define MODE_NONE 0 +#define MODE_GROUP 1 +#define MODE_AUTHOR 2 +#define MODE_TITLE 3 + +wxArrayString SeparateEntries( wxString ); + /***************************************************************************** * intf_sys_t: description and status of wxwindows interface *****************************************************************************/ @@ -51,28 +106,8 @@ struct intf_sys_t wxWindow *p_wxwindow; wxIcon *p_icon; - /* secondary windows */ - Playlist *p_playlist_window; - Messages *p_messages_window; - FileInfo *p_fileinfo_window; - /* special actions */ vlc_bool_t b_playing; - vlc_bool_t b_popup_changed; /* display menu ? */ - vlc_bool_t b_window_changed; /* window display toggled ? */ - vlc_bool_t b_playlist_changed; /* playlist display toggled ? */ - vlc_bool_t b_slider_free; /* slider status */ - - /* menus handlers */ - vlc_bool_t b_program_update; /* do we need to update programs - menu */ - vlc_bool_t b_title_update; /* do we need to update title menus */ - vlc_bool_t b_chapter_update; /* do we need to update - chapter menus */ - vlc_bool_t b_audio_update; /* do we need to update audio menus */ - vlc_bool_t b_spu_update; /* do we need to update spu menus */ - - /* windows and widgets */ /* The input thread */ input_thread_t * p_input; @@ -80,6 +115,7 @@ struct intf_sys_t /* The slider */ int i_slider_pos; /* slider position */ int i_slider_oldpos; /* previous position */ + vlc_bool_t b_slider_free; /* slider status */ /* The messages window */ msg_subscription_t* p_sub; /* message bank subscription */ @@ -87,10 +123,14 @@ struct intf_sys_t /* Playlist management */ int i_playing; /* playlist selected item */ - /* The window labels for DVD mode */ - unsigned int i_part; /* current chapter */ + /* Send an event to show a dialog */ + void (*pf_show_dialog) ( intf_thread_t *p_intf, int i_dialog, int i_arg, + intf_dialog_args_t *p_arg ); + + /* Popup menu */ + wxMenu *p_popup_menu; + }; -#endif /* !defined(MODULE_NAME_IS_skins) */ /***************************************************************************** * Prototypes @@ -119,7 +159,6 @@ private: }; /* Main Interface */ -class OpenDialog; class Interface: public wxFrame { public: @@ -128,39 +167,49 @@ public: virtual ~Interface(); void TogglePlayButton( int i_playing_status ); +// wxFlexGridSizer *frame_sizer; wxBoxSizer *frame_sizer; wxStatusBar *statusbar; wxSlider *slider; wxWindow *slider_frame; + wxWindow *extra_frame; wxStaticBox *slider_box; - /* So we don't recreate the open dialog box each time - * (and keep the last settings) */ - OpenDialog *p_open_dialog; + vlc_bool_t b_extra; + + wxStaticBox *adjust_box; + wxSlider *brightness_slider; + wxSlider *contrast_slider; + wxSlider *saturation_slider; + wxSlider *hue_slider; + wxSlider *gamma_slider; - wxMenu *p_popup_menu; + wxStaticBox *other_box; + wxComboBox *ratio_combo; + + wxGauge *volctrl; private: + void UpdateAcceleratorTable(); void CreateOurMenuBar(); void CreateOurToolBar(); + void CreateOurExtraPanel(); void CreateOurSlider(); void Open( int i_access_method ); /* Event handlers (these functions should _not_ be virtual) */ void OnExit( wxCommandEvent& event ); void OnAbout( wxCommandEvent& event ); - void OnMessages( wxCommandEvent& event ); - void OnPlaylist( wxCommandEvent& event ); - void OnLogs( wxCommandEvent& event ); - void OnFileInfo( wxCommandEvent& event ); - void OnPreferences( wxCommandEvent& event ); + void OnOpenFileSimple( wxCommandEvent& event ); void OnOpenFile( wxCommandEvent& event ); void OnOpenDisc( wxCommandEvent& event ); void OnOpenNet( wxCommandEvent& event ); void OnOpenSat( wxCommandEvent& event ); - + void OnOpenV4L( wxCommandEvent& event ); + void OnExtra( wxCommandEvent& event ); + void OnShowDialog( wxCommandEvent& event ); void OnPlayStream( wxCommandEvent& event ); void OnStopStream( wxCommandEvent& event ); void OnSliderUpdate( wxScrollEvent& event ); @@ -169,24 +218,34 @@ private: void OnSlowStream( wxCommandEvent& event ); void OnFastStream( wxCommandEvent& event ); + void OnEnableAdjust( wxCommandEvent& event ); + void OnHueUpdate( wxScrollEvent& event ); + void OnContrastUpdate( wxScrollEvent& event ); + void OnBrightnessUpdate( wxScrollEvent& event ); + void OnSaturationUpdate( wxScrollEvent& event ); + void OnGammaUpdate( wxScrollEvent& event ); + + void OnRatio( wxCommandEvent& event ); + void OnEnableVisual( wxCommandEvent& event ); + void OnMenuOpen( wxMenuEvent& event ); #if defined( __WXMSW__ ) || defined( __WXMAC__ ) - void OnContextMenu(wxContextMenuEvent& event); -#else - void OnContextMenu(wxMouseEvent& event); + void OnContextMenu2(wxContextMenuEvent& event); #endif + void OnContextMenu(wxMouseEvent& event); DECLARE_EVENT_TABLE(); Timer *timer; intf_thread_t *p_intf; - wxFrame *p_prefs_dialog; - +private: int i_old_playing_status; /* For auto-generated menus */ + wxMenu *p_settings_menu; + vlc_bool_t b_settings_menu; wxMenu *p_audio_menu; vlc_bool_t b_audio_menu; wxMenu *p_video_menu; @@ -195,27 +254,89 @@ private: vlc_bool_t b_navig_menu; }; +class StreamDialog; + +/* Dialogs Provider */ +class DialogsProvider: public wxFrame +{ +public: + /* Constructor */ + DialogsProvider( intf_thread_t *p_intf, wxWindow *p_parent ); + virtual ~DialogsProvider(); + +private: + void Open( int i_access_method, int i_arg ); + + /* Event handlers (these functions should _not_ be virtual) */ + void OnExit( wxCommandEvent& event ); + void OnPlaylist( wxCommandEvent& event ); + void OnMessages( wxCommandEvent& event ); + void OnFileInfo( wxCommandEvent& event ); + void OnPreferences( wxCommandEvent& event ); + void OnStreamWizardDialog( wxCommandEvent& event ); + + void OnOpenFileGeneric( wxCommandEvent& event ); + void OnOpenFileSimple( wxCommandEvent& event ); + void OnOpenFile( wxCommandEvent& event ); + void OnOpenDisc( wxCommandEvent& event ); + void OnOpenNet( wxCommandEvent& event ); + void OnOpenSat( wxCommandEvent& event ); + + void OnPopupMenu( wxCommandEvent& event ); + + void OnIdle( wxIdleEvent& event ); + + void OnExitThread( wxCommandEvent& event ); + + DECLARE_EVENT_TABLE(); + + intf_thread_t *p_intf; + +public: + /* Secondary windows */ + OpenDialog *p_open_dialog; + wxFileDialog *p_file_dialog; + Playlist *p_playlist_dialog; + Messages *p_messages_dialog; + FileInfo *p_fileinfo_dialog; + StreamDialog *p_streamwizard_dialog; + wxFrame *p_prefs_dialog; + wxFileDialog *p_file_generic_dialog; +}; + /* Open Dialog */ +class AutoBuiltPanel; +WX_DEFINE_ARRAY(AutoBuiltPanel *, ArrayOfAutoBuiltPanel); +class V4LDialog; class SoutDialog; class SubsFileDialog; -class OpenDialog: public wxDialog +class OpenDialog: public wxFrame { public: /* Constructor */ OpenDialog( intf_thread_t *p_intf, wxWindow *p_parent, - int i_access_method ); + int i_access_method, int i_arg = 0 ); + + /* Extended Contructor */ + OpenDialog( intf_thread_t *p_intf, wxWindow *p_parent, + int i_access_method, int i_arg = 0 , int _i_method = 0 ); virtual ~OpenDialog(); + int Show(); + int Show( int i_access_method, int i_arg = 0 ); + + void UpdateMRL(); + void UpdateMRL( int i_access_method ); + wxArrayString mrl; private: wxPanel *FilePanel( wxWindow* parent ); wxPanel *DiscPanel( wxWindow* parent ); wxPanel *NetPanel( wxWindow* parent ); - wxPanel *SatPanel( wxWindow* parent ); + wxPanel *V4LPanel( wxWindow* parent ); - void UpdateMRL( int i_access_method ); - wxArrayString SeparateEntries( wxString ); + ArrayOfAutoBuiltPanel input_tab_array; /* Event handlers (these functions should _not_ be virtual) */ void OnOk( wxCommandEvent& event ); @@ -231,11 +352,17 @@ private: /* Event handlers for the disc page */ void OnDiscPanelChange( wxCommandEvent& event ); void OnDiscTypeChange( wxCommandEvent& event ); + void OnDiscDeviceChange( wxCommandEvent& event ); /* Event handlers for the net page */ void OnNetPanelChange( wxCommandEvent& event ); void OnNetTypeChange( wxCommandEvent& event ); + /* Event handlers for the v4l page */ + void OnV4LPanelChange( wxCommandEvent& event ); + void OnV4LTypeChange( wxCommandEvent& event ); + void OnV4LSettingsChange( wxCommandEvent& event ); + /* Event handlers for the stream output */ void OnSubsFileEnable( wxCommandEvent& event ); void OnSubsFileSettings( wxCommandEvent& WXUNUSED(event) ); @@ -244,18 +371,18 @@ private: void OnSoutEnable( wxCommandEvent& event ); void OnSoutSettings( wxCommandEvent& WXUNUSED(event) ); - /* Event handlers for the demux dump */ - void OnDemuxDumpEnable( wxCommandEvent& event ); - void OnDemuxDumpBrowse( wxCommandEvent& event ); - void OnDemuxDumpChange( wxCommandEvent& event ); - DECLARE_EVENT_TABLE(); intf_thread_t *p_intf; wxWindow *p_parent; int i_current_access_method; + int i_disc_type_selection; + + int i_method; /* Normal or for the stream dialog ? */ + int i_open_arg; wxComboBox *mrl_combo; + wxNotebook *notebook; /* Controls for the file panel */ wxComboBox *file_combo; @@ -267,29 +394,43 @@ private: wxSpinCtrl *disc_title; wxSpinCtrl *disc_chapter; + /* The media equivalent name for a DVD names. For example, + "Title", is "Track" for a CD-DA */ + wxStaticText *disc_title_label; + wxStaticText *disc_chapter_label; + + /* Indicates if the disc device control was modified */ + bool b_disc_device_changed; + /* Controls for the net panel */ wxRadioBox *net_type; int i_net_type; wxPanel *net_subpanels[4]; wxRadioButton *net_radios[4]; wxSpinCtrl *net_ports[4]; + int i_net_ports[4]; wxTextCtrl *net_addrs[4]; + wxCheckBox *net_ipv6; + + /* Controls for the v4l panel */ + wxRadioBox *video_type; + wxTextCtrl *video_device; + wxSpinCtrl *video_channel; + wxButton *v4l_button; + V4LDialog *v4l_dialog; + wxArrayString v4l_mrl; /* Controls for the subtitles file */ wxButton *subsfile_button; wxCheckBox *subsfile_checkbox; SubsFileDialog *subsfile_dialog; + wxArrayString subsfile_mrl; /* Controls for the stream output */ wxButton *sout_button; wxCheckBox *sout_checkbox; SoutDialog *sout_dialog; - - /* Controls for the demux dump */ - wxTextCtrl *demuxdump_textctrl; - wxButton *demuxdump_button; - wxCheckBox *demuxdump_checkbox; - wxFileDialog *demuxdump_dialog; + wxArrayString sout_mrl; }; enum @@ -297,10 +438,114 @@ enum FILE_ACCESS = 0, DISC_ACCESS, NET_ACCESS, - SAT_ACCESS +#ifndef WIN32 + V4L_ACCESS, +#endif + MAX_ACCESS, + FILE_SIMPLE_ACCESS +}; + +/* V4L Dialog */ +class V4LDialog: public wxDialog +{ +public: + /* Constructor */ + V4LDialog( intf_thread_t *p_intf, wxWindow *p_parent ); + virtual ~V4LDialog(); + + wxArrayString GetOptions(); + +private: + void UpdateMRL(); + wxPanel *AudioPanel( wxWindow* parent ); + wxPanel *CommonPanel( wxWindow* parent ); + wxPanel *BitratePanel( wxWindow* parent ); + void ParseMRL(); + + /* Event handlers (these functions should _not_ be virtual) */ + void OnOk( wxCommandEvent& event ); + void OnCancel( wxCommandEvent& event ); + void OnMRLChange( wxCommandEvent& event ); + void OnAudioEnable( wxCommandEvent& event ); + void OnAudioChange( wxCommandEvent& event ); + void OnAudioChannel( wxCommandEvent& event ); + void OnSizeEnable( wxCommandEvent& event ); + void OnSize( wxCommandEvent& event ); + void OnNormEnable( wxCommandEvent& event ); + void OnNorm( wxCommandEvent& event ); + void OnFrequencyEnable( wxCommandEvent& event ); + void OnFrequency( wxCommandEvent& event ); + void OnBitrateEnable( wxCommandEvent& event ); + void OnBitrate( wxCommandEvent& event ); + void OnMaxBitrateEnable( wxCommandEvent& event ); + void OnMaxBitrate( wxCommandEvent& event ); + + DECLARE_EVENT_TABLE(); + + intf_thread_t *p_intf; + wxWindow *p_parent; + + wxComboBox *mrl_combo; + + int i_access_type; + + /* Controls for the v4l advanced options */ + wxPanel *common_subpanel; + wxPanel *common_panel; + wxCheckBox *size_checkbox; + wxComboBox *size_combo; + wxCheckBox *norm_checkbox; + wxComboBox *norm_combo; + wxCheckBox *frequency_checkbox; + wxSpinCtrl *frequency; + + wxPanel *audio_subpanel; + wxPanel *audio_panel; + wxCheckBox *audio_checkbox; + wxTextCtrl *audio_device; + wxSpinCtrl *audio_channel; + + wxPanel *bitrate_subpanel; + wxPanel *bitrate_panel; + wxCheckBox *bitrate_checkbox; + wxSpinCtrl *bitrate; + wxCheckBox *maxbitrate_checkbox; + wxSpinCtrl *maxbitrate; + }; /* Stream output Dialog */ +enum +{ + PLAY_ACCESS_OUT = 0, + FILE_ACCESS_OUT, + HTTP_ACCESS_OUT, + MMSH_ACCESS_OUT, + UDP_ACCESS_OUT, + RTP_ACCESS_OUT, + ACCESS_OUT_NUM +}; + +enum +{ + TS_ENCAPSULATION = 0, + PS_ENCAPSULATION, + MPEG1_ENCAPSULATION, + OGG_ENCAPSULATION, + RAW_ENCAPSULATION, + ASF_ENCAPSULATION, + AVI_ENCAPSULATION, + MP4_ENCAPSULATION, + MOV_ENCAPSULATION, + ENCAPS_NUM +}; + +enum +{ + ANN_MISC_SOUT = 0, + MISC_SOUT_NUM +}; + class SoutDialog: public wxDialog { public: @@ -308,11 +553,12 @@ public: SoutDialog( intf_thread_t *p_intf, wxWindow *p_parent ); virtual ~SoutDialog(); - wxString mrl; + wxArrayString GetOptions(); private: void UpdateMRL(); wxPanel *AccessPanel( wxWindow* parent ); + wxPanel *MiscPanel( wxWindow* parent ); wxPanel *EncapsulationPanel( wxWindow* parent ); wxPanel *TranscodingPanel( wxWindow* parent ); void ParseMRL(); @@ -326,10 +572,14 @@ private: /* Event handlers for the file access output */ void OnFileChange( wxCommandEvent& event ); void OnFileBrowse( wxCommandEvent& event ); + void OnFileDump( wxCommandEvent& event ); /* Event handlers for the net access output */ void OnNetChange( wxCommandEvent& event ); + /* Event specific to the announce address */ + void OnAnnounceAddrChange( wxCommandEvent& event ); + /* Event handlers for the encapsulation panel */ void OnEncapsulationChange( wxCommandEvent& event ); @@ -337,6 +587,10 @@ private: void OnTranscodingEnable( wxCommandEvent& event ); void OnTranscodingChange( wxCommandEvent& event ); + /* Event handlers for the misc panel */ + void OnSAPMiscChange( wxCommandEvent& event ); + void OnSLPMiscChange( wxCommandEvent& event ); + DECLARE_EVENT_TABLE(); intf_thread_t *p_intf; @@ -345,26 +599,39 @@ private: wxComboBox *mrl_combo; /* Controls for the access outputs */ - wxPanel *access_subpanels[5]; - wxCheckBox *access_checkboxes[5]; + wxPanel *access_panel; + wxPanel *access_subpanels[ACCESS_OUT_NUM]; + wxCheckBox *access_checkboxes[ACCESS_OUT_NUM]; int i_access_type; wxComboBox *file_combo; - wxSpinCtrl *net_port; - wxTextCtrl *net_addr; + wxCheckBox *dump_checkbox; + wxSpinCtrl *net_ports[ACCESS_OUT_NUM]; + wxTextCtrl *net_addrs[ACCESS_OUT_NUM]; + + /* Controls for the SAP announces */ + wxPanel *misc_panel; + wxPanel *misc_subpanels[MISC_SOUT_NUM]; + wxCheckBox *sap_checkbox; + wxCheckBox *slp_checkbox; + wxTextCtrl *announce_addr; /* Controls for the encapsulation */ - wxRadioButton *encapsulation_radios[5]; + wxPanel *encapsulation_panel; + wxRadioButton *encapsulation_radios[ENCAPS_NUM]; int i_encapsulation_type; /* Controls for transcoding */ + wxPanel *transcoding_panel; wxCheckBox *video_transc_checkbox; wxComboBox *video_codec_combo; wxComboBox *audio_codec_combo; wxCheckBox *audio_transc_checkbox; wxComboBox *video_bitrate_combo; wxComboBox *audio_bitrate_combo; + wxComboBox *audio_channels_combo; + wxComboBox *video_scale_combo; }; /* Subtitles File Dialog */ @@ -376,6 +643,7 @@ public: virtual ~SubsFileDialog(); wxComboBox *file_combo; + wxComboBox *encoding_combo; wxSpinCtrl *delay_spinctrl; wxSpinCtrl *fps_spinctrl; @@ -391,13 +659,43 @@ private: wxWindow *p_parent; }; +/* Stream */ +class StreamDialog: public wxFrame +{ +public: + /* Constructor */ + StreamDialog( intf_thread_t *p_intf, wxWindow *p_parent ); + virtual ~StreamDialog(); + +private: + void OnClose( wxCommandEvent& event ); + void OnOpen( wxCommandEvent& event ); + void OnSout( wxCommandEvent& event ); + void OnStart( wxCommandEvent& event ); + + DECLARE_EVENT_TABLE(); + + intf_thread_t *p_intf; + + wxStaticText *step2_label; + wxStaticText *step3_label; + wxButton *sout_button; + wxButton *start_button; + wxArrayString mrl; + wxArrayString sout_mrl; + OpenDialog *p_open_dialog; + SoutDialog *p_sout_dialog; +}; + + + /* Preferences Dialog */ class PrefsTreeCtrl; class PrefsDialog: public wxFrame { public: /* Constructor */ - PrefsDialog( intf_thread_t *p_intf, Interface *p_main_interface ); + PrefsDialog( intf_thread_t *p_intf, wxWindow *p_parent ); virtual ~PrefsDialog(); private: @@ -408,11 +706,11 @@ private: void OnCancel( wxCommandEvent& event ); void OnSave( wxCommandEvent& event ); void OnResetAll( wxCommandEvent& event ); + void OnAdvanced( wxCommandEvent& event ); DECLARE_EVENT_TABLE(); intf_thread_t *p_intf; - Interface *p_main_interface; PrefsTreeCtrl *prefs_tree; }; @@ -422,71 +720,193 @@ class Messages: public wxFrame { public: /* Constructor */ - Messages( intf_thread_t *p_intf, Interface *_p_main_interface ); + Messages( intf_thread_t *p_intf, wxWindow *p_parent ); virtual ~Messages(); + bool Show( bool show = TRUE ); void UpdateLog(); private: /* Event handlers (these functions should _not_ be virtual) */ void OnClose( wxCommandEvent& event ); - void OnVerbose( wxCommandEvent& event ); + void OnClear( wxCommandEvent& event ); + void OnSaveLog( wxCommandEvent& event ); DECLARE_EVENT_TABLE(); intf_thread_t *p_intf; - Interface *p_main_interface; wxTextCtrl *textctrl; wxTextAttr *info_attr; wxTextAttr *err_attr; wxTextAttr *warn_attr; wxTextAttr *dbg_attr; + wxFileDialog *save_log_dialog; + vlc_bool_t b_verbose; }; /* Playlist */ +class ItemInfoDialog; +class NewGroup; +class ExportPlaylist; class Playlist: public wxFrame { public: /* Constructor */ - Playlist( intf_thread_t *p_intf, Interface *p_main_interface ); + Playlist( intf_thread_t *p_intf, wxWindow *p_parent ); virtual ~Playlist(); void UpdatePlaylist(); void ShowPlaylist( bool show ); + void UpdateItem( int ); bool b_need_update; - vlc_mutex_t lock; private: void DeleteItem( int item ); + void ShowInfos( int item ); /* Event handlers (these functions should _not_ be virtual) */ + void OnAddFile( wxCommandEvent& event ); void OnAddMRL( wxCommandEvent& event ); void OnClose( wxCommandEvent& event ); + void OnSearch( wxCommandEvent& event ); + void OnEnDis( wxCommandEvent& event ); + void OnInfos( wxCommandEvent& event ); + void OnSearchTextChange( wxCommandEvent& event ); void OnOpen( wxCommandEvent& event ); void OnSave( wxCommandEvent& event ); + + void OnSort( wxCommandEvent& event ); + void OnColSelect( wxListEvent& event ); + + void OnUp( wxCommandEvent& event); + void OnDown( wxCommandEvent& event); + + void OnEnableSelection( wxCommandEvent& event ); + void OnDisableSelection( wxCommandEvent& event ); void OnInvertSelection( wxCommandEvent& event ); void OnDeleteSelection( wxCommandEvent& event ); void OnSelectAll( wxCommandEvent& event ); + void OnRandom( wxCommandEvent& event ); + void OnRepeat( wxCommandEvent& event ); + void OnLoop ( wxCommandEvent& event ); void OnActivateItem( wxListEvent& event ); void OnKeyDown( wxListEvent& event ); + void OnNewGroup( wxCommandEvent& event ); + + /* Popup functions */ + void OnPopup( wxListEvent& event ); + void OnPopupPlay( wxMenuEvent& event ); + void OnPopupDel( wxMenuEvent& event ); + void OnPopupEna( wxMenuEvent& event ); + void OnPopupInfo( wxMenuEvent& event ); void Rebuild(); + /* Custom events */ + void OnPlaylistEvent( wxCommandEvent& event ); + + wxTextCtrl *search_text; + wxButton *search_button; DECLARE_EVENT_TABLE(); + wxMenu *popup_menu; + + ItemInfoDialog *iteminfo_dialog; + intf_thread_t *p_intf; - Interface *p_main_interface; wxListView *listview; + wxTreeCtrl *treeview; int i_update_counter; + int i_sort_mode; + + int i_popup_item; + + int i_title_sorted; + int i_author_sorted; + int i_group_sorted; + int i_duration_sorted; +}; + + +class NewGroup: public wxDialog +{ +public: + /* Constructor */ + NewGroup( intf_thread_t *p_intf, wxWindow *p_parent ); + virtual ~NewGroup(); + +private: + + /* Event handlers (these functions should _not_ be virtual) */ + void OnOk( wxCommandEvent& event ); + void OnCancel( wxCommandEvent& event ); + + DECLARE_EVENT_TABLE(); + + intf_thread_t *p_intf; + wxTextCtrl *groupname; + +protected: + friend class Playlist; + friend class ItemInfoDialog; + char *psz_name; +}; + +/* ItemInfo Dialog */ +class ItemInfoDialog: public wxDialog +{ +public: + /* Constructor */ + ItemInfoDialog( intf_thread_t *p_intf, playlist_item_t *_p_item, + wxWindow *p_parent ); + virtual ~ItemInfoDialog(); + + wxArrayString GetOptions(); + +private: + wxPanel *InfoPanel( wxWindow* parent ); + wxPanel *GroupPanel( wxWindow* parent ); + + /* Event handlers (these functions should _not_ be virtual) */ + void OnOk( wxCommandEvent& event ); + void OnCancel( wxCommandEvent& event ); + void OnNewGroup( wxCommandEvent& event ); + + void UpdateInfo(); + + DECLARE_EVENT_TABLE(); + + intf_thread_t *p_intf; + playlist_item_t *p_item; + wxWindow *p_parent; + + /* Controls for the iteminfo dialog box */ + wxPanel *info_subpanel; + wxPanel *info_panel; + + wxPanel *group_subpanel; + wxPanel *group_panel; + + wxTextCtrl *uri_text; + wxTextCtrl *name_text; + wxTextCtrl *author_text; + + wxTreeCtrl *info_tree; + wxTreeItemId info_root; + + wxCheckBox *enabled_checkbox; + wxComboBox *group_combo; + int ids_array[100]; }; + /* File Info */ class FileInfo: public wxFrame { public: /* Constructor */ - FileInfo( intf_thread_t *p_intf, Interface *p_main_interface ); + FileInfo( intf_thread_t *p_intf, wxWindow *p_parent ); virtual ~FileInfo(); void UpdateFileInfo(); @@ -494,7 +914,7 @@ private: void OnClose( wxCommandEvent& event ); DECLARE_EVENT_TABLE(); - + intf_thread_t *p_intf; wxTreeCtrl *fileinfo_tree; wxTreeItemId fileinfo_root; @@ -502,27 +922,30 @@ private: }; + #if !defined(__WXX11__) /* Drag and Drop class */ class DragAndDrop: public wxFileDropTarget { public: - DragAndDrop( intf_thread_t *_p_intf ); + DragAndDrop( intf_thread_t *_p_intf, vlc_bool_t b_enqueue = VLC_FALSE ); virtual bool OnDropFiles( wxCoord x, wxCoord y, const wxArrayString& filenames ); private: intf_thread_t *p_intf; + vlc_bool_t b_enqueue; }; #endif /* Menus */ -void PopupMenu( intf_thread_t *_p_intf, Interface *_p_main_interface, +void PopupMenu( intf_thread_t *_p_intf, wxWindow *p_parent, const wxPoint& pos ); -wxMenu *AudioMenu( intf_thread_t *_p_intf, Interface *_p_main_interface ); -wxMenu *VideoMenu( intf_thread_t *_p_intf, Interface *_p_main_interface ); -wxMenu *NavigMenu( intf_thread_t *_p_intf, Interface *_p_main_interface ); +wxMenu *SettingsMenu( intf_thread_t *_p_intf, wxWindow *p_parent ); +wxMenu *AudioMenu( intf_thread_t *_p_intf, wxWindow *p_parent ); +wxMenu *VideoMenu( intf_thread_t *_p_intf, wxWindow *p_parent ); +wxMenu *NavigMenu( intf_thread_t *_p_intf, wxWindow *p_parent ); class MenuEvtHandler : public wxEvtHandler { @@ -530,7 +953,8 @@ public: MenuEvtHandler( intf_thread_t *p_intf, Interface *p_main_interface ); virtual ~MenuEvtHandler(); - void MenuEvtHandler::OnMenuEvent( wxCommandEvent& event ); + void OnMenuEvent( wxCommandEvent& event ); + void OnShowDialog( wxCommandEvent& event ); private: @@ -544,23 +968,71 @@ class Menu: public wxMenu { public: /* Constructor */ - Menu( intf_thread_t *p_intf, Interface *p_main_interface, int i_count, + Menu( intf_thread_t *p_intf, wxWindow *p_parent, int i_count, char **ppsz_names, int *pi_objects, int i_start_id ); virtual ~Menu(); private: /* Event handlers (these functions should _not_ be virtual) */ void OnClose( wxCommandEvent& event ); + void OnShowDialog( wxCommandEvent& event ); void OnEntrySelected( wxCommandEvent& event ); wxMenu *Menu::CreateDummyMenu(); void Menu::CreateMenuItem( wxMenu *, char *, vlc_object_t * ); - wxMenu *Menu::CreateChoicesMenu( char *, vlc_object_t * ); + wxMenu *Menu::CreateChoicesMenu( char *, vlc_object_t *, bool ); DECLARE_EVENT_TABLE(); intf_thread_t *p_intf; - Interface *p_main_interface; int i_item_id; }; + +static inline int ConvertHotkeyModifiers( int i_hotkey ) +{ + int i_accel_flags = 0; + if( i_hotkey & KEY_MODIFIER_ALT ) i_accel_flags |= wxACCEL_ALT; + if( i_hotkey & KEY_MODIFIER_CTRL ) i_accel_flags |= wxACCEL_CTRL; + if( i_hotkey & KEY_MODIFIER_SHIFT ) i_accel_flags |= wxACCEL_SHIFT; + return i_accel_flags; +} + +static inline int ConvertHotkey( int i_hotkey ) +{ + int i_key = i_hotkey & ~KEY_MODIFIER; + if( i_key & KEY_ASCII ) return i_key & KEY_ASCII; + else if( i_key & KEY_SPECIAL ) + { + switch ( i_key ) + { + case KEY_LEFT: return WXK_LEFT; + case KEY_RIGHT: return WXK_RIGHT; + case KEY_UP: return WXK_UP; + case KEY_DOWN: return WXK_DOWN; + case KEY_SPACE: return WXK_SPACE; + case KEY_ENTER: return WXK_RETURN; + case KEY_F1: return WXK_F1; + case KEY_F2: return WXK_F2; + case KEY_F3: return WXK_F3; + case KEY_F4: return WXK_F4; + case KEY_F5: return WXK_F5; + case KEY_F6: return WXK_F6; + case KEY_F7: return WXK_F7; + case KEY_F8: return WXK_F8; + case KEY_F9: return WXK_F9; + case KEY_F10: return WXK_F10; + case KEY_F11: return WXK_F11; + case KEY_F12: return WXK_F12; + case KEY_HOME: return WXK_HOME; + case KEY_END: return WXK_HOME; + case KEY_MENU: return WXK_MENU; + case KEY_ESC: return WXK_ESCAPE; + case KEY_PAGEUP: return WXK_PRIOR; + case KEY_PAGEDOWN: return WXK_NEXT; + case KEY_TAB: return WXK_TAB; + case KEY_BACKSPACE: return WXK_BACK; + } + } + return 0; +}