Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
0be748f9
Commit
0be748f9
authored
Mar 10, 2014
by
Francois Cartegnie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt: SeekSlider: don't show buffering < 1s
parent
6ea38362
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletion
+8
-1
modules/gui/qt4/util/input_slider.cpp
modules/gui/qt4/util/input_slider.cpp
+6
-1
modules/gui/qt4/util/input_slider.hpp
modules/gui/qt4/util/input_slider.hpp
+2
-0
No files found.
modules/gui/qt4/util/input_slider.cpp
View file @
0be748f9
...
@@ -197,6 +197,8 @@ void SeekSlider::updatePos()
...
@@ -197,6 +197,8 @@ void SeekSlider::updatePos()
void
SeekSlider
::
updateBuffering
(
float
f_buffering_
)
void
SeekSlider
::
updateBuffering
(
float
f_buffering_
)
{
{
if
(
f_buffering_
<
f_buffering
)
bufferingStart
=
QTime
::
currentTime
();
f_buffering
=
f_buffering_
;
f_buffering
=
f_buffering_
;
repaint
();
repaint
();
}
}
...
@@ -386,7 +388,10 @@ void SeekSlider::paintEvent( QPaintEvent *ev )
...
@@ -386,7 +388,10 @@ void SeekSlider::paintEvent( QPaintEvent *ev )
{
{
SeekStyle
::
SeekStyleOption
option
;
SeekStyle
::
SeekStyleOption
option
;
option
.
initFrom
(
this
);
option
.
initFrom
(
this
);
option
.
buffering
=
f_buffering
;
if
(
QTime
::
currentTime
()
>
bufferingStart
.
addSecs
(
1
)
)
option
.
buffering
=
f_buffering
;
else
option
.
buffering
=
1.0
;
option
.
length
=
inputLength
;
option
.
length
=
inputLength
;
option
.
animate
=
(
animHandle
->
state
()
==
QAbstractAnimation
::
Running
option
.
animate
=
(
animHandle
->
state
()
==
QAbstractAnimation
::
Running
||
hideHandleTimer
->
isActive
()
);
||
hideHandleTimer
->
isActive
()
);
...
...
modules/gui/qt4/util/input_slider.hpp
View file @
0be748f9
...
@@ -36,6 +36,7 @@
...
@@ -36,6 +36,7 @@
#include <QSlider>
#include <QSlider>
#include <QPainter>
#include <QPainter>
#include <QTime>
#define MSTRTIME_MAX_SIZE 22
#define MSTRTIME_MAX_SIZE 22
...
@@ -85,6 +86,7 @@ private:
...
@@ -85,6 +86,7 @@ private:
QTimer
*
seekLimitTimer
;
QTimer
*
seekLimitTimer
;
TimeTooltip
*
mTimeTooltip
;
TimeTooltip
*
mTimeTooltip
;
float
f_buffering
;
float
f_buffering
;
QTime
bufferingStart
;
SeekPoints
*
chapters
;
SeekPoints
*
chapters
;
bool
b_classic
;
bool
b_classic
;
bool
b_seekable
;
bool
b_seekable
;
...
...
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