X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Fvlm_internal.h;h=286912d083e69ccdf8ec1ba378fabca716d05988;hb=1f234ff62223893fb8e7cb4d289f384f3e4bfae0;hp=670f5a16c828342c3d4e02ff95ec357b7e11867d;hpb=d745c19b21432e69b27af4f92782c4814fc24d0d;p=vlc

diff --git a/src/input/vlm_internal.h b/src/input/vlm_internal.h
index 670f5a16c8..286912d083 100644
--- a/src/input/vlm_internal.h
+++ b/src/input/vlm_internal.h
@@ -1,34 +1,31 @@
 /*****************************************************************************
  * vlm_internal.h: Internal vlm structures
  *****************************************************************************
- * Copyright (C) 1998-2006 the VideoLAN team
+ * Copyright (C) 1998-2006 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#if defined(__PLUGIN__) || defined(__BUILTIN__) || !defined(__LIBVLC__)
-# error This header file can only be included from LibVLC.
-#endif
-
-#ifndef _VLM_INTERNAL_H
-#define _VLM_INTERNAL_H 1
+#ifndef LIBVLC_VLM_INTERNAL_H
+#define LIBVLC_VLM_INTERNAL_H 1
 
 #include <vlc_vlm.h>
+#include "input_interface.h"
 
 /* Private */
 typedef struct
@@ -41,9 +38,10 @@ typedef struct
 
     bool      b_sout_keep;
 
-    input_item_t    *p_item;
-    input_thread_t  *p_input;
-    sout_instance_t *p_sout;
+    vlc_object_t *p_parent;
+    input_item_t      *p_item;
+    input_thread_t    *p_input;
+    input_resource_t *p_input_resource;
 
 } vlm_media_instance_sys_t;
 
@@ -89,12 +87,16 @@ struct vlm_t
 
     vlc_mutex_t  lock;
     vlc_thread_t thread;
+    vlc_mutex_t  lock_manage;
+    vlc_cond_t   wait_manage;
+    unsigned     users;
 
+    /* tell vlm thread there is work to do */
+    bool         input_state_changed;
     /* */
     int64_t        i_id;
 
     /* Vod server (used by media) */
-    int            i_vod;
     vod_t          *p_vod;
 
     /* Media list */