Skip to content

V
vlc-1.1
Commit 409095fb authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options 

* modules/gui/wxwindows/*: new subtitles file dialog box.
* modules/demux/util/sub.c: fixed a few description strings.
* Makefile.am: small cosmetic change to package-win32 target.
parent d47392b8
Hide whitespace changes
Inline Side-by-side
Showing with 121 additions and 19 deletions
Makefile.am
View file @ 409095fb
...@@ -516,8 +516,8 @@ package-win32: ...@@ -516,8 +516,8 @@ package-win32:
# Create installation script # Create installation script
cp install-win32 tmp/nsi cp install-win32 tmp/nsi
# Copy relevant files # Copy relevant files
cp vlc.exe tmp/ cp vlc$(EXEEXT) tmp/
$(STRIP) tmp/vlc.exe $(STRIP) tmp/vlc$(EXEEXT)
cp INSTALL.win32 tmp/INSTALL.txt ; unix2dos tmp/INSTALL.txt cp INSTALL.win32 tmp/INSTALL.txt ; unix2dos tmp/INSTALL.txt
for file in AUTHORS MAINTAINERS THANKS NEWS COPYING README ; \ for file in AUTHORS MAINTAINERS THANKS NEWS COPYING README ; \
do cp $$file tmp/$${file}.txt ; \ do cp $$file tmp/$${file}.txt ; \
......
modules/demux/util/sub.c
View file @ 409095fb
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* sub.c * sub.c
***************************************************************************** *****************************************************************************
* Copyright (C) 1999-2001 VideoLAN * Copyright (C) 1999-2001 VideoLAN
* $Id: sub.c,v 1.14 2003/05/11 14:33:32 sigmunau Exp $ * $Id: sub.c,v 1.15 2003/05/13 22:33:33 gbazin Exp $
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* *
...@@ -59,28 +59,29 @@ static char *ppsz_sub_type[] = { "microdvd", "subrip", "ssa1", "ssa2-4", "vplaye ...@@ -59,28 +59,29 @@ static char *ppsz_sub_type[] = { "microdvd", "subrip", "ssa1", "ssa2-4", "vplaye
/***************************************************************************** /*****************************************************************************
* Module descriptor * Module descriptor
*****************************************************************************/ *****************************************************************************/
#define SUB_DELAY_LONGTEXT \
"Delay subtitles (in 1/10s)"
#define SUB_FPS_LONGTEXT \ #define SUB_FPS_LONGTEXT \
"Override frames per second. " \ "Override frames per second. " \
"It will work only with MicroDVD" "It will only work with MicroDVD subtitles."
#define SUB_TYPE_LONGTEXT \ #define SUB_TYPE_LONGTEXT \
"One from \"microdvd\", \"subrip\", \"ssa1\", \"ssa2-4\", \"vplayer\" \"sami\"" \ "One from \"microdvd\", \"subrip\", \"ssa1\", \"ssa2-4\", \"vplayer\" " \
"(nothing for autodetection, it should always work)" "\"sami\" (nothing for autodetection, it should always work)."
vlc_module_begin(); vlc_module_begin();
set_description( _("text subtitle demux") ); set_description( _("Text subtitles demux") );
set_capability( "subtitle demux", 12 ); set_capability( "subtitle demux", 12 );
add_category_hint( "subtitle", NULL, VLC_TRUE ); add_category_hint( "Subtitles", NULL, VLC_TRUE );
add_file( "sub-file", NULL, NULL, add_file( "sub-file", NULL, NULL,
"subtitle file name", "subtitle file name", VLC_TRUE ); "Subtitles file name", "Subtitles file name", VLC_TRUE );
add_float( "sub-fps", 0.0, NULL, add_float( "sub-fps", 0.0, NULL,
"override frames per second", "Frames per second",
SUB_FPS_LONGTEXT, VLC_TRUE ); SUB_FPS_LONGTEXT, VLC_TRUE );
add_integer( "sub-delay", 0, NULL, add_integer( "sub-delay", 0, NULL,
"delay subtitles (in 1/10s)", "Delay subtitles (in 1/10s)",
"delay subtitles (in 1/10s)", VLC_TRUE ); SUB_DELAY_LONGTEXT, VLC_TRUE );
add_string_from_list( "sub-type", NULL, ppsz_sub_type, NULL, add_string_from_list( "sub-type", NULL, ppsz_sub_type, NULL,
"subtitle type", "subtitles type",
SUB_TYPE_LONGTEXT, VLC_TRUE ); SUB_TYPE_LONGTEXT, VLC_TRUE );
set_callbacks( Open, NULL ); set_callbacks( Open, NULL );
vlc_module_end(); vlc_module_end();
......
modules/gui/wxwindows/Modules.am
View file @ 409095fb
...@@ -10,6 +10,7 @@ SOURCES_wxwindows = \ ...@@ -10,6 +10,7 @@ SOURCES_wxwindows = \
modules/gui/wxwindows/preferences.cpp \ modules/gui/wxwindows/preferences.cpp \
modules/gui/wxwindows/timer.cpp \ modules/gui/wxwindows/timer.cpp \
modules/gui/wxwindows/fileinfo.cpp \ modules/gui/wxwindows/fileinfo.cpp \
modules/gui/wxwindows/subtitles.cpp \
$(NULL) $(NULL)
EXTRA_DIST += \ EXTRA_DIST += \
......
modules/gui/wxwindows/open.cpp
View file @ 409095fb
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* open.cpp : wxWindows plugin for vlc * open.cpp : wxWindows plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000-2001 VideoLAN * Copyright (C) 2000-2001 VideoLAN
* $Id: open.cpp,v 1.20 2003/05/12 21:55:01 gbazin Exp $ * $Id: open.cpp,v 1.21 2003/05/13 22:33:33 gbazin Exp $
* *
* Authors: Gildas Bazin <gbazin@netcourrier.com> * Authors: Gildas Bazin <gbazin@netcourrier.com>
* *
...@@ -82,6 +82,9 @@ enum ...@@ -82,6 +82,9 @@ enum
NetPort1_Event, NetPort2_Event, NetPort3_Event, NetPort1_Event, NetPort2_Event, NetPort3_Event,
NetAddr1_Event, NetAddr2_Event, NetAddr3_Event, NetAddr1_Event, NetAddr2_Event, NetAddr3_Event,
SubsFileEnable_Event,
SubsFileSettings_Event,
SoutEnable_Event, SoutEnable_Event,
SoutSettings_Event, SoutSettings_Event,
...@@ -124,6 +127,10 @@ BEGIN_EVENT_TABLE(OpenDialog, wxDialog) ...@@ -124,6 +127,10 @@ BEGIN_EVENT_TABLE(OpenDialog, wxDialog)
EVT_TEXT(NetAddr2_Event, OpenDialog::OnNetPanelChange) EVT_TEXT(NetAddr2_Event, OpenDialog::OnNetPanelChange)
EVT_TEXT(NetAddr3_Event, OpenDialog::OnNetPanelChange) EVT_TEXT(NetAddr3_Event, OpenDialog::OnNetPanelChange)
/* Events generated by the subtitle file buttons */
EVT_CHECKBOX(SubsFileEnable_Event, OpenDialog::OnSubsFileEnable)
EVT_BUTTON(SubsFileSettings_Event, OpenDialog::OnSubsFileSettings)
/* Events generated by the stream output buttons */ /* Events generated by the stream output buttons */
EVT_CHECKBOX(SoutEnable_Event, OpenDialog::OnSoutEnable) EVT_CHECKBOX(SoutEnable_Event, OpenDialog::OnSoutEnable)
EVT_BUTTON(SoutSettings_Event, OpenDialog::OnSoutSettings) EVT_BUTTON(SoutSettings_Event, OpenDialog::OnSoutSettings)
...@@ -177,6 +184,29 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, wxWindow *_p_parent, ...@@ -177,6 +184,29 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, wxWindow *_p_parent,
wxU(_("Alternatively, you can build an MRL using one of the " wxU(_("Alternatively, you can build an MRL using one of the "
"following predefined targets:")) ); "following predefined targets:")) );
/* Create Subtitles File checkox */
wxFlexGridSizer *subsfile_sizer = new wxFlexGridSizer( 2, 1, 20 );
subsfile_checkbox = new wxCheckBox( panel, SubsFileEnable_Event,
wxU(_("Subtitles file")) );
subsfile_checkbox->SetToolTip( wxU(_("Load an additional subtitles file. "
"Currently only works with AVI files.")) );
subsfile_sizer->Add( subsfile_checkbox, 0,
wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
subsfile_button = new wxButton( panel, SubsFileSettings_Event,
wxU(_("Settings...")) );
subsfile_button->Disable();
char *psz_subsfile = config_GetPsz( p_intf, "sub-file" );
if( psz_subsfile && *psz_subsfile )
{
subsfile_checkbox->SetValue(TRUE);
subsfile_button->Enable();
}
if( psz_subsfile ) free( psz_subsfile );
subsfile_sizer->Add( subsfile_button, 1,
wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL );
/* Create Stream Output checkox */ /* Create Stream Output checkox */
wxFlexGridSizer *sout_sizer = new wxFlexGridSizer( 2, 1, 20 ); wxFlexGridSizer *sout_sizer = new wxFlexGridSizer( 2, 1, 20 );
sout_checkbox = new wxCheckBox( panel, SoutEnable_Event, sout_checkbox = new wxCheckBox( panel, SoutEnable_Event,
...@@ -220,10 +250,10 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, wxWindow *_p_parent, ...@@ -220,10 +250,10 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, wxWindow *_p_parent,
demuxdump_textctrl->Disable(); demuxdump_textctrl->Disable();
demuxdump_button->Disable(); demuxdump_button->Disable();
demuxdump_sizer->Add( demuxdump_checkbox, 0, demuxdump_sizer->Add( demuxdump_checkbox, 0,
wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL, 10 ); wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL );
demuxdump_sizer->Add( demuxdump_button, 0, demuxdump_sizer->Add( demuxdump_button, 0,
wxALL | wxALIGN_CENTER_VERTICAL, 10 ); wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL, 10 );
demuxdump_sizer->Add( demuxdump_textctrl, 1, wxALL, 10 ); demuxdump_sizer->Add( demuxdump_textctrl, 1, wxRIGHT, 10 );
/* Separation */ /* Separation */
wxStaticLine *static_line = new wxStaticLine( panel, wxID_OK ); wxStaticLine *static_line = new wxStaticLine( panel, wxID_OK );
...@@ -271,6 +301,7 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, wxWindow *_p_parent, ...@@ -271,6 +301,7 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, wxWindow *_p_parent,
panel_sizer->Add( mrl_sizer_sizer, 0, wxEXPAND, 5 ); panel_sizer->Add( mrl_sizer_sizer, 0, wxEXPAND, 5 );
panel_sizer->Add( label, 0, wxEXPAND | wxALL, 5 ); panel_sizer->Add( label, 0, wxEXPAND | wxALL, 5 );
panel_sizer->Add( notebook_sizer, 1, wxEXPAND | wxALL, 5 ); panel_sizer->Add( notebook_sizer, 1, wxEXPAND | wxALL, 5 );
panel_sizer->Add( subsfile_sizer, 0, wxALIGN_LEFT | wxALL, 5 );
panel_sizer->Add( sout_sizer, 0, wxALIGN_LEFT | wxALL, 5 ); panel_sizer->Add( sout_sizer, 0, wxALIGN_LEFT | wxALL, 5 );
panel_sizer->Add( demuxdump_sizer, 0, wxEXPAND | wxALIGN_LEFT | wxALL, 5 ); panel_sizer->Add( demuxdump_sizer, 0, wxEXPAND | wxALIGN_LEFT | wxALL, 5 );
panel_sizer->Add( static_line, 0, wxEXPAND | wxALL, 5 ); panel_sizer->Add( static_line, 0, wxEXPAND | wxALL, 5 );
...@@ -635,6 +666,41 @@ void OpenDialog::OnNetTypeChange( wxCommandEvent& event ) ...@@ -635,6 +666,41 @@ void OpenDialog::OnNetTypeChange( wxCommandEvent& event )
UpdateMRL( NET_ACCESS ); UpdateMRL( NET_ACCESS );
} }
/*****************************************************************************
* Subtitles file event methods.
*****************************************************************************/
void OpenDialog::OnSubsFileEnable( wxCommandEvent& event )
{
subsfile_button->Enable( event.GetInt() != 0 );
if( !event.GetInt() )
{
config_PutPsz( p_intf, "sub-file", "" );
}
else
{
demuxdump_checkbox->SetValue( 0 );
wxCommandEvent event = wxCommandEvent( wxEVT_NULL );
event.SetInt( 0 );
OnDemuxDumpEnable( event );
}
}
void OpenDialog::OnSubsFileSettings( wxCommandEvent& WXUNUSED(event) )
{
/* Show/hide the open dialog */
SubsFileDialog dialog( p_intf, p_parent );
if( dialog.ShowModal() == wxID_OK )
{
config_PutPsz( p_intf, "sub-file",
(const char *)dialog.file_combo->GetValue().mb_str() );
config_PutInt( p_intf, "sub-delay",
dialog.delay_spinctrl->GetValue() );
config_PutFloat( p_intf, "sub-fps",
dialog.fps_spinctrl->GetValue() );
}
}
/***************************************************************************** /*****************************************************************************
* Stream output event methods. * Stream output event methods.
*****************************************************************************/ *****************************************************************************/
...@@ -676,9 +742,11 @@ void OpenDialog::OnDemuxDumpEnable( wxCommandEvent& event ) ...@@ -676,9 +742,11 @@ void OpenDialog::OnDemuxDumpEnable( wxCommandEvent& event )
if( event.GetInt() ) if( event.GetInt() )
{ {
sout_checkbox->SetValue( 0 ); sout_checkbox->SetValue( 0 );
subsfile_checkbox->SetValue( 0 );
wxCommandEvent event = wxCommandEvent( wxEVT_NULL ); wxCommandEvent event = wxCommandEvent( wxEVT_NULL );
event.SetInt( 0 ); event.SetInt( 0 );
OnSoutEnable( event ); OnSoutEnable( event );
OnSubsFileEnable( event );
} }
UpdateMRL( i_current_access_method ); UpdateMRL( i_current_access_method );
......
modules/gui/wxwindows/wxwindows.h
View file @ 409095fb
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* wxwindows.h: private wxWindows interface description * wxwindows.h: private wxWindows interface description
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN * Copyright (C) 1999, 2000 VideoLAN
* $Id: wxwindows.h,v 1.23 2003/05/12 17:33:19 gbazin Exp $ * $Id: wxwindows.h,v 1.24 2003/05/13 22:33:33 gbazin Exp $
* *
* Authors: Gildas Bazin <gbazin@netcourrier.com> * Authors: Gildas Bazin <gbazin@netcourrier.com>
* *
...@@ -225,6 +225,10 @@ private: ...@@ -225,6 +225,10 @@ private:
void OnNetPanelChange( wxCommandEvent& event ); void OnNetPanelChange( wxCommandEvent& event );
void OnNetTypeChange( wxCommandEvent& event ); void OnNetTypeChange( wxCommandEvent& event );
/* Event handlers for the stream output */
void OnSubsFileEnable( wxCommandEvent& event );
void OnSubsFileSettings( wxCommandEvent& WXUNUSED(event) );
/* Event handlers for the stream output */ /* Event handlers for the stream output */
void OnSoutEnable( wxCommandEvent& event ); void OnSoutEnable( wxCommandEvent& event );
void OnSoutSettings( wxCommandEvent& WXUNUSED(event) ); void OnSoutSettings( wxCommandEvent& WXUNUSED(event) );
...@@ -259,6 +263,10 @@ private: ...@@ -259,6 +263,10 @@ private:
wxSpinCtrl *net_ports[4]; wxSpinCtrl *net_ports[4];
wxTextCtrl *net_addrs[4]; wxTextCtrl *net_addrs[4];
/* Controls for the subtitles file */
wxButton *subsfile_button;
wxCheckBox *subsfile_checkbox;
/* Controls for the stream output */ /* Controls for the stream output */
wxButton *sout_button; wxButton *sout_button;
wxCheckBox *sout_checkbox; wxCheckBox *sout_checkbox;
...@@ -334,6 +342,30 @@ private: ...@@ -334,6 +342,30 @@ private:
}; };
/* Subtitles File Dialog */
class SubsFileDialog: public wxDialog
{
public:
/* Constructor */
SubsFileDialog( intf_thread_t *p_intf, wxWindow *p_parent );
virtual ~SubsFileDialog();
wxComboBox *file_combo;
wxSpinCtrl *delay_spinctrl;
wxSpinCtrl *fps_spinctrl;
private:
/* Event handlers (these functions should _not_ be virtual) */
void OnOk( wxCommandEvent& event );
void OnCancel( wxCommandEvent& event );
void OnFileBrowse( wxCommandEvent& event );
DECLARE_EVENT_TABLE();
intf_thread_t *p_intf;
wxWindow *p_parent;
};
/* Preferences Dialog */ /* Preferences Dialog */
class PrefsTreeCtrl; class PrefsTreeCtrl;
class PrefsDialog: public wxFrame class PrefsDialog: public wxFrame
......
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