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
GSoC
GSoC2018
macOS
vlc
Commits
e9300946
Commit
e9300946
authored
Sep 10, 2003
by
Laurent Aimar
Browse files
* modules: do not take care of the case for shortcuts (fix #1165).
* playlist : use new input variables.
parent
d4665421
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/misc/modules.c
View file @
e9300946
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* modules.c : Builtin and plugin modules management functions
* modules.c : Builtin and plugin modules management functions
*****************************************************************************
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* Copyright (C) 2001 VideoLAN
* $Id: modules.c,v 1.13
0
2003/0
8/23 22:49
:5
0
fenrir Exp $
* $Id: modules.c,v 1.13
1
2003/0
9/10 11:37
:5
2
fenrir Exp $
*
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Authors: Samuel Hocevar <sam@zoy.org>
* Ethan C. Baldridge <BaldridgeE@cadmus.com>
* Ethan C. Baldridge <BaldridgeE@cadmus.com>
...
@@ -367,8 +367,8 @@ module_t * __module_Need( vlc_object_t *p_this, const char *psz_capability,
...
@@ -367,8 +367,8 @@ module_t * __module_Need( vlc_object_t *p_this, const char *psz_capability,
for
(
i_dummy
=
0
;
p_module
->
pp_shortcuts
[
i_dummy
];
i_dummy
++
)
for
(
i_dummy
=
0
;
p_module
->
pp_shortcuts
[
i_dummy
];
i_dummy
++
)
{
{
if
(
!
strcmp
(
psz_name
,
if
(
!
strc
asec
mp
(
psz_name
,
p_module
->
pp_shortcuts
[
i_dummy
]
)
)
p_module
->
pp_shortcuts
[
i_dummy
]
)
)
{
{
/* Found it */
/* Found it */
b_trash
=
VLC_FALSE
;
b_trash
=
VLC_FALSE
;
...
...
src/playlist/playlist.c
View file @
e9300946
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* playlist.c : Playlist management functions
* playlist.c : Playlist management functions
*****************************************************************************
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* Copyright (C) 1999-2001 VideoLAN
* $Id: playlist.c,v 1.
49
2003/09/
08 12:02:16 zorglub
Exp $
* $Id: playlist.c,v 1.
50
2003/09/
10 11:37:53 fenrir
Exp $
*
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Authors: Samuel Hocevar <sam@zoy.org>
*
*
...
@@ -488,6 +488,8 @@ int playlist_Move( playlist_t * p_playlist, int i_pos, int i_newpos)
...
@@ -488,6 +488,8 @@ int playlist_Move( playlist_t * p_playlist, int i_pos, int i_newpos)
void
playlist_Command
(
playlist_t
*
p_playlist
,
playlist_command_t
i_command
,
void
playlist_Command
(
playlist_t
*
p_playlist
,
playlist_command_t
i_command
,
int
i_arg
)
int
i_arg
)
{
{
vlc_value_t
val
;
vlc_mutex_lock
(
&
p_playlist
->
object_lock
);
vlc_mutex_lock
(
&
p_playlist
->
object_lock
);
switch
(
i_command
)
switch
(
i_command
)
...
@@ -508,7 +510,8 @@ int playlist_Move( playlist_t * p_playlist, int i_pos, int i_newpos)
...
@@ -508,7 +510,8 @@ int playlist_Move( playlist_t * p_playlist, int i_pos, int i_newpos)
}
}
if
(
p_playlist
->
p_input
)
if
(
p_playlist
->
p_input
)
{
{
input_SetStatus
(
p_playlist
->
p_input
,
INPUT_STATUS_PLAY
);
val
.
i_int
=
PLAYING_S
;
var_Set
(
p_playlist
->
p_input
,
"state"
,
val
);
}
}
break
;
break
;
...
@@ -516,7 +519,8 @@ int playlist_Move( playlist_t * p_playlist, int i_pos, int i_newpos)
...
@@ -516,7 +519,8 @@ int playlist_Move( playlist_t * p_playlist, int i_pos, int i_newpos)
p_playlist
->
i_status
=
PLAYLIST_PAUSED
;
p_playlist
->
i_status
=
PLAYLIST_PAUSED
;
if
(
p_playlist
->
p_input
)
if
(
p_playlist
->
p_input
)
{
{
input_SetStatus
(
p_playlist
->
p_input
,
INPUT_STATUS_PAUSE
);
val
.
i_int
=
PAUSE_S
;
var_Set
(
p_playlist
->
p_input
,
"state"
,
val
);
}
}
break
;
break
;
...
...
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