Commit 3b44fa8c authored by Christophe Mutricy's avatar Christophe Mutricy

sub_fps is a float and need to be a float. Don't loose precision if the subtitles dialog is opened.

parent 1ce34fd0
...@@ -1838,8 +1838,8 @@ void OpenDialog::OnSubsFileSettings( wxCommandEvent& WXUNUSED(event) ) ...@@ -1838,8 +1838,8 @@ void OpenDialog::OnSubsFileSettings( wxCommandEvent& WXUNUSED(event) )
(int)subsfile_dialog->size_combo->GetClientData( (int)subsfile_dialog->size_combo->GetClientData(
subsfile_dialog->size_combo->GetSelection()) ) ); subsfile_dialog->size_combo->GetSelection()) ) );
} }
subsfile_mrl.Add( wxString::Format( wxT("sub-fps=%i"), subsfile_mrl.Add( wxString( wxT("sub-fps="))+
subsfile_dialog->fps_spinctrl->GetValue() ) ); subsfile_dialog->fps_ctrl->GetValue() );
subsfile_mrl.Add( wxString::Format( wxT("sub-delay=%i"), subsfile_mrl.Add( wxString::Format( wxT("sub-delay=%i"),
subsfile_dialog->delay_spinctrl->GetValue() ) ); subsfile_dialog->delay_spinctrl->GetValue() ) );
} }
......
...@@ -201,17 +201,14 @@ SubsFileDialog::SubsFileDialog( intf_thread_t *_p_intf, wxWindow* _p_parent ): ...@@ -201,17 +201,14 @@ SubsFileDialog::SubsFileDialog( intf_thread_t *_p_intf, wxWindow* _p_parent ):
wxStaticText *label = wxStaticText *label =
new wxStaticText(panel, -1, wxU(_("Frames per second"))); new wxStaticText(panel, -1, wxU(_("Frames per second")));
float f_fps = config_GetFloat( p_intf, "sub-fps" ); fps_ctrl = new wxTextCtrl( panel, -1,
/* Outside the new wxSpinCtrl to avoid an internal error in gcc2.95 ! */ wxString::Format(wxT("%.3f"),
wxString format_fps(wxString::Format(wxT("%d"),(int)f_fps)); config_GetFloat( p_intf, "sub-fps" )),
fps_spinctrl = new wxSpinCtrl( panel, -1, format_fps, wxDefaultPosition, wxDefaultSize);
wxDefaultPosition, wxDefaultSize, fps_ctrl->SetToolTip( wxU(_("Override frames per second. "
wxSP_ARROW_KEYS,
0, 16000, (int)f_fps );
fps_spinctrl->SetToolTip( wxU(_("Override frames per second. "
"It will only work with MicroDVD and SubRIP subtitles.")) ); "It will only work with MicroDVD and SubRIP subtitles.")) );
grid_sizer->Add( label, 0, wxALIGN_CENTER, 5 ); grid_sizer->Add( label, 0, wxALIGN_CENTER, 5 );
grid_sizer->Add( fps_spinctrl, 0,wxALIGN_CENTER, 5 ); grid_sizer->Add( fps_ctrl, 0,wxALIGN_CENTER, 5 );
wxStaticText *label_delay = wxStaticText *label_delay =
......
...@@ -41,7 +41,7 @@ public: ...@@ -41,7 +41,7 @@ public:
wxComboBox *encoding_combo; wxComboBox *encoding_combo;
wxComboBox *size_combo; wxComboBox *size_combo;
wxComboBox *align_combo; wxComboBox *align_combo;
wxSpinCtrl *fps_spinctrl; wxTextCtrl *fps_ctrl;
wxSpinCtrl *delay_spinctrl; wxSpinCtrl *delay_spinctrl;
private: private:
......
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