Fixed the volume control

[vlc] / include / vlc_vlm.h

diff --git a/include/vlc_vlm.h b/include/vlc_vlm.h
index 1e7fa244d1d9d1e8b2b9fbdd7e1e5aa3f4e65465..ed3bacac5ac23298c7e6c6e5327b46b363e89278 100644 (file)
--- a/include/vlc_vlm.h
+++ b/include/vlc_vlm.h
@@ -29,9 +29,23 @@
 enum
 {
     VOD_TYPE = 0,
-    BROADCAST_TYPE = 1,
+    BROADCAST_TYPE,
+    SCHEDULE_TYPE,
 };
 
+typedef struct
+{
+    /* instance name */
+    char *psz_name;
+
+    /* "playlist" index */
+    int i_index;
+
+    input_item_t   item;
+    input_thread_t *p_input;
+
+} vlm_media_instance_t;
+
 typedef struct
 {
     vlc_bool_t b_enabled;
@@ -39,24 +53,28 @@ typedef struct
 
     /* name "media" is reserved */
     char    *psz_name;
+    input_item_t item;
 
+    /* "playlist" */
     int     i_input;
     char    **input;
 
-    /* only for broadcast */
-    vlc_bool_t b_loop;
-
-    /* "playlist" index */
-    int     i_index;
+    int     i_option;
+    char    **option;
 
     char    *psz_output;
 
-    int     i_option;
-    char    **option;
+    /* only for broadcast */
+    vlc_bool_t b_loop;
+
+    /* only for vod */
+    vod_media_t *vod_media;
+    char *psz_vod_output;
+    char *psz_mux;
 
-    /* global options for all inputs */
-    input_item_t    item;
-    input_thread_t  *p_input;
+    /* actual input instances */
+    int                  i_instance;
+    vlm_media_instance_t **instance;
 
 } vlm_media_t;
 
@@ -101,28 +119,21 @@ struct vlm_t
 
     vlc_mutex_t lock;
 
-#if 0
-    int         i_vod;
-    vlm_media_t **vod;
-
-    int         i_broadcast;
-    vlm_media_t **broadcast;
-#endif
-
     int            i_media;
     vlm_media_t    **media;
 
+    int            i_vod;
+    vod_t          *vod;
+
     int            i_schedule;
     vlm_schedule_t **schedule;
 };
 
 
 #define vlm_New( a ) __vlm_New( VLC_OBJECT(a) )
-
 VLC_EXPORT( vlm_t *, __vlm_New, ( vlc_object_t * ) );
-VLC_EXPORT( void,    vlm_Delete, ( vlm_t * ) );
-
-VLC_EXPORT( int,     vlm_ExecuteCommand, ( vlm_t *, char *, vlm_message_t **) );
-VLC_EXPORT( void,    vlm_MessageDelete, ( vlm_message_t* ) );
+VLC_EXPORT( void, vlm_Delete, ( vlm_t * ) );
+VLC_EXPORT( int, vlm_ExecuteCommand, ( vlm_t *, char *, vlm_message_t ** ) );
+VLC_EXPORT( void, vlm_MessageDelete, ( vlm_message_t* ) );
 
 #endif