A bit of headers cleanup

[vlc] / include / vlc_vlm.h

diff --git a/include/vlc_vlm.h b/include/vlc_vlm.h
index 49ca30298211b33da7bf9b4b2081e5081c43a062..fcb90b6d073298d84586aa282339df84b21e47e4 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,12 +19,18 @@
  *
  * 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.
  *****************************************************************************/
 
 #ifndef _VLC_VLM_H
 #define _VLC_VLM_H 1
 
+#ifdef __cpluplus
+extern "C" {
+#endif
+
+#include <vlc_input.h>
+
 /* VLM specific - structures and functions */
 enum
 {
@@ -46,7 +52,7 @@ typedef struct
 
 } vlm_media_instance_t;
 
-typedef struct
+struct vlm_media_t
 {
     vlc_bool_t b_enabled;
     int      i_type;
@@ -69,15 +75,16 @@ typedef struct
 
     /* only for vod */
     vod_media_t *vod_media;
+    char *psz_vod_output;
+    char *psz_mux;
 
     /* actual input instances */
     int                  i_instance;
     vlm_media_instance_t **instance;
 
-} vlm_media_t;
-
+};
 
-typedef struct
+struct vlm_schedule_t
 {
     /* names "schedule" is reserved */
     char    *psz_name;
@@ -95,7 +102,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
@@ -131,7 +138,22 @@ struct vlm_t
 #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( 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