Commit 555e2ac8 authored by Gildas Bazin's avatar Gildas Bazin

* src/misc/vlm.c:

   + major cleanup and bug fixing.
   + added support for spawning and controlling several media instances.
parent 454ccc41
...@@ -29,9 +29,23 @@ ...@@ -29,9 +29,23 @@
enum enum
{ {
VOD_TYPE = 0, 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 typedef struct
{ {
vlc_bool_t b_enabled; vlc_bool_t b_enabled;
...@@ -39,27 +53,26 @@ typedef struct ...@@ -39,27 +53,26 @@ typedef struct
/* name "media" is reserved */ /* name "media" is reserved */
char *psz_name; char *psz_name;
input_item_t item;
/* "playlist" */
int i_input; int i_input;
char **input; char **input;
int i_option;
char **option;
char *psz_output;
/* only for broadcast */ /* only for broadcast */
vlc_bool_t b_loop; vlc_bool_t b_loop;
/* only for vod */ /* only for vod */
vod_media_t *vod_media; vod_media_t *vod_media;
/* "playlist" index */ /* actual input instances */
int i_index; int i_instance;
vlm_media_instance_t **instance;
char *psz_output;
int i_option;
char **option;
/* global options for all inputs */
input_item_t item;
input_thread_t *p_input;
} vlm_media_t; } vlm_media_t;
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment