Ressource -> Resource

diff --git a/src/input/input.c b/src/input/input.c
index 603f8d5b58c14c899f7d48dc2427600c80319e41..9f31424fa6ffc21d5682536fb40d48da135c9208 100644 (file)
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -440,7 +440,7 @@ void input_StopThread( input_thread_t *p_input )
     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 );
 

diff --git a/src/input/input_interface.h b/src/input/input_interface.h
index cc59b5fa96fadd3a3ffb4db1825ffedc2f36cf80..6a70209d0860760257085e0bb4c44cb5fa2ab218 100644 (file)
--- a/src/input/input_interface.h
+++ b/src/input/input_interface.h
@@ -82,7 +82,7 @@ input_thread_t *__input_CreateThreadExtended ( vlc_object_t *, input_item_t *, c
  * it will assert.
  * It does not support concurrent calls.
  */
-input_resource_t *input_DetachRessource( input_thread_t * );
+input_resource_t *input_DetachResource( input_thread_t * );
 
 /* */
 typedef enum

diff --git a/src/input/input_internal.h b/src/input/input_internal.h
index 118011ab536c339c9fd68c79a9442fba7a694e58..e30e777fe25aa7fb1c6d982a748e6d3915e8e297 100644 (file)
--- a/src/input/input_internal.h
+++ b/src/input/input_internal.h
@@ -129,7 +129,7 @@ struct input_thread_private_t
     int            i_slave;
     input_source_t **slave;
 
-    /* Ressources */
+    /* Resources */
     input_resource_t *p_resource;
 
     /* Stats counters */

diff --git a/src/input/resource.h b/src/input/resource.h
index b5801fd805be9f636842cb39973e92d124426d4f..97c6f3234c6319ba3a3599f359e21d3329bedd2f 100644 (file)
--- a/src/input/resource.h
+++ b/src/input/resource.h
@@ -25,8 +25,8 @@
 # error This header file can only be included from LibVLC.
 #endif
 
-#ifndef _INPUT_RESSOURCE_H
-#define _INPUT_RESSOURCE_H 1
+#ifndef _INPUT_RESOURCE_H
+#define _INPUT_RESOURCE_H 1
 
 #include <vlc_common.h>
 

diff --git a/src/input/vlm.c b/src/input/vlm.c
index b83bdcf2d91c365ba085fcc17b70e41d6a4573d7..03cad445c686dda481a962b438647864343ca8d0 100644 (file)
--- a/src/input/vlm.c
+++ b/src/input/vlm.c
@@ -773,7 +773,7 @@ static void vlm_MediaInstanceDelete( vlm_media_instance_sys_t *p_instance )
         input_StopThread( p_input );
         vlc_thread_join( p_input );
 
-        p_resource = input_DetachRessource( p_input );
+        p_resource = input_DetachResource( p_input );
         input_resource_Delete( p_resource );
 
         vlc_object_release( p_input );
@@ -854,7 +854,7 @@ static int vlm_ControlMediaInstanceStart( vlm_t *p_vlm, int64_t id, const char *
         input_StopThread( 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 );
 

diff --git a/src/playlist/thread.c b/src/playlist/thread.c
index 8fdf672927bfd93dff64d6fd871b5c7a05d3c680..fc9617aca3edf1dccb9c6918e61de49c9d25c66f 100644 (file)
--- a/src/playlist/thread.c
+++ b/src/playlist/thread.c
@@ -483,7 +483,7 @@ static int LoopInput( playlist_t *p_playlist )
 
         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;
         /* We can unlock as we return VLC_EGENERIC (no event will be lost) */