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
20abd0db
Commit
20abd0db
authored
Dec 27, 2009
by
Geoffroy Couprie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Skins: set the maximum volume to 1024, not 512
close #2089
parent
d147daa2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
+4
-5
modules/gui/skins2/src/vlcproc.cpp
modules/gui/skins2/src/vlcproc.cpp
+2
-2
modules/gui/skins2/vars/volume.cpp
modules/gui/skins2/vars/volume.cpp
+2
-3
No files found.
modules/gui/skins2/src/vlcproc.cpp
View file @
20abd0db
...
@@ -682,7 +682,7 @@ void VlcProc::on_volume_changed( vlc_object_t* p_obj, vlc_value_t newVal )
...
@@ -682,7 +682,7 @@ void VlcProc::on_volume_changed( vlc_object_t* p_obj, vlc_value_t newVal )
audio_volume_t
volume
;
audio_volume_t
volume
;
aout_VolumeGet
(
pPlaylist
,
&
volume
);
aout_VolumeGet
(
pPlaylist
,
&
volume
);
SET_VOLUME
(
m_cVarVolume
,
(
double
)
volume
*
2.0
/
AOUT_VOLUME_MAX
,
false
);
SET_VOLUME
(
m_cVarVolume
,
(
double
)
volume
/
AOUT_VOLUME_MAX
,
false
);
SET_BOOL
(
m_cVarMute
,
volume
==
0
);
SET_BOOL
(
m_cVarMute
,
volume
==
0
);
}
}
...
@@ -775,7 +775,7 @@ void VlcProc::init_variables()
...
@@ -775,7 +775,7 @@ void VlcProc::init_variables()
audio_volume_t
volume
;
audio_volume_t
volume
;
aout_VolumeGet
(
pPlaylist
,
&
volume
);
aout_VolumeGet
(
pPlaylist
,
&
volume
);
SET_VOLUME
(
m_cVarVolume
,
(
double
)
volume
*
2.0
/
AOUT_VOLUME_MAX
,
false
);
SET_VOLUME
(
m_cVarVolume
,
(
double
)
volume
/
AOUT_VOLUME_MAX
,
false
);
SET_BOOL
(
m_cVarMute
,
volume
==
0
);
SET_BOOL
(
m_cVarMute
,
volume
==
0
);
update_equalizer
();
update_equalizer
();
...
...
modules/gui/skins2/vars/volume.cpp
View file @
20abd0db
...
@@ -37,7 +37,7 @@ Volume::Volume( intf_thread_t *pIntf ): VarPercent( pIntf )
...
@@ -37,7 +37,7 @@ Volume::Volume( intf_thread_t *pIntf ): VarPercent( pIntf )
audio_volume_t
val
;
audio_volume_t
val
;
aout_VolumeGet
(
getIntf
()
->
p_sys
->
p_playlist
,
&
val
);
aout_VolumeGet
(
getIntf
()
->
p_sys
->
p_playlist
,
&
val
);
VarPercent
::
set
(
val
*
2.0
/
AOUT_VOLUME_MAX
);
VarPercent
::
set
(
val
/
AOUT_VOLUME_MAX
);
}
}
...
@@ -48,10 +48,9 @@ void Volume::set( float percentage, bool updateVLC )
...
@@ -48,10 +48,9 @@ void Volume::set( float percentage, bool updateVLC )
(
int
)(
percentage
*
AOUT_VOLUME_MAX
)
)
(
int
)(
percentage
*
AOUT_VOLUME_MAX
)
)
{
{
VarPercent
::
set
(
percentage
);
VarPercent
::
set
(
percentage
);
if
(
updateVLC
)
if
(
updateVLC
)
aout_VolumeSet
(
getIntf
()
->
p_sys
->
p_playlist
,
aout_VolumeSet
(
getIntf
()
->
p_sys
->
p_playlist
,
(
int
)(
get
()
*
AOUT_VOLUME_MAX
/
2.0
)
);
(
int
)(
get
()
*
AOUT_VOLUME_MAX
)
);
}
}
}
}
...
...
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