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
2ca06f95
Commit
2ca06f95
authored
Mar 25, 2007
by
Damien Fouilleul
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- src/control: multiple bug fix backport from trunk
parent
a13e8bee
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
29 additions
and
25 deletions
+29
-25
src/control/audio.c
src/control/audio.c
+2
-11
src/control/core.c
src/control/core.c
+0
-1
src/control/log.c
src/control/log.c
+4
-1
src/control/video.c
src/control/video.c
+23
-12
No files found.
src/control/audio.c
View file @
2ca06f95
...
...
@@ -102,16 +102,7 @@ vlc_bool_t libvlc_audio_get_mute( libvlc_instance_t *p_instance,
void
libvlc_audio_set_mute
(
libvlc_instance_t
*
p_instance
,
vlc_bool_t
status
,
libvlc_exception_t
*
p_e
)
{
if
(
status
)
{
/* Check if the volume is already muted */
if
(
!
libvlc_audio_get_volume
(
p_instance
,
p_e
)
)
{
return
;
}
aout_VolumeMute
(
p_instance
->
p_vlc
,
NULL
);
}
else
if
(
status
^
libvlc_audio_get_mute
(
p_instance
,
p_e
)
)
{
/* the aout_VolumeMute is a toggle function, so this is enough. */
aout_VolumeMute
(
p_instance
->
p_vlc
,
NULL
);
...
...
@@ -199,7 +190,7 @@ void libvlc_audio_set_track( libvlc_input_t *p_input, int i_track,
int
i
;
if
(
!
p_input_thread
)
return
-
1
;
return
;
var_Change
(
p_input_thread
,
"audio-es"
,
VLC_VAR_GETCHOICES
,
&
val_list
,
NULL
);
for
(
i
=
0
;
i
<
val_list
.
p_list
->
i_count
;
i
++
)
...
...
src/control/core.c
View file @
2ca06f95
...
...
@@ -76,7 +76,6 @@ inline void libvlc_exception_raise( libvlc_exception_t *p_exception,
vasprintf
(
&
p_exception
->
psz_message
,
psz_format
,
args
);
va_end
(
args
);
if
(
p_exception
==
NULL
)
return
;
p_exception
->
b_raised
=
1
;
}
...
...
src/control/log.c
View file @
2ca06f95
...
...
@@ -92,7 +92,10 @@ unsigned libvlc_log_count( const libvlc_log_t *p_log, libvlc_exception_t *p_e )
int
i_start
=
p_log
->
p_messages
->
i_start
;
int
i_stop
=
*
(
p_log
->
p_messages
->
pi_stop
);
return
(
i_stop
-
i_start
)
%
VLC_MSG_QSIZE
;
if
(
i_stop
>=
i_start
)
return
i_stop
-
i_start
;
else
return
VLC_MSG_QSIZE
-
(
i_start
-
i_stop
);
}
RAISEZERO
(
"Invalid log object!"
);
}
...
...
src/control/video.c
View file @
2ca06f95
...
...
@@ -227,34 +227,45 @@ int libvlc_video_get_width( libvlc_input_t *p_input,
vlc_bool_t
libvlc_input_has_vout
(
libvlc_input_t
*
p_input
,
libvlc_exception_t
*
p_e
)
{
vout_thread_t
*
p_vout
=
GetVout
(
p_input
,
p_e
);
input_thread_t
*
p_input_thread
=
GetInput
(
p_input
,
p_e
);
vlc_bool_t
has_vout
=
VLC_FALSE
;
/* GetVout will raise the exception for us */
if
(
!
p_vout
)
if
(
p_input_thread
)
{
return
VLC_FALSE
;
}
vout_thread_t
*
p_vout
;
p_vout
=
vlc_object_find
(
p_input_thread
,
VLC_OBJECT_VOUT
,
FIND_CHILD
);
if
(
p_vout
)
{
has_vout
=
VLC_TRUE
;
vlc_object_release
(
p_vout
);
return
VLC_TRUE
;
}
vlc_object_release
(
p_input_thread
);
}
return
has_vout
;
}
int
libvlc_video_reparent
(
libvlc_input_t
*
p_input
,
libvlc_drawable_t
d
,
libvlc_exception_t
*
p_e
)
{
vout_thread_t
*
p_vout
=
GetVout
(
p_input
,
p_e
);
if
(
p_vout
)
{
vout_Control
(
p_vout
,
VOUT_REPARENT
,
d
);
vlc_object_release
(
p_vout
);
}
return
0
;
}
void
libvlc_video_resize
(
libvlc_input_t
*
p_input
,
int
width
,
int
height
,
libvlc_exception_t
*
p_e
)
{
vout_thread_t
*
p_vout
=
GetVout
(
p_input
,
p_e
);
if
(
p_vout
)
{
vout_Control
(
p_vout
,
VOUT_SET_SIZE
,
width
,
height
);
vlc_object_release
(
p_vout
);
}
}
/* global video settings */
...
...
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