Commit 8e843ea7 authored by Gildas Bazin's avatar Gildas Bazin

* modules/gui/wxwindows/*: removed the V4L specific code.

  The V4L panel is now created automatically with an "AutoBuiltPanel" class.
  (A few options are missing compared to the old panel but they need to be added
   to the V4L plugin, not the wxWindows code).
parent 7a8356f8
...@@ -19,7 +19,6 @@ SOURCES_wxwindows = \ ...@@ -19,7 +19,6 @@ SOURCES_wxwindows = \
subtitles.cpp \ subtitles.cpp \
bookmarks.cpp \ bookmarks.cpp \
video.cpp \ video.cpp \
v4l.cpp \
$(NULL) $(NULL)
EXTRA_DIST += \ EXTRA_DIST += \
......
This diff is collapsed.
This diff is collapsed.
...@@ -146,7 +146,6 @@ namespace wxvlc ...@@ -146,7 +146,6 @@ namespace wxvlc
{ {
class Interface; class Interface;
class OpenDialog; class OpenDialog;
class V4LDialog;
class SoutDialog; class SoutDialog;
class SubsFileDialog; class SubsFileDialog;
class Playlist; class Playlist;
...@@ -225,7 +224,6 @@ private: ...@@ -225,7 +224,6 @@ private:
void OnOpenDisc( wxCommandEvent& event ); void OnOpenDisc( wxCommandEvent& event );
void OnOpenNet( wxCommandEvent& event ); void OnOpenNet( wxCommandEvent& event );
void OnOpenSat( wxCommandEvent& event ); void OnOpenSat( wxCommandEvent& event );
void OnOpenV4L( wxCommandEvent& event );
void OnExtended( wxCommandEvent& event ); void OnExtended( wxCommandEvent& event );
void OnBookmarks( wxCommandEvent& event ); void OnBookmarks( wxCommandEvent& event );
void OnShowDialog( wxCommandEvent& event ); void OnShowDialog( wxCommandEvent& event );
...@@ -297,7 +295,6 @@ private: ...@@ -297,7 +295,6 @@ private:
wxPanel *FilePanel( wxWindow* parent ); wxPanel *FilePanel( wxWindow* parent );
wxPanel *DiscPanel( wxWindow* parent ); wxPanel *DiscPanel( wxWindow* parent );
wxPanel *NetPanel( wxWindow* parent ); wxPanel *NetPanel( wxWindow* parent );
wxPanel *V4LPanel( wxWindow* parent );
ArrayOfAutoBuiltPanel input_tab_array; ArrayOfAutoBuiltPanel input_tab_array;
...@@ -321,11 +318,6 @@ private: ...@@ -321,11 +318,6 @@ private:
void OnNetPanelChange( wxCommandEvent& event ); void OnNetPanelChange( wxCommandEvent& event );
void OnNetTypeChange( 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 */ /* Event handlers for the stream output */
void OnSubsFileEnable( wxCommandEvent& event ); void OnSubsFileEnable( wxCommandEvent& event );
void OnSubsFileSettings( wxCommandEvent& WXUNUSED(event) ); void OnSubsFileSettings( wxCommandEvent& WXUNUSED(event) );
...@@ -375,14 +367,6 @@ private: ...@@ -375,14 +367,6 @@ private:
wxTextCtrl *net_addrs[4]; wxTextCtrl *net_addrs[4];
wxCheckBox *net_ipv6; 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 */ /* Controls for the subtitles file */
wxButton *subsfile_button; wxButton *subsfile_button;
wxCheckBox *subsfile_checkbox; wxCheckBox *subsfile_checkbox;
...@@ -407,75 +391,6 @@ enum ...@@ -407,75 +391,6 @@ enum
}; };
#define MAX_ACCESS CAPTURE_ACCESS #define MAX_ACCESS CAPTURE_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 */ /* Stream output Dialog */
enum enum
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment