Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
5db8c178
Commit
5db8c178
authored
May 22, 2005
by
Clément Stenac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Backport to 0.8.2
parent
2fe534d2
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
30 additions
and
14 deletions
+30
-14
mozilla/vlcshell.cpp
mozilla/vlcshell.cpp
+15
-10
src/playlist/playlist.c
src/playlist/playlist.c
+15
-4
No files found.
mozilla/vlcshell.cpp
View file @
5db8c178
...
@@ -330,6 +330,20 @@ NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc,
...
@@ -330,6 +330,20 @@ NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc,
#endif
/* XP_MACOSX */
#endif
/* XP_MACOSX */
/* HACK: special case for loop, to have it set before playlist startup
*/
for
(
i
=
0
;
i
<
argc
;
i
++
)
{
if
(
!
strcmp
(
argn
[
i
],
"loop"
)
)
{
if
(
!
strcmp
(
argv
[
i
],
"yes"
)
)
{
value
.
b_bool
=
VLC_TRUE
;
VLC_VariableSet
(
p_plugin
->
i_vlc
,
"conf::loop"
,
value
);
}
}
}
i_ret
=
VLC_Init
(
p_plugin
->
i_vlc
,
sizeof
(
ppsz_argv
)
/
sizeof
(
char
*
),
i_ret
=
VLC_Init
(
p_plugin
->
i_vlc
,
sizeof
(
ppsz_argv
)
/
sizeof
(
char
*
),
ppsz_argv
);
ppsz_argv
);
...
@@ -395,14 +409,6 @@ NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc,
...
@@ -395,14 +409,6 @@ NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc,
}
}
#if USE_LIBVLC
#if USE_LIBVLC
else
if
(
!
strcmp
(
argn
[
i
],
"loop"
)
)
{
if
(
!
strcmp
(
argv
[
i
],
"yes"
)
)
{
value
.
b_bool
=
VLC_TRUE
;
VLC_VariableSet
(
p_plugin
->
i_vlc
,
"conf::loop"
,
value
);
}
}
else
if
(
!
strcmp
(
argn
[
i
],
"fullscreen"
)
)
else
if
(
!
strcmp
(
argn
[
i
],
"fullscreen"
)
)
{
{
if
(
!
strcmp
(
argv
[
i
],
"yes"
)
)
if
(
!
strcmp
(
argv
[
i
],
"yes"
)
)
...
@@ -448,7 +454,6 @@ static void HackStopVout( VlcPlugin* p_plugin )
...
@@ -448,7 +454,6 @@ static void HackStopVout( VlcPlugin* p_plugin )
do
do
{
{
fprintf
(
stderr
,
"FindWindow: %p
\n
"
,
hwnd
);
while
(
PeekMessage
(
&
msg
,
(
HWND
)
value
.
i_int
,
0
,
0
,
PM_REMOVE
)
)
while
(
PeekMessage
(
&
msg
,
(
HWND
)
value
.
i_int
,
0
,
0
,
PM_REMOVE
)
)
{
{
TranslateMessage
(
&
msg
);
TranslateMessage
(
&
msg
);
...
@@ -676,7 +681,7 @@ NPError NPP_SetWindow( NPP instance, NPWindow* window )
...
@@ -676,7 +681,7 @@ NPError NPP_SetWindow( NPP instance, NPWindow* window )
{
{
#if USE_LIBVLC
#if USE_LIBVLC
VLC_AddTarget
(
p_plugin
->
i_vlc
,
p_plugin
->
psz_target
,
VLC_AddTarget
(
p_plugin
->
i_vlc
,
p_plugin
->
psz_target
,
0
,
0
,
i_mode
,
PLAYLIST_END
);
0
,
0
,
PLAYLIST_INSERT
,
0
);
#endif
#endif
p_plugin
->
b_stream
=
VLC_TRUE
;
p_plugin
->
b_stream
=
VLC_TRUE
;
}
}
...
...
src/playlist/playlist.c
View file @
5db8c178
...
@@ -761,7 +761,7 @@ static playlist_item_t * NextItem( playlist_t *p_playlist )
...
@@ -761,7 +761,7 @@ static playlist_item_t * NextItem( playlist_t *p_playlist )
int
i_skip
,
i_goto
,
i
,
i_new
,
i_count
;
int
i_skip
,
i_goto
,
i
,
i_new
,
i_count
;
playlist_view_t
*
p_view
;
playlist_view_t
*
p_view
;
vlc_bool_t
b_loop
=
var_GetBool
(
p_playlist
,
"loop"
);
vlc_bool_t
b_loop
=
var_GetBool
(
p_playlist
,
"loop"
);
vlc_bool_t
b_random
=
var_GetBool
(
p_playlist
,
"random"
);
vlc_bool_t
b_random
=
var_GetBool
(
p_playlist
,
"random"
);
vlc_bool_t
b_repeat
=
var_GetBool
(
p_playlist
,
"repeat"
);
vlc_bool_t
b_repeat
=
var_GetBool
(
p_playlist
,
"repeat"
);
vlc_bool_t
b_playstop
=
var_GetBool
(
p_playlist
,
"play-and-stop"
);
vlc_bool_t
b_playstop
=
var_GetBool
(
p_playlist
,
"play-and-stop"
);
...
@@ -771,7 +771,6 @@ static playlist_item_t * NextItem( playlist_t *p_playlist )
...
@@ -771,7 +771,6 @@ static playlist_item_t * NextItem( playlist_t *p_playlist )
int64_t
start
=
mdate
();
int64_t
start
=
mdate
();
#endif
#endif
/* Handle quickly a few special cases */
/* Handle quickly a few special cases */
/* No items to play */
/* No items to play */
...
@@ -911,6 +910,9 @@ static playlist_item_t * NextItem( playlist_t *p_playlist )
...
@@ -911,6 +910,9 @@ static playlist_item_t * NextItem( playlist_t *p_playlist )
{
{
if
(
b_loop
)
if
(
b_loop
)
{
{
#ifdef PLAYLIST_DEBUG
msg_Dbg
(
p_playlist
,
"looping"
);
#endif
p_new
=
playlist_FindNextFromParent
(
p_playlist
,
p_new
=
playlist_FindNextFromParent
(
p_playlist
,
p_playlist
->
request
.
i_view
,
p_playlist
->
request
.
i_view
,
p_view
->
p_root
,
p_view
->
p_root
,
...
@@ -949,6 +951,9 @@ static playlist_item_t * NextItem( playlist_t *p_playlist )
...
@@ -949,6 +951,9 @@ static playlist_item_t * NextItem( playlist_t *p_playlist )
if
(
p_playlist
->
status
.
i_view
==
-
1
)
if
(
p_playlist
->
status
.
i_view
==
-
1
)
{
{
#ifdef PLAYLIST_DEBUG
msg_Dbg
(
p_playlist
,
"no request - old mode"
);
#endif
if
(
p_playlist
->
i_index
+
1
<
p_playlist
->
i_size
)
if
(
p_playlist
->
i_index
+
1
<
p_playlist
->
i_size
)
{
{
p_playlist
->
i_index
++
;
p_playlist
->
i_index
++
;
...
@@ -972,6 +977,9 @@ static playlist_item_t * NextItem( playlist_t *p_playlist )
...
@@ -972,6 +977,9 @@ static playlist_item_t * NextItem( playlist_t *p_playlist )
/* We are playing with a view */
/* We are playing with a view */
else
else
{
{
#ifdef PLAYLIST_DEBUG
msg_Dbg
(
p_playlist
,
"no request - from a view"
);
#endif
playlist_view_t
*
p_view
=
playlist_view_t
*
p_view
=
playlist_ViewFind
(
p_playlist
,
playlist_ViewFind
(
p_playlist
,
p_playlist
->
status
.
i_view
);
p_playlist
->
status
.
i_view
);
...
@@ -988,6 +996,9 @@ static playlist_item_t * NextItem( playlist_t *p_playlist )
...
@@ -988,6 +996,9 @@ static playlist_item_t * NextItem( playlist_t *p_playlist )
p_playlist
->
status
.
p_item
);
p_playlist
->
status
.
p_item
);
if
(
p_new
==
NULL
&&
b_loop
)
if
(
p_new
==
NULL
&&
b_loop
)
{
{
#ifdef PLAYLIST_DEBUG
msg_Dbg
(
p_playlist
,
"looping"
);
#endif
p_new
=
playlist_FindNextFromParent
(
p_playlist
,
p_new
=
playlist_FindNextFromParent
(
p_playlist
,
p_playlist
->
status
.
i_view
,
p_playlist
->
status
.
i_view
,
p_view
->
p_root
,
p_view
->
p_root
,
...
...
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