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
fb51fe1d
Commit
fb51fe1d
authored
Jul 26, 2011
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt4: try to cleanup use of AOUT_VOLUME_* and QT_VOLUME_*
parent
5d4a883d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
modules/gui/qt4/components/controller_widget.cpp
modules/gui/qt4/components/controller_widget.cpp
+2
-2
modules/gui/qt4/components/controller_widget.hpp
modules/gui/qt4/components/controller_widget.hpp
+1
-1
No files found.
modules/gui/qt4/components/controller_widget.cpp
View file @
fb51fe1d
...
...
@@ -152,7 +152,7 @@ void SoundWidget::userUpdateVolume( int i_sliderVolume )
/* Only if volume is set by user action on slider */
setMuted
(
false
);
playlist_t
*
p_playlist
=
pl_Get
(
p_intf
);
int
i_res
=
i_sliderVolume
*
(
AOUT_VOLUME_MAX
/
2
)
/
VOLUME_MAX
;
int
i_res
=
i_sliderVolume
*
QT_VOLUME_MAX
/
VOLUME_MAX
;
aout_VolumeSet
(
p_playlist
,
i_res
);
refreshLabels
();
}
...
...
@@ -165,7 +165,7 @@ void SoundWidget::libUpdateVolume()
playlist_t
*
p_playlist
=
pl_Get
(
p_intf
);
i_volume
=
aout_VolumeGet
(
p_playlist
);
i_volume
=
(
(
i_volume
+
1
)
*
VOLUME_MAX
)
/
(
AOUT_VOLUME_MAX
/
2
)
;
i_volume
=
(
(
i_volume
+
1
)
*
VOLUME_MAX
)
/
QT_VOLUME_MAX
;
if
(
i_volume
-
volumeSlider
->
value
()
!=
0
)
{
...
...
modules/gui/qt4/components/controller_widget.hpp
View file @
fb51fe1d
...
...
@@ -67,7 +67,7 @@ private slots:
void
updateButtonIcons
(
bool
,
bool
);
};
#define VOLUME_MAX
200
#define VOLUME_MAX
(QT_VOLUME_MAX * 100 / QT_VOLUME_DEFAULT)
class
SoundWidget
:
public
QWidget
{
Q_OBJECT
...
...
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