Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
9d679e90
Commit
9d679e90
authored
Jan 29, 2015
by
Jonathan Calmels
Committed by
Jean-Baptiste Kempf
Jan 29, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt: buffering slider option should be 0 when the cache is empty
Signed-off-by:
Jean-Baptiste Kempf
<
jb@videolan.org
>
parent
8d6cfafb
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
modules/gui/qt4/input_manager.cpp
modules/gui/qt4/input_manager.cpp
+1
-1
modules/gui/qt4/styles/seekstyle.cpp
modules/gui/qt4/styles/seekstyle.cpp
+1
-1
modules/gui/qt4/util/input_slider.cpp
modules/gui/qt4/util/input_slider.cpp
+2
-2
No files found.
modules/gui/qt4/input_manager.cpp
View file @
9d679e90
...
...
@@ -212,7 +212,7 @@ void InputManager::delInput()
emit
encryptionChanged
(
false
);
emit
recordingStateChanged
(
false
);
emit
cachingChanged
(
1
);
emit
cachingChanged
(
0.0
);
}
/* Convert the event from the callbacks in actions */
...
...
modules/gui/qt4/styles/seekstyle.cpp
View file @
9d679e90
...
...
@@ -128,7 +128,7 @@ void SeekStyle::drawComplexControl( ComplexControl cc, const QStyleOptionComplex
}
/* draw buffering overlay */
if
(
slideroptions
->
buffering
<
1.0
)
if
(
slideroptions
->
buffering
>
0.0
&&
slideroptions
->
buffering
<
1.0
)
{
QRect
innerRect
=
groove
.
adjusted
(
1
,
1
,
groove
.
width
()
*
(
-
1.0
+
slideroptions
->
buffering
)
-
1
,
0
);
...
...
modules/gui/qt4/util/input_slider.cpp
View file @
9d679e90
...
...
@@ -60,7 +60,7 @@ SeekSlider::SeekSlider( Qt::Orientation q, QWidget *_parent, bool _static )
{
isSliding
=
false
;
isJumping
=
false
;
f_buffering
=
1
.0
;
f_buffering
=
0
.0
;
mHandleOpacity
=
1.0
;
chapters
=
NULL
;
mHandleLength
=
-
1
;
...
...
@@ -393,7 +393,7 @@ void SeekSlider::paintEvent( QPaintEvent *ev )
if
(
QTime
::
currentTime
()
>
bufferingStart
.
addSecs
(
1
)
)
option
.
buffering
=
f_buffering
;
else
option
.
buffering
=
1
.0
;
option
.
buffering
=
0
.0
;
option
.
length
=
inputLength
;
option
.
animate
=
(
animHandle
->
state
()
==
QAbstractAnimation
::
Running
||
hideHandleTimer
->
isActive
()
);
...
...
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