Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-1.1
Commits
3b44fa8c
Commit
3b44fa8c
authored
Dec 06, 2006
by
Christophe Mutricy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
sub_fps is a float and need to be a float. Don't loose precision if the subtitles dialog is opened.
parent
1ce34fd0
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
12 deletions
+9
-12
modules/gui/wxwidgets/dialogs/open.cpp
modules/gui/wxwidgets/dialogs/open.cpp
+2
-2
modules/gui/wxwidgets/dialogs/subtitles.cpp
modules/gui/wxwidgets/dialogs/subtitles.cpp
+6
-9
modules/gui/wxwidgets/dialogs/subtitles.hpp
modules/gui/wxwidgets/dialogs/subtitles.hpp
+1
-1
No files found.
modules/gui/wxwidgets/dialogs/open.cpp
View file @
3b44fa8c
...
@@ -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
()
)
);
}
}
...
...
modules/gui/wxwidgets/dialogs/subtitles.cpp
View file @
3b44fa8c
...
@@ -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_
spin
ctrl
,
0
,
wxALIGN_CENTER
,
5
);
grid_sizer
->
Add
(
fps_ctrl
,
0
,
wxALIGN_CENTER
,
5
);
wxStaticText
*
label_delay
=
wxStaticText
*
label_delay
=
...
...
modules/gui/wxwidgets/dialogs/subtitles.hpp
View file @
3b44fa8c
...
@@ -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
;
wx
SpinCtrl
*
fps_spin
ctrl
;
wx
TextCtrl
*
fps_
ctrl
;
wxSpinCtrl
*
delay_spinctrl
;
wxSpinCtrl
*
delay_spinctrl
;
private:
private:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment