[vlc-devel] commit: Ressource -> Resource ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Mar  1 12:44:07 2009 +0200| [1ca4b2a3c4598a411ddbc8a2d8ff2b93e10e0c76] | committer: Rémi Denis-Courmont 

Ressource -> Resource

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1ca4b2a3c4598a411ddbc8a2d8ff2b93e10e0c76
---

 src/input/input.c           |    2 +-
 src/input/input_interface.h |    2 +-
 src/input/input_internal.h  |    2 +-
 src/input/resource.h        |    4 ++--
 src/input/vlm.c             |    4 ++--
 src/playlist/thread.c       |    2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/input/input.c b/src/input/input.c
index 603f8d5..9f31424 100644
--- 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 cc59b5f..6a70209 100644
--- 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 118011a..e30e777 100644
--- 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 b5801fd..97c6f32 100644
--- 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 b83bdcf..03cad44 100644
--- 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 8fdf672..fc9617a 100644
--- 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) */