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

diff --git a/modules/gui/wxwidgets/dialogs/open.cpp b/modules/gui/wxwidgets/dialogs/open.cpp
index 401ff6009a6bde4734e2a9d2283036e927522924..65115e71c834b314ce516e4472488a736a0d2c26 100644 (file)
--- a/modules/gui/wxwidgets/dialogs/open.cpp
+++ b/modules/gui/wxwidgets/dialogs/open.cpp
@@ -1838,8 +1838,8 @@ void OpenDialog::OnSubsFileSettings( wxCommandEvent& WXUNUSED(event) )
                         (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() ) );
     }

diff --git a/modules/gui/wxwidgets/dialogs/subtitles.cpp b/modules/gui/wxwidgets/dialogs/subtitles.cpp
index 928e893564e4e59fc303d9d91852a6cd8c8ccc71..2de103a2b1740c0d2f90a6183bd05db0663ba488 100644 (file)
--- a/modules/gui/wxwidgets/dialogs/subtitles.cpp
+++ b/modules/gui/wxwidgets/dialogs/subtitles.cpp
@@ -201,17 +201,14 @@ SubsFileDialog::SubsFileDialog( intf_thread_t *_p_intf, wxWindow* _p_parent ):
     wxStaticText *label =
         new wxStaticText(panel, -1, wxU(_("Frames per second")));
 
-    float f_fps = config_GetFloat( p_intf, "sub-fps" );
-    /* Outside the new wxSpinCtrl to avoid an internal error in gcc2.95 ! */
-    wxString format_fps(wxString::Format(wxT("%d"),(int)f_fps));
-    fps_spinctrl = new wxSpinCtrl( panel, -1, format_fps,
-                                   wxDefaultPosition, wxDefaultSize,
-                                   wxSP_ARROW_KEYS,
-                                   0, 16000, (int)f_fps );
-    fps_spinctrl->SetToolTip( wxU(_("Override frames per second. "
+    fps_ctrl = new wxTextCtrl( panel, -1,
+                           wxString::Format(wxT("%.3f"),
+                                 config_GetFloat( p_intf, "sub-fps" )),
+                           wxDefaultPosition, wxDefaultSize);
+    fps_ctrl->SetToolTip( wxU(_("Override frames per second. "
                "It will only work with MicroDVD and SubRIP subtitles.")) );
     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 =

diff --git a/modules/gui/wxwidgets/dialogs/subtitles.hpp b/modules/gui/wxwidgets/dialogs/subtitles.hpp
index fb1ec54e3a82c016e29e5f03e3fc8d8abb77a30f..1403960eb86a67f3d4c7e9d51ff6b64ea284dd9a 100644 (file)
--- a/modules/gui/wxwidgets/dialogs/subtitles.hpp
+++ b/modules/gui/wxwidgets/dialogs/subtitles.hpp
@@ -41,7 +41,7 @@ public:
     wxComboBox *encoding_combo;
     wxComboBox *size_combo;
     wxComboBox *align_combo;
-    wxSpinCtrl *fps_spinctrl;
+    wxTextCtrl *fps_ctrl;
     wxSpinCtrl *delay_spinctrl;
 
 private: