Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
1ca4b2a3
Commit
1ca4b2a3
authored
Mar 01, 2009
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Ressource -> Resource
parent
c5746ee2
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
8 additions
and
8 deletions
+8
-8
src/input/input.c
src/input/input.c
+1
-1
src/input/input_interface.h
src/input/input_interface.h
+1
-1
src/input/input_internal.h
src/input/input_internal.h
+1
-1
src/input/resource.h
src/input/resource.h
+2
-2
src/input/vlm.c
src/input/vlm.c
+2
-2
src/playlist/thread.c
src/playlist/thread.c
+1
-1
No files found.
src/input/input.c
View file @
1ca4b2a3
...
@@ -440,7 +440,7 @@ void input_StopThread( input_thread_t *p_input )
...
@@ -440,7 +440,7 @@ void input_StopThread( input_thread_t *p_input )
input_ControlPush
(
p_input
,
INPUT_CONTROL_SET_DIE
,
NULL
);
input_ControlPush
(
p_input
,
INPUT_CONTROL_SET_DIE
,
NULL
);
}
}
input_resource_t
*
input_DetachRes
s
ource
(
input_thread_t
*
p_input
)
input_resource_t
*
input_DetachResource
(
input_thread_t
*
p_input
)
{
{
assert
(
p_input
->
b_dead
);
assert
(
p_input
->
b_dead
);
...
...
src/input/input_interface.h
View file @
1ca4b2a3
...
@@ -82,7 +82,7 @@ input_thread_t *__input_CreateThreadExtended ( vlc_object_t *, input_item_t *, c
...
@@ -82,7 +82,7 @@ input_thread_t *__input_CreateThreadExtended ( vlc_object_t *, input_item_t *, c
* it will assert.
* it will assert.
* It does not support concurrent calls.
* It does not support concurrent calls.
*/
*/
input_resource_t
*
input_DetachRes
s
ource
(
input_thread_t
*
);
input_resource_t
*
input_DetachResource
(
input_thread_t
*
);
/* */
/* */
typedef
enum
typedef
enum
...
...
src/input/input_internal.h
View file @
1ca4b2a3
...
@@ -129,7 +129,7 @@ struct input_thread_private_t
...
@@ -129,7 +129,7 @@ struct input_thread_private_t
int
i_slave
;
int
i_slave
;
input_source_t
**
slave
;
input_source_t
**
slave
;
/* Res
s
ources */
/* Resources */
input_resource_t
*
p_resource
;
input_resource_t
*
p_resource
;
/* Stats counters */
/* Stats counters */
...
...
src/input/resource.h
View file @
1ca4b2a3
...
@@ -25,8 +25,8 @@
...
@@ -25,8 +25,8 @@
# error This header file can only be included from LibVLC.
# error This header file can only be included from LibVLC.
#endif
#endif
#ifndef _INPUT_RES
S
OURCE_H
#ifndef _INPUT_RESOURCE_H
#define _INPUT_RES
S
OURCE_H 1
#define _INPUT_RESOURCE_H 1
#include <vlc_common.h>
#include <vlc_common.h>
...
...
src/input/vlm.c
View file @
1ca4b2a3
...
@@ -773,7 +773,7 @@ static void vlm_MediaInstanceDelete( vlm_media_instance_sys_t *p_instance )
...
@@ -773,7 +773,7 @@ static void vlm_MediaInstanceDelete( vlm_media_instance_sys_t *p_instance )
input_StopThread
(
p_input
);
input_StopThread
(
p_input
);
vlc_thread_join
(
p_input
);
vlc_thread_join
(
p_input
);
p_resource
=
input_DetachRes
s
ource
(
p_input
);
p_resource
=
input_DetachResource
(
p_input
);
input_resource_Delete
(
p_resource
);
input_resource_Delete
(
p_resource
);
vlc_object_release
(
p_input
);
vlc_object_release
(
p_input
);
...
@@ -854,7 +854,7 @@ static int vlm_ControlMediaInstanceStart( vlm_t *p_vlm, int64_t id, const char *
...
@@ -854,7 +854,7 @@ static int vlm_ControlMediaInstanceStart( vlm_t *p_vlm, int64_t id, const char *
input_StopThread
(
p_input
);
input_StopThread
(
p_input
);
vlc_thread_join
(
p_input
);
vlc_thread_join
(
p_input
);
p_instance
->
p_input_resource
=
input_DetachRes
s
ource
(
p_input
);
p_instance
->
p_input_resource
=
input_DetachResource
(
p_input
);
vlc_object_release
(
p_input
);
vlc_object_release
(
p_input
);
...
...
src/playlist/thread.c
View file @
1ca4b2a3
...
@@ -483,7 +483,7 @@ static int LoopInput( playlist_t *p_playlist )
...
@@ -483,7 +483,7 @@ static int LoopInput( playlist_t *p_playlist )
assert
(
p_sys
->
p_input_resource
==
NULL
);
assert
(
p_sys
->
p_input_resource
==
NULL
);
p_sys
->
p_input_resource
=
input_DetachRes
s
ource
(
p_input
);
p_sys
->
p_input_resource
=
input_DetachResource
(
p_input
);
PL_UNLOCK
;
PL_UNLOCK
;
/* We can unlock as we return VLC_EGENERIC (no event will be lost) */
/* We can unlock as we return VLC_EGENERIC (no event will be lost) */
...
...
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