Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
8d82c480
Commit
8d82c480
authored
Jul 15, 2008
by
Pierre d'Herbemont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
directory: Make sure we can exit and interrupt the access.
parent
06e5daea
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
10 deletions
+12
-10
modules/access/directory.c
modules/access/directory.c
+10
-5
src/playlist/item.c
src/playlist/item.c
+2
-5
No files found.
modules/access/directory.c
View file @
8d82c480
...
...
@@ -135,8 +135,8 @@ static int Demux( demux_t *p_demux );
static
int
DemuxControl
(
demux_t
*
p_demux
,
int
i_query
,
va_list
args
);
static
int
ReadDir
(
playlist_t
*
,
const
char
*
psz_name
,
int
i_mod
e
,
playlist_item_t
*
,
input_item_t
*
,
static
int
ReadDir
(
access_t
*
,
playlist_t
*
,
const
char
*
psz_nam
e
,
int
i_mode
,
playlist_item_t
*
,
input_item_t
*
,
DIR
*
handle
,
stat_list_t
*
stats
);
static
DIR
*
OpenDir
(
vlc_object_t
*
obj
,
const
char
*
psz_name
);
...
...
@@ -256,7 +256,8 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len)
p_item_in_category
=
playlist_ItemToNode
(
p_playlist
,
p_current
,
false
);
ReadDir
(
p_playlist
,
psz_name
,
i_mode
,
p_item_in_category
,
ReadDir
(
p_access
,
p_playlist
,
psz_name
,
i_mode
,
p_item_in_category
,
p_current_input
,
(
DIR
*
)
p_access
->
p_sys
,
NULL
);
playlist_Signal
(
p_playlist
);
...
...
@@ -364,7 +365,8 @@ struct stat_list_t
/*****************************************************************************
* ReadDir: read a directory and add its content to the list
*****************************************************************************/
static
int
ReadDir
(
playlist_t
*
p_playlist
,
const
char
*
psz_name
,
static
int
ReadDir
(
access_t
*
p_access
,
playlist_t
*
p_playlist
,
const
char
*
psz_name
,
int
i_mode
,
playlist_item_t
*
p_parent_category
,
input_item_t
*
p_current_input
,
...
...
@@ -374,6 +376,9 @@ static int ReadDir( playlist_t *p_playlist, const char *psz_name,
int
i_dir_content
,
i
,
i_return
=
VLC_SUCCESS
;
playlist_item_t
*
p_node
;
if
(
!
vlc_object_alive
(
p_access
)
)
return
VLC_EGENERIC
;
if
(
!
vlc_object_alive
(
p_playlist
)
)
return
VLC_EGENERIC
;
...
...
@@ -491,7 +496,7 @@ static int ReadDir( playlist_t *p_playlist, const char *psz_name,
/* If we had the parent in category, the it is now node.
* Else, we still don't have */
i_return
=
ReadDir
(
p_playlist
,
psz_uri
,
MODE_EXPAND
,
i_return
=
ReadDir
(
p_
access
,
p_
playlist
,
psz_uri
,
MODE_EXPAND
,
p_parent_category
?
p_node
:
NULL
,
p_current_input
,
subdir
,
&
stself
);
closedir
(
subdir
);
...
...
src/playlist/item.c
View file @
8d82c480
...
...
@@ -452,13 +452,10 @@ int playlist_BothAddInput( playlist_t *p_playlist,
int
i_top
;
assert
(
p_input
);
PL_LOCK_IF
(
!
b_locked
);
if
(
!
vlc_object_alive
(
p_playlist
)
)
{
PL_UNLOCK_IF
(
!
b_locked
);
return
VLC_EGENERIC
;
}
PL_LOCK_IF
(
!
b_locked
);
/* Add to category */
p_item_cat
=
playlist_ItemNewFromInput
(
p_playlist
,
p_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