Removes trailing spaces. Removes tabs.

[vlc] / src / input / vlm_internal.h

diff --git a/src/input/vlm_internal.h b/src/input/vlm_internal.h
index 24f100107e59705c28e516478b86bedc615282c6..4896e52c797832af272ab4512343ddfcd3836b03 100644 (file)
--- a/src/input/vlm_internal.h
+++ b/src/input/vlm_internal.h
@@ -26,14 +26,7 @@
 
 #include <vlc_vlm.h>
 
-
-enum
-{
-       VOD_TYPE = 0,
-       BROADCAST_TYPE,
-       SCHEDULE_TYPE,
-};
-
+/* Private */
 typedef struct
 {
     /* instance name */
@@ -48,40 +41,25 @@ typedef struct
     input_thread_t  *p_input;
     sout_instance_t *p_sout;
 
-} vlm_media_instance_t;
-
-struct vlm_media_t
-{
-    vlc_bool_t b_enabled;
-    int      i_type;
-
-    /* name "media" is reserved */
-    char    *psz_name;
-    input_item_t item;
+} vlm_media_instance_sys_t;
 
-    /* "playlist" */
-    int     i_input;
-    char    **input;
 
-    int     i_option;
-    char    **option;
-
-    char    *psz_output;
-
-    /* only for broadcast */
-    vlc_bool_t b_loop;
+typedef struct
+{
+    vlm_media_t cfg;
 
-    /* only for vod */
-    vod_media_t *vod_media;
-    char *psz_vod_output;
-    char *psz_mux;
+    struct
+    {
+        input_item_t item;
+        vod_media_t *p_media;
+    } vod;
 
     /* actual input instances */
-    int                  i_instance;
-    vlm_media_instance_t **instance;
-};
+    int                      i_instance;
+    vlm_media_instance_sys_t **instance;
+} vlm_media_sys_t;
 
-struct vlm_schedule_t
+typedef struct
 {
     /* names "schedule" is reserved */
     char    *psz_name;
@@ -98,7 +76,7 @@ struct vlm_schedule_t
     /* number of times you have to repeat
        i_repeat < 0 : endless repeat     */
     int i_repeat;
-};
+} vlm_schedule_sys_t;
 
 
 struct vlm_t
@@ -107,14 +85,20 @@ struct vlm_t
 
     vlc_mutex_t lock;
 
-    int            i_media;
-    vlm_media_t    **media;
+    /* */
+    int64_t        i_id;
 
+    /* Vod server (used by media) */
     int            i_vod;
-    vod_t          *vod;
+    vod_t          *p_vod;
+
+    /* Media list */
+    int                i_media;
+    vlm_media_sys_t    **media;
 
+    /* Schedule list */
     int            i_schedule;
-    vlm_schedule_t **schedule;
+    vlm_schedule_sys_t **schedule;
 };
 
 #endif