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
5539b7b7
Commit
5539b7b7
authored
Sep 28, 2008
by
Pierre d'Herbemont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
playlist: b_cant_sleep is private.
parent
09995291
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
7 deletions
+6
-7
include/vlc_playlist.h
include/vlc_playlist.h
+0
-2
src/playlist/engine.c
src/playlist/engine.c
+4
-4
src/playlist/playlist_internal.h
src/playlist/playlist_internal.h
+1
-0
src/playlist/thread.c
src/playlist/thread.c
+1
-1
No files found.
include/vlc_playlist.h
View file @
5539b7b7
...
@@ -181,8 +181,6 @@ struct playlist_t
...
@@ -181,8 +181,6 @@ struct playlist_t
int
i_sort
;
/**< Last sorting applied to the playlist */
int
i_sort
;
/**< Last sorting applied to the playlist */
int
i_order
;
/**< Last ordering applied to the playlist */
int
i_order
;
/**< Last ordering applied to the playlist */
mtime_t
gc_date
;
mtime_t
gc_date
;
bool
b_cant_sleep
;
};
};
/** Helper to add an item */
/** Helper to add an item */
...
...
src/playlist/engine.c
View file @
5539b7b7
...
@@ -83,7 +83,7 @@ playlist_t * playlist_Create( vlc_object_t *p_parent )
...
@@ -83,7 +83,7 @@ playlist_t * playlist_Create( vlc_object_t *p_parent )
pl_priv
(
p_playlist
)
->
p_input
=
NULL
;
pl_priv
(
p_playlist
)
->
p_input
=
NULL
;
p_playlist
->
gc_date
=
0
;
p_playlist
->
gc_date
=
0
;
p
_playlist
->
b_cant_sleep
=
false
;
p
l_priv
(
p_playlist
)
->
b_cant_sleep
=
false
;
ARRAY_INIT
(
p_playlist
->
items
);
ARRAY_INIT
(
p_playlist
->
items
);
ARRAY_INIT
(
p_playlist
->
all_items
);
ARRAY_INIT
(
p_playlist
->
all_items
);
...
@@ -217,14 +217,14 @@ static void ObjectGarbageCollector( playlist_t *p_playlist, bool b_force )
...
@@ -217,14 +217,14 @@ static void ObjectGarbageCollector( playlist_t *p_playlist, bool b_force )
{
{
if
(
mdate
()
-
p_playlist
->
gc_date
<
1000000
)
if
(
mdate
()
-
p_playlist
->
gc_date
<
1000000
)
{
{
p_playlist
->
b_cant_sleep
=
true
;
pl_priv
(
p_playlist
)
->
b_cant_sleep
=
true
;
return
;
return
;
}
}
else
if
(
p_playlist
->
gc_date
==
0
)
else
if
(
p_playlist
->
gc_date
==
0
)
return
;
return
;
}
}
p
_playlist
->
b_cant_sleep
=
false
;
p
l_priv
(
p_playlist
)
->
b_cant_sleep
=
false
;
}
}
/* Input Callback */
/* Input Callback */
...
@@ -403,7 +403,7 @@ check_input:
...
@@ -403,7 +403,7 @@ check_input:
playlist_release_current_input
(
p_playlist
);
playlist_release_current_input
(
p_playlist
);
p_playlist
->
gc_date
=
mdate
();
p_playlist
->
gc_date
=
mdate
();
p
_playlist
->
b_cant_sleep
=
true
;
p
l_priv
(
p_playlist
)
->
b_cant_sleep
=
true
;
i_activity
=
var_GetInteger
(
p_playlist
,
"activity"
);
i_activity
=
var_GetInteger
(
p_playlist
,
"activity"
);
var_SetInteger
(
p_playlist
,
"activity"
,
i_activity
-
var_SetInteger
(
p_playlist
,
"activity"
,
i_activity
-
...
...
src/playlist/playlist_internal.h
View file @
5539b7b7
...
@@ -104,6 +104,7 @@ typedef struct playlist_private_t
...
@@ -104,6 +104,7 @@ typedef struct playlist_private_t
bool
b_tree
;
/**< Display as a tree */
bool
b_tree
;
/**< Display as a tree */
bool
b_doing_ml
;
/**< Doing media library stuff get quicker */
bool
b_doing_ml
;
/**< Doing media library stuff get quicker */
bool
b_auto_preparse
;
bool
b_auto_preparse
;
bool
b_cant_sleep
;
}
playlist_private_t
;
}
playlist_private_t
;
#define pl_priv( pl ) ((playlist_private_t *)(pl))
#define pl_priv( pl ) ((playlist_private_t *)(pl))
...
...
src/playlist/thread.c
View file @
5539b7b7
...
@@ -120,7 +120,7 @@ static void* RunControlThread ( vlc_object_t *p_this )
...
@@ -120,7 +120,7 @@ static void* RunControlThread ( vlc_object_t *p_this )
if
(
!
vlc_object_alive
(
p_playlist
)
)
if
(
!
vlc_object_alive
(
p_playlist
)
)
break
;
break
;
if
(
p
_playlist
->
b_cant_sleep
)
if
(
p
l_priv
(
p_playlist
)
->
b_cant_sleep
)
{
{
/* 100 ms is an acceptable delay for playlist operations */
/* 100 ms is an acceptable delay for playlist operations */
vlc_object_unlock
(
p_playlist
);
vlc_object_unlock
(
p_playlist
);
...
...
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