*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
#include "dialogs/preferences_widgets.h"
#include "dialogs/subtitles.hpp"
-#include "charset.h"
+#include "vlc_charset.h"
-//#undef HAVE_LIBCDIO // Disable-cruft
+#undef HAVE_LIBCDIO // Disable broken code
#ifdef HAVE_LIBCDIO
#include <cdio/cdio.h>
#include <wx/statline.h>
#include <wx/tokenzr.h>
-#include <vector>
-
-
#ifndef wxRB_SINGLE
# define wxRB_SINGLE 0
#endif
intf_thread_t *_p_intf,
const module_t *p_module )
: wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize ),
- name( wxU(p_module->psz_object_name) ),
+ name( wxU(module_get_object(p_module)) ),
p_advanced_mrl_combo( NULL ),
p_intf( _p_intf ), p_open_dialog( dialog ), p_advanced_dialog( NULL )
{
wxBoxSizer *sizer = new wxBoxSizer( wxVERTICAL );
- module_config_t *p_item = p_module->p_config;
bool b_advanced = false;
+ unsigned int i_confsize;
+ module_config_t *p_config;
+ int n;
- if( p_item ) do
+ p_config = module_config_get (p_module, &i_confsize);
+ for( n = 0; n < i_confsize; n++ )
{
+ module_config_t *p_item = p_config + n;
if( !(p_item->i_type & CONFIG_HINT) && p_item->b_advanced )
b_advanced = true;
sizer->Add( control, 0, wxEXPAND | wxALL, 2 );
}
- while( p_item->i_type != CONFIG_HINT_END && p_item++ );
if( b_advanced )
{
/* Build the advanced dialog */
p_advanced_dialog =
new wxDialog( this, -1, ((wxString)wxU(_("Advanced options"))) +
- wxT(" (") + wxU( p_module->psz_longname ) + wxT(")"),
- wxDefaultPosition, wxDefaultSize,
+ wxT(" (") + wxU( module_GetLongName(p_module) ) +
+ wxT(")"), wxDefaultPosition, wxDefaultSize,
wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER );
wxBoxSizer *sizer = new wxBoxSizer( wxVERTICAL );
sizer->Add( mrl_sizer_sizer, 0, wxEXPAND | wxALL, 2 );
/* Add advanced options to panel */
- module_config_t *p_item = p_module->p_config;
- if( p_item ) do
+ for( n = 0; n < i_confsize; n++ )
{
+ module_config_t *p_item = p_config + n;
if( p_item->i_type & CONFIG_HINT || !p_item->b_advanced )
continue;
sizer->Add( control, 0, wxEXPAND | wxALL, 2 );
}
- while( p_item->i_type != CONFIG_HINT_END && p_item++ );
/* Separation */
wxPanel *dummy_panel = new wxPanel( p_advanced_dialog, -1 );
/* Create buttons */
wxButton *ok_button =
- new wxButton( p_advanced_dialog, wxID_OK, wxU(_("OK")) );
+ new wxButton( p_advanced_dialog, wxID_OK, wxU(_("&OK")) );
ok_button->SetDefault();
wxButton *cancel_button =
- new wxButton( p_advanced_dialog, wxID_CANCEL, wxU(_("Cancel")) );
- wxBoxSizer *button_sizer = new wxBoxSizer( wxHORIZONTAL );
- button_sizer->Add( ok_button, 0, wxALL, 5 );
- button_sizer->Add( cancel_button, 0, wxALL, 5 );
- button_sizer->Layout();
- sizer->Add( button_sizer, 0, wxALL, 0 );
+ new wxButton( p_advanced_dialog, wxID_CANCEL, wxU(_("&Cancel")) );
+ wxStdDialogButtonSizer *button_sizer = new wxStdDialogButtonSizer;
+ button_sizer->AddButton( ok_button );
+ button_sizer->AddButton( cancel_button );
+ button_sizer->Realize();
+ sizer->Add( button_sizer, 0, wxEXPAND|wxALL, 5 );
sizer->SetMinSize( 400, -1 );
p_advanced_dialog->SetSizerAndFit( sizer );
}
+ module_config_free (p_config);
+
this->SetSizerAndFit( sizer );
}
/* Create Stream Output checkox */
sout_checkbox = new wxCheckBox( panel, SoutEnable_Event,
wxU(_("Stream/Save")) );
- sout_checkbox->SetToolTip( wxU(_("Use VLC as a server of streams")) );
+ sout_checkbox->SetToolTip( wxU(_("Use VLC as a stream server")) );
common_opt_sizer->Add( sout_checkbox, 0,
wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
sout_button->Enable();
subsfile_mrl.Add( wxString(wxT("sout=")) + wxL2U(psz_sout) );
}
- if( psz_sout ) free( psz_sout );
+ free( psz_sout );
common_opt_sizer->Add( sout_button, 1, wxALIGN_LEFT |
wxALIGN_CENTER_VERTICAL );
wxStaticLine *static_line = new wxStaticLine( panel, wxID_OK );
/* Create the buttons */
- wxButton *ok_button = new wxButton( panel, wxID_OK, wxU(_("OK")) );
+ wxButton *ok_button = new wxButton( panel, wxID_OK, wxU(_("&OK")) );
ok_button->SetDefault();
wxButton *cancel_button = new wxButton( panel, wxID_CANCEL,
- wxU(_("Cancel")) );
+ wxU(_("&Cancel")) );
/* Create notebook */
notebook = new wxNotebook( panel, Notebook_Event );
notebook->AddPage( NetPanel( notebook ), wxU(_("Network")),
i_access_method == NET_ACCESS );
- module_t *p_module = config_FindModule( VLC_OBJECT(p_intf), "v4l" );
- if( p_module )
+ if( module_exists( "v4l" ) )
{
AutoBuiltPanel *autopanel =
new AutoBuiltPanel( notebook, this, p_intf, p_module );
input_tab_array.Add( autopanel );
- notebook->AddPage( autopanel, wxU( p_module->psz_shortname ?
- p_module->psz_shortname : p_module->psz_object_name ),
+ notebook->AddPage( autopanel, wxU( module_get_name(p_module, 0) ),
i_access_method == CAPTURE_ACCESS );
}
- p_module = config_FindModule( VLC_OBJECT(p_intf), "pvr" );
- if( p_module )
+ if( module_exists( "pvr" ) )
{
AutoBuiltPanel *autopanel =
new AutoBuiltPanel( notebook, this, p_intf, p_module );
input_tab_array.Add( autopanel );
- notebook->AddPage( autopanel, wxU( p_module->psz_shortname ?
- p_module->psz_shortname : p_module->psz_object_name ),
+ notebook->AddPage( autopanel, wxU( module_get_name(p_module, 0) ),
i_access_method == CAPTURE_ACCESS );
}
- p_module = config_FindModule( VLC_OBJECT(p_intf), "dvb" );
- if( p_module )
+ if( module_exists( "dvb" ) )
{
AutoBuiltPanel *autopanel =
new AutoBuiltPanel( notebook, this, p_intf, p_module );
input_tab_array.Add( autopanel );
- notebook->AddPage( autopanel, wxU( p_module->psz_shortname ?
- p_module->psz_shortname : p_module->psz_object_name ),
+ notebook->AddPage( autopanel, wxU( module_get_name(p_module, 0) ),
i_access_method == CAPTURE_ACCESS );
}
- p_module = config_FindModule( VLC_OBJECT(p_intf), "dshow" );
- if( p_module )
+ if( module_exists( "dshow" ) )
{
AutoBuiltPanel *autopanel =
new AutoBuiltPanel( notebook, this, p_intf, p_module );
input_tab_array.Add( autopanel );
- notebook->AddPage( autopanel, wxU( p_module->psz_shortname ?
- p_module->psz_shortname : p_module->psz_object_name ),
+ notebook->AddPage( autopanel, wxU( module_get_name(p_module, 0) ),
i_access_method == CAPTURE_ACCESS );
}
OnPageChange( event );
/* Place everything in sizers */
- wxBoxSizer *button_sizer = new wxBoxSizer( wxHORIZONTAL );
- button_sizer->Add( ok_button, 0, wxALL, 5 );
- button_sizer->Add( cancel_button, 0, wxALL, 5 );
- button_sizer->Layout();
+ wxStdDialogButtonSizer *button_sizer = new wxStdDialogButtonSizer;
+ button_sizer->AddButton( cancel_button );
+ button_sizer->AddButton( ok_button );
+ button_sizer->Realize();
wxBoxSizer *main_sizer = new wxBoxSizer( wxVERTICAL );
wxBoxSizer *panel_sizer = new wxBoxSizer( wxVERTICAL );
#if (!wxCHECK_VERSION(2,5,2))
#endif
panel_sizer->Add( adv_sizer, 0, wxEXPAND | wxALL, 5 );
panel_sizer->Add( static_line, 0, wxEXPAND | wxALL, 5 );
- panel_sizer->Add( button_sizer, 0, wxALIGN_LEFT | wxALL, 5 );
+ panel_sizer->Add( button_sizer, 0, wxEXPAND | wxALL, 5 );
panel_sizer->Layout();
panel->SetSizerAndFit( panel_sizer );
main_sizer->Add( panel, 1, wxGROW, 0 );
OpenDialog::~OpenDialog()
{
/* Clean up */
- if( file_dialog ) delete file_dialog;
- if( sout_dialog ) delete sout_dialog;
- if( subsfile_dialog ) delete subsfile_dialog;
+ delete file_dialog;
+ delete sout_dialog;
+ delete subsfile_dialog;
}
int OpenDialog::Show( int i_access_method, int i_arg )
0, wxALIGN_CENTER_VERTICAL | wxALL, 5 );
subfile_combo = new wxComboBox( panel, SubFileName_Event,
wxL2U( psz_subsfile ) );
- if( psz_subsfile ) free( psz_subsfile );
+ free( psz_subsfile );
subbrowse_button = new wxButton( panel, SubFileBrowse_Event,
wxU(_("Browse...")) );
subfile_sizer->Add( subfile_combo, 1, wxALL | wxALIGN_CENTER_VERTICAL, 5 );
#ifdef WIN32
char psz_default_device[3] = {0};
+ char *psz_forced;
/* find the drive_name for the first cdrom drive,
* which is probably "D:" and put the drive_name into
}
}
+ psz_forced = config_GetPsz( p_intf, "dvd" );
- if( strlen(psz_default_device) > 0 )
+ if( strlen(psz_default_device) > 0 &&
+ ( !psz_forced || psz_forced && !*psz_forced ) )
{
if(disc_device)
disc_device->SetValue( wxL2U(psz_default_device) );
{
case 0: /* DVD with menus */
case 1: /* DVD without menus */
- disc_device->SetToolTip( wxU(_("Name of DVD device "
- "to read from.")) );
+ disc_device->SetToolTip( wxU(_("DVD device to use" ) ) );
if( i_disc_type_selection == 0 )
{
mrltemp = wxT("dvd://") + disc_device->GetValue();
config_GetInt( p_intf, "vcdx-PBC" )
? 'P' : 'E', i_disc_title );
#else
- disc_device->SetToolTip( wxU(_("Name of CD-ROM device "
- "to read Video CD from.")) );
+ disc_device->SetToolTip( wxU(_("CD-ROM device to use" ) ) );
mrltemp = wxT("vcd://") + disc_device->GetValue();
if( i_disc_title > 0 )
mrltemp += wxString::Format( wxT("@%d"), i_disc_title );
"for a CD-ROM with an audio CD in it." )) );
mrltemp = wxT("cddax://")
#else
- disc_device->SetToolTip( wxU(_("Name of CD-ROM device "
- "to read audio CD from." )) );
+ disc_device->SetToolTip( wxU(_("CD-ROM device to use" ) ) ) ;
mrltemp = wxT("cdda://")
#endif
+ disc_device->GetValue();
mrltemp = wxT("http://");
mrltemp += net_addrs[2]->GetLineText(0);
-
- caching_name = wxT("http-caching");
+ if( ! mrltemp.Left(4).CmpNoCase(wxT("http")) )
+ caching_name = wxT("http-caching");
+ else if( ! mrltemp.Left(3).CmpNoCase(wxT("mms")) )
+ caching_name = wxT("mms-caching");
+ else
+ caching_name= wxT("ftp-caching");
break;
case 3:
}
else
{
- int i_value = config_GetInt( p_intf, caching_name.mb_str() );
+ int i_value = config_GetInt( p_intf, caching_name.mb_str(wxConvUTF8) );
caching_value->SetValue( i_value );
}
}
}
/* Update the playlist */
- playlist_t *p_playlist =
- (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
+ playlist_t *p_playlist = pl_Hold( p_intf );
if( p_playlist == NULL ) return;
for( int i = 0; i < (int)mrl.GetCount(); i++ )
{
- vlc_bool_t b_start = !i && i_open_arg;
- playlist_item_t *p_item;
+ bool b_start = !i && i_open_arg;
+ input_item_t *p_input;
char *psz_utf8;
psz_utf8 = wxFromLocale( mrl[i] );
- p_item = playlist_ItemNew( p_intf, psz_utf8, psz_utf8 );
+ p_input = input_item_New( p_intf, psz_utf8, NULL );
wxLocaleFree( psz_utf8 );
/* Insert options */
while( i + 1 < (int)mrl.GetCount() &&
- ((const char *)mrl[i + 1].mb_str())[0] == ':' )
+ ((const char *)mrl[i + 1].mb_str(wxConvUTF8))[0] == ':' )
{
psz_utf8 = wxFromLocale( mrl[i + 1] );
- playlist_ItemAddOption( p_item, psz_utf8 );
+ input_item_AddOption( p_input, psz_utf8, VLC_INPUT_OPTION_TRUSTED );
wxLocaleFree( psz_utf8 );
i++;
}
for( int j = 0; j < (int)subsfile_mrl.GetCount(); j++ )
{
psz_utf8 = wxFromLocale( subsfile_mrl[j] );
- playlist_ItemAddOption( p_item, psz_utf8 );
+ input_item_AddOption( p_input, psz_utf8, VLC_INPUT_OPTION_TRUSTED );
wxLocaleFree( psz_utf8 );
}
}
for( int j = 0; j < (int)sout_mrl.GetCount(); j++ )
{
psz_utf8 = wxFromLocale( sout_mrl[j] );
- playlist_ItemAddOption( p_item, psz_utf8 );
+ input_item_AddOption( p_input, psz_utf8, VLC_INPUT_OPTION_TRUSTED );
wxLocaleFree( psz_utf8 );
}
}
- playlist_AddItem( p_playlist, p_item, PLAYLIST_APPEND, PLAYLIST_END );
-
- if( b_start )
- {
- playlist_Control( p_playlist, PLAYLIST_ITEMPLAY, p_item );
- }
+ /* FIXME: playlist_AddInput() can fail */
+ playlist_AddInput( p_playlist, p_input,
+ PLAYLIST_APPEND | ( b_start ? PLAYLIST_GO : PLAYLIST_PREPARSE ),
+ PLAYLIST_END, true, pl_Unlocked );
+ vlc_gc_decref( p_input );
}
-
- vlc_object_release( p_playlist );
+ pl_Release( p_intf );
Hide();
file_dialog = new wxFileDialog( this, wxU(_("Open File")),
wxT(""), wxT(""), wxT("*"), wxOPEN | wxMULTIPLE );
+ 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( file_dialog && file_dialog->ShowModal() == wxID_OK )
{
wxArrayString paths;
break;
}
- free(psz_device);
+ free( psz_device );
disc_probe->SetValue(FALSE);
UpdateMRL( DISC_ACCESS );
disc_chapter->SetRange( 0, 255 );
disc_title->SetToolTip( wxU(_("Title number.")) );
disc_sub->SetToolTip( wxU(_(
- "DVD's can have up to 32 subtitles numbered 0..31. "
- "Note this is not the same thing as a subtitle name e.g. 'en'. "
+ "DVDs can have up to 32 subtitles numbered 0..31. "
+ "Note this is not the same thing as a subtitle name (e.g. 'en'). "
"If a value -1 is used, no subtitle will be shown." )) );
disc_audio->SetToolTip( wxU(_("Audio track number. "
- "DVD's can have up to 8 audio tracks numbered 0..7."
+ "DVDs can have up to 8 audio tracks numbered 0..7."
)) );
break;
disc_sub->SetRange( -1, 3 ); // up to 4 subtitles -1 = no subtitle
disc_audio->SetRange( 0, 1 ); // up to 2 audio tracks
disc_sub->SetToolTip( wxU(_(
- "SVCD's can have up to 4 subtitles numbered 0..3. "
+ "SVCDs can have up to 4 subtitles numbered 0..3. "
"If a value -1 is used, no subtitle will be shown." )) );
disc_audio->SetToolTip( wxU(_("Audio track number. "
- "VCD's can have up to 2 audio tracks numbered 0 or 1. "
+ "VCDs can have up to 2 audio tracks numbered 0 or 1. "
)) );
break;
disc_title->SetValue( 0 ); i_disc_title = 0;
disc_chapter->SetValue( 0 ); i_disc_chapter = 0;
- if( psz_device ) free( psz_device );
+ free( psz_device );
UpdateMRL( DISC_ACCESS );
}
if( subsfile_dialog->align_combo )
{
subsfile_mrl.Add( wxString::Format(wxT("subsdec-align=%i"),
- (int)subsfile_dialog->align_combo->GetClientData(
- subsfile_dialog->align_combo->GetSelection()) ) );
+ (int)subsfile_dialog->align_combo->GetClientData(
+ subsfile_dialog->align_combo->GetSelection()) ) );
}
if( subsfile_dialog->size_combo )
{
subsfile_mrl.Add( wxString::Format( wxT("freetype-rel-fontsize=%i"),
- (int)subsfile_dialog->size_combo->GetClientData(
- subsfile_dialog->size_combo->GetSelection()) ) );
+ (int)subsfile_dialog->size_combo->GetClientData(
+ subsfile_dialog->size_combo->GetSelection()) ) );
}
- subsfile_mrl.Add( wxString::Format( wxT("sub-fps=%i"),
- subsfile_dialog->fps_spinctrl->GetValue() ) );
+ subsfile_mrl.Add( wxString( wxT("sub-fps="))+
+ subsfile_dialog->fps_ctrl->GetValue() );
subsfile_mrl.Add( wxString::Format( wxT("sub-delay=%i"),
subsfile_dialog->delay_spinctrl->GetValue() ) );
}
*****************************************************************************/
wxArrayString SeparateEntries( wxString entries )
{
- vlc_bool_t b_quotes_mode = VLC_FALSE;
+ bool b_quotes_mode = false;
wxArrayString entries_array;
wxString entry;
{
/* Enters quotes mode */
entry.RemoveLast();
- b_quotes_mode = VLC_TRUE;
+ b_quotes_mode = true;
}
else if( b_quotes_mode && entry.Last() == wxT('\"') )
{
/* Finished the quotes mode */
entry.RemoveLast();
- b_quotes_mode = VLC_FALSE;
+ b_quotes_mode = false;
}
else if( !b_quotes_mode && entry.Last() != wxT('\"') )
{
projects / vlc / blobdiff