Do not include vlc_modules.h in vlc_common.h

[vlc] / src / input / vlm.c

diff --git a/src/input/vlm.c b/src/input/vlm.c
index ffcf57d02ce0bc2e2eb0b2e96b89add077bd6fad..8e8a5d2f607cf4314c7a429f472c781b6073bcdd 100644 (file)
--- a/src/input/vlm.c
+++ b/src/input/vlm.c
@@ -37,6 +37,7 @@
 #include <assert.h>
 
 #include <vlc_vlm.h>
+#include <vlc_modules.h>
 
 #ifndef WIN32
 #   include <sys/time.h>                                   /* gettimeofday() */
@@ -227,7 +228,6 @@ static void vlm_Destructor( vlm_t *p_vlm )
     if( p_vlm->p_vod )
     {
         module_unneed( p_vlm->p_vod, p_vlm->p_vod->p_module );
-        vlc_object_detach( p_vlm->p_vod );
         vlc_object_release( p_vlm->p_vod );
     }
 
@@ -868,7 +868,10 @@ static void vlm_MediaInstanceDelete( vlm_t *p_vlm, int64_t id, vlm_media_instanc
         vlm_SendEventMediaInstanceStopped( p_vlm, id, p_media->cfg.psz_name );
     }
     if( p_instance->p_input_resource )
-        input_resource_Delete( p_instance->p_input_resource );
+    {
+        input_resource_Terminate( p_instance->p_input_resource );
+        input_resource_Release( p_instance->p_input_resource );
+    }
 
     TAB_REMOVE( p_media->i_instance, p_media->instance, p_instance );
     vlc_gc_decref( p_instance->p_item );