Commit 1ca4b2a3 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Ressource -> Resource

parent c5746ee2
...@@ -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_DetachRessource( 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 );
......
...@@ -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_DetachRessource( input_thread_t * ); input_resource_t *input_DetachResource( input_thread_t * );
/* */ /* */
typedef enum typedef enum
......
...@@ -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;
/* Ressources */ /* Resources */
input_resource_t *p_resource; input_resource_t *p_resource;
/* Stats counters */ /* Stats counters */
......
...@@ -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_RESSOURCE_H #ifndef _INPUT_RESOURCE_H
#define _INPUT_RESSOURCE_H 1 #define _INPUT_RESOURCE_H 1
#include <vlc_common.h> #include <vlc_common.h>
......
...@@ -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_DetachRessource( 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_DetachRessource( p_input ); p_instance->p_input_resource = input_DetachResource( p_input );
vlc_object_release( p_input ); vlc_object_release( p_input );
......
...@@ -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_DetachRessource( 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) */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment