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
f277d239
Commit
f277d239
authored
Jul 19, 2012
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not inherit "volume" where it is ignored and overriden
parent
94d7df18
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
9 deletions
+3
-9
lib/media_player.c
lib/media_player.c
+1
-1
src/libvlc-module.c
src/libvlc-module.c
+1
-7
src/playlist/engine.c
src/playlist/engine.c
+1
-1
No files found.
lib/media_player.c
View file @
f277d239
...
...
@@ -465,7 +465,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
/* Audio */
var_Create
(
mp
,
"aout"
,
VLC_VAR_STRING
|
VLC_VAR_DOINHERIT
);
var_Create
(
mp
,
"mute"
,
VLC_VAR_BOOL
);
var_Create
(
mp
,
"volume"
,
VLC_VAR_INTEGER
|
VLC_VAR_DOINHERIT
);
var_Create
(
mp
,
"volume"
,
VLC_VAR_INTEGER
);
var_Create
(
mp
,
"find-input-callback"
,
VLC_VAR_ADDRESS
);
var_SetAddress
(
mp
,
"find-input-callback"
,
find_input
);
var_Create
(
mp
,
"amem-data"
,
VLC_VAR_ADDRESS
);
...
...
src/libvlc-module.c
View file @
f277d239
...
...
@@ -153,10 +153,6 @@ static const char *const ppsz_snap_formats[] =
#define GAIN_LONGTEXT N_( \
"This linear gain will be applied to outputted audio.")
#define VOLUME_TEXT N_("Default audio volume")
#define VOLUME_LONGTEXT N_( \
"You can set the default audio output volume here.")
#define VOLUME_STEP_TEXT N_("Audio output volume step")
#define VOLUME_STEP_LONGTEXT N_( \
"The step size of the volume is adjustable using this option.")
...
...
@@ -1476,9 +1472,7 @@ vlc_module_begin ()
change_safe
()
add_float
(
"gain"
,
1
.,
GAIN_TEXT
,
GAIN_LONGTEXT
,
true
)
change_float_range
(
0
.,
8
.
)
add_integer_with_range
(
"volume"
,
AOUT_VOLUME_DEFAULT
,
0
,
AOUT_VOLUME_MAX
,
VOLUME_TEXT
,
VOLUME_LONGTEXT
,
false
)
add_obsolete_integer
(
"volume"
)
/* since 2.1.0 */
add_integer_with_range
(
"volume-step"
,
AOUT_VOLUME_STEP
,
0
,
AOUT_VOLUME_MAX
,
VOLUME_STEP_TEXT
,
VOLUME_STEP_LONGTEXT
,
true
)
...
...
src/playlist/engine.c
View file @
f277d239
...
...
@@ -437,7 +437,7 @@ static void VariablesInit( playlist_t *p_playlist )
/* Audio output parameters */
var_Create
(
p_playlist
,
"mute"
,
VLC_VAR_BOOL
);
var_Create
(
p_playlist
,
"volume"
,
VLC_VAR_INTEGER
|
VLC_VAR_DOINHERIT
);
var_Create
(
p_playlist
,
"volume"
,
VLC_VAR_INTEGER
);
/* FIXME: horrible hack for audio output interface code */
var_Create
(
p_playlist
,
"find-input-callback"
,
VLC_VAR_ADDRESS
);
var_SetAddress
(
p_playlist
,
"find-input-callback"
,
playlist_FindInput
);
...
...
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