Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
238cc870
Commit
238cc870
authored
Feb 19, 2006
by
zorglub
Browse files
Be consistant in naming
parent
be9b749c
Changes
6
Hide whitespace changes
Inline
Side-by-side
src/Makefile.am
View file @
238cc870
...
...
@@ -300,11 +300,11 @@ SOURCES_libvlc_common = \
misc/hashtables.c
\
misc/version.c
\
extras/libc.c
\
control/core.c
\
control/
control
_playlist.c
\
control/
control
_vlm.c
\
control/
control
_input.c
\
control/video.c
\
control/
libvlc_
core.c
\
control/
libvlc
_playlist.c
\
control/
libvlc
_vlm.c
\
control/
libvlc
_input.c
\
control/
libvlc_
video.c
\
control/mediacontrol_core.c
\
control/mediacontrol_util.c
\
control/mediacontrol_audio_video.c
\
...
...
src/control/core.c
→
src/control/
libvlc_
core.c
View file @
238cc870
...
...
@@ -61,8 +61,7 @@ inline void libvlc_exception_raise( libvlc_exception_t *p_exception,
char
*
psz_format
,
...
)
{
va_list
args
;
char
*
psz_message
;
va_start
(
args
,
p_exception
->
psz_message
);
va_start
(
args
,
psz_format
);
vasprintf
(
&
p_exception
->
psz_message
,
psz_format
,
args
);
va_end
(
args
);
...
...
src/control/
control
_input.c
→
src/control/
libvlc
_input.c
View file @
238cc870
File moved
src/control/
control
_playlist.c
→
src/control/
libvlc
_playlist.c
View file @
238cc870
File moved
src/control/video.c
→
src/control/
libvlc_
video.c
View file @
238cc870
...
...
@@ -70,14 +70,13 @@ void libvlc_set_fullscreen( libvlc_input_t *p_input, int b_fullscreen,
/* GetVout will raise the exception for us */
if
(
!
p_vout1
)
{
fprintf
(
stderr
,
"No vout
\n
"
);
return
;
}
if
(
b_fullscreen
)
val
.
b_bool
=
VLC_TRUE
;
else
val
.
b_bool
=
VLC_FALSE
;
var_Set
(
p_vout1
,
"fullscreen"
,
val
);
i_ret
=
var_Set
(
p_vout1
,
"fullscreen"
,
val
);
if
(
i_ret
)
libvlc_exception_raise
(
p_e
,
"Unexpected error while setting fullscreen value"
);
...
...
src/control/
control
_vlm.c
→
src/control/
libvlc
_vlm.c
View file @
238cc870
...
...
@@ -144,13 +144,13 @@ void libvlc_vlm_set_input( libvlc_instance_t *p_instance, char *psz_name,
vlc_mutex_lock
(
&
p_instance
->
p_vlm
->
lock
);
GET_MEDIA
;
vlm_MediaSetup
(
p_instance
->
p_vlm
,
p_media
,
"inputdel"
,
"all"
);
i_ret
=
vlm_MediaSetup
(
p_instance
->
p_vlm
,
p_media
,
"inputdel"
,
"all"
);
if
(
i_ret
)
{
libvlc_exception_raise
(
p_exception
,
"Unable to change input"
);
vlc_mutex_unlock
(
&
p_instance
->
p_vlm
->
lock
);
return
;
}
vlm_MediaSetup
(
p_instance
->
p_vlm
,
p_media
,
"input"
,
psz_input
);
i_ret
=
vlm_MediaSetup
(
p_instance
->
p_vlm
,
p_media
,
"input"
,
psz_input
);
if
(
i_ret
)
{
libvlc_exception_raise
(
p_exception
,
"Unable to change input"
);
...
...
@@ -170,7 +170,7 @@ void libvlc_vlm_add_input( libvlc_instance_t *p_instance, char *psz_name,
vlc_mutex_lock
(
&
p_instance
->
p_vlm
->
lock
);
GET_MEDIA
;
vlm_MediaSetup
(
p_instance
->
p_vlm
,
p_media
,
"input"
,
psz_input
);
i_ret
=
vlm_MediaSetup
(
p_instance
->
p_vlm
,
p_media
,
"input"
,
psz_input
);
if
(
i_ret
)
{
libvlc_exception_raise
(
p_exception
,
"Unable to change input"
);
...
...
@@ -212,13 +212,13 @@ void libvlc_vlm_change_media( libvlc_instance_t *p_instance, char *psz_name,
libvlc_exception_raise
(
p_exception
,
"Unable to set output"
);
vlc_mutex_unlock
(
&
p_instance
->
p_vlm
->
lock
);
return
;
}
vlm_MediaSetup
(
p_instance
->
p_vlm
,
p_media
,
"inputdel"
,
"all"
);
i_ret
=
vlm_MediaSetup
(
p_instance
->
p_vlm
,
p_media
,
"inputdel"
,
"all"
);
if
(
i_ret
)
{
libvlc_exception_raise
(
p_exception
,
"Unable to change input"
);
vlc_mutex_unlock
(
&
p_instance
->
p_vlm
->
lock
);
return
;
}
vlm_MediaSetup
(
p_instance
->
p_vlm
,
p_media
,
"input"
,
psz_input
);
i_ret
=
vlm_MediaSetup
(
p_instance
->
p_vlm
,
p_media
,
"input"
,
psz_input
);
if
(
i_ret
)
{
libvlc_exception_raise
(
p_exception
,
"Unable to change input"
);
...
...
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