A bit of vlc/libvlc cleanup:

[vlc] / include / vlc_vlm.h

diff --git a/include/vlc_vlm.h b/include/vlc_vlm.h
index ba4f2d5d1f4d4ceff97549c30acb5792c018e0ca..af0d6904cf0dcd9b9edcafdd7d426bda02c839c4 100644 (file)
--- a/include/vlc_vlm.h
+++ b/include/vlc_vlm.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
- * vlc_vlm.h: VLM interface plugin
+ * vlc_vlm.h: VLM core structures
  *****************************************************************************
- * Copyright (C) 2000, 2001 VideoLAN
+ * Copyright (C) 2000, 2001 the VideoLAN team
  * $Id$
  *
  * Authors: Simon Latapie <garf@videolan.org>
@@ -19,50 +19,76 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#if !defined( __LIBVLC__ )
+  #error You are not libvlc or one of its plugins. You cannot include this file
+#endif
+
 #ifndef _VLC_VLM_H
 #define _VLC_VLM_H 1
 
+#ifdef __cpluplus
+extern "C" {
+#endif
+
+#include <vlc_input.h>
+
 /* VLM specific - structures and functions */
 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;
+
+struct vlm_media_t
 {
     vlc_bool_t b_enabled;
     int      i_type;
 
     /* 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;
 
-    /* global options for all inputs */
-    char    **input_option;
-    int     i_input_option;
-    input_thread_t  *p_input;
+    /* only for vod */
+    vod_media_t *vod_media;
+    char *psz_vod_output;
+    char *psz_mux;
 
-} vlm_media_t;
+    /* actual input instances */
+    int                  i_instance;
+    vlm_media_instance_t **instance;
 
+};
 
-typedef struct
+struct vlm_schedule_t
 {
     /* names "schedule" is reserved */
     char    *psz_name;
@@ -80,7 +106,7 @@ typedef struct
        i_repeat < 0 : endless repeat     */
     int i_repeat;
 
-} vlm_schedule_t;
+};
 
 /* ok, here is the structure of a vlm_message:
    The parent node is ( name_of_the_command , NULL ), or
@@ -102,28 +128,36 @@ 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 *, const char *, vlm_message_t ** ) );
+VLC_EXPORT( void, vlm_MessageDelete, ( vlm_message_t * ) );
+VLC_EXPORT( vlm_media_t *, vlm_MediaNew, ( vlm_t *, const char *, int ) );
+VLC_EXPORT( void, vlm_MediaDelete, ( vlm_t *, vlm_media_t *, const char * ) );
+VLC_EXPORT( int, vlm_MediaSetup, ( vlm_t *, vlm_media_t *, const char *, const char * ) );
+VLC_EXPORT( int, vlm_MediaControl, ( vlm_t *, vlm_media_t *, const char *, const char *, const char * ) );
+VLC_EXPORT( vlm_media_t* , vlm_MediaSearch,( vlm_t *, const char *) );
+VLC_EXPORT( vlm_schedule_t *, vlm_ScheduleNew, ( vlm_t *, const char * ) );
+VLC_EXPORT( void, vlm_ScheduleDelete, ( vlm_t *, vlm_schedule_t *, const char * ) );
+VLC_EXPORT( int, vlm_ScheduleSetup, ( vlm_schedule_t *, const char *, const char * ) );
+VLC_EXPORT( int, vlm_MediaVodControl, ( void *, vod_media_t *, const char *, int, va_list ) );
+VLC_EXPORT( int, vlm_Save, ( vlm_t *, const char * ) );
+VLC_EXPORT( int, vlm_Load, ( vlm_t *, const char * ) );
+
+#ifdef __cpluplus
+}
+#endif
 
 #endif