no v4l tab for win32

parent d05416dc
......@@ -2,7 +2,7 @@
* open.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: open.cpp,v 1.37 2003/08/19 21:16:09 adn Exp $
* $Id: open.cpp,v 1.38 2003/08/22 14:03:40 adn Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -79,10 +79,12 @@ enum
NetPort1_Event, NetPort2_Event, NetPort3_Event,
NetAddr1_Event, NetAddr2_Event, NetAddr3_Event,
#ifndef WIN32
VideoType_Event,
VideoDevice_Event,
VideoChannel_Event,
V4LSettings_Event,
#endif
SubsFileEnable_Event,
SubsFileSettings_Event,
......@@ -129,11 +131,13 @@ BEGIN_EVENT_TABLE(OpenDialog, wxFrame)
EVT_TEXT(NetAddr2_Event, OpenDialog::OnNetPanelChange)
EVT_TEXT(NetAddr3_Event, OpenDialog::OnNetPanelChange)
#ifndef WIN32
/* Events generated by the v4l panel */
EVT_RADIOBOX(VideoType_Event, OpenDialog::OnV4LTypeChange)
EVT_TEXT(VideoDevice_Event, OpenDialog::OnV4LPanelChange)
EVT_SPINCTRL(VideoChannel_Event, OpenDialog::OnV4LPanelChange)
EVT_BUTTON(V4LSettings_Event, OpenDialog::OnV4LSettingsChange)
#endif
/* Events generated by the subtitle file buttons */
EVT_CHECKBOX(SubsFileEnable_Event, OpenDialog::OnSubsFileEnable)
......@@ -166,7 +170,9 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, wxWindow *_p_parent,
p_parent = _p_parent;
SetIcon( *p_intf->p_sys->p_icon );
file_dialog = NULL;
#ifndef WIN32
v4l_dialog = NULL;
#endif
sout_dialog = NULL;
subsfile_dialog = NULL;
demuxdump_dialog = NULL;
......@@ -271,10 +277,10 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, wxWindow *_p_parent,
#ifndef WIN32
notebook->AddPage( SatPanel( notebook ), wxU(_("Satellite")),
i_access_method == SAT_ACCESS );
#endif
notebook->AddPage( V4LPanel( notebook ), wxU(_("Video For Linux")),
i_access_method == V4L_ACCESS );
#endif
/* Update Disc panel */
wxCommandEvent dummy_event;
......@@ -284,9 +290,11 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, wxWindow *_p_parent,
dummy_event.SetId( NetRadio1_Event );
OnNetTypeChange( dummy_event );
#ifndef WIN32
/* Update v4l panel */
dummy_event.SetId( VideoType_Event );
OnV4LTypeChange( dummy_event );
#endif
/* Update MRL */
wxNotebookEvent event( wxEVT_NULL, 0, i_access_method );
......@@ -317,7 +325,9 @@ OpenDialog::~OpenDialog()
{
/* Clean up */
if( file_dialog ) delete file_dialog;
#ifndef WIN32
if( v4l_dialog ) delete v4l_dialog;
#endif
if( sout_dialog ) delete sout_dialog;
if( subsfile_dialog ) delete subsfile_dialog;
if( demuxdump_dialog ) delete demuxdump_dialog;
......@@ -533,6 +543,7 @@ wxPanel *OpenDialog::NetPanel( wxWindow* parent )
return panel;
}
#ifndef WIN32
wxPanel *OpenDialog::V4LPanel( wxWindow* parent )
{
wxPanel *panel = new wxPanel( parent, -1, wxDefaultPosition,
......@@ -587,6 +598,7 @@ wxPanel *OpenDialog::V4LPanel( wxWindow* parent )
panel->SetSizerAndFit( sizer_row );
return panel;
}
#endif
wxPanel *OpenDialog::SatPanel( wxWindow* parent )
{
......@@ -661,6 +673,7 @@ void OpenDialog::UpdateMRL( int i_access_method )
mrltemp = wxT("satellite") + demux + wxT("://");
break;
#ifndef WIN32
case V4L_ACCESS:
mrltemp = ( video_type->GetSelection() == 0 ? wxT("v4l") :
video_type->GetSelection() == 1 ? wxT("v4l") :
......@@ -681,6 +694,7 @@ void OpenDialog::UpdateMRL( int i_access_method )
}
break;
#endif
default:
break;
......@@ -743,22 +757,6 @@ void OpenDialog::OnOk( wxCommandEvent& WXUNUSED(event) )
i_total_options += subsfile_mrl.GetCount();
}
/* Get the options from the v4l dialog */
/* if( v4l_mrl.GetCount() )
{
ppsz_options = (char **)realloc( ppsz_options, sizeof(char *) *
(i_total_options + v4l_mrl.GetCount()) );
for( int j = 0; j < (int)v4l_mrl.GetCount(); j++ )
{
ppsz_options[i_total_options + j] =
strdup( v4l_mrl[j].mb_str() );
}
i_total_options += v4l_mrl.GetCount();
}
*/
/* Get the options from the stream output dialog */
if( sout_checkbox->IsChecked() && sout_mrl.GetCount() )
{
......@@ -927,6 +925,7 @@ void OpenDialog::OnNetTypeChange( wxCommandEvent& event )
UpdateMRL( NET_ACCESS );
}
#ifndef WIN32
/*****************************************************************************
* v4l panel event methods.
*****************************************************************************/
......@@ -972,6 +971,7 @@ void OpenDialog::OnV4LSettingsChange( wxCommandEvent& WXUNUSED(event) )
UpdateMRL( V4L_ACCESS );
}
#endif
/*****************************************************************************
* Subtitles file event methods.
......
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