Commit 429820a6 authored by Sebastien Escudier's avatar Sebastien Escudier Committed by Antoine Cellerier

Add const to char * in vlm

Signed-off-by: default avatarAntoine Cellerier <dionoea@videolan.org>
parent cdc8bcd3
...@@ -65,8 +65,12 @@ VLC_PUBLIC_API void libvlc_vlm_release( libvlc_instance_t *, libvlc_exception_t ...@@ -65,8 +65,12 @@ VLC_PUBLIC_API void libvlc_vlm_release( libvlc_instance_t *, libvlc_exception_t
* \param b_loop Should this broadcast be played in loop ? * \param b_loop Should this broadcast be played in loop ?
* \param p_e an initialized exception pointer * \param p_e an initialized exception pointer
*/ */
VLC_PUBLIC_API void libvlc_vlm_add_broadcast( libvlc_instance_t *, char *, char *, char* , VLC_PUBLIC_API void libvlc_vlm_add_broadcast( libvlc_instance_t *,
int, char **, int, int, libvlc_exception_t * ); const char *, const char *,
const char * , int,
const char * const*,
int, int,
libvlc_exception_t * );
/** /**
* Add a vod, with one input. * Add a vod, with one input.
...@@ -80,8 +84,11 @@ VLC_PUBLIC_API void libvlc_vlm_add_broadcast( libvlc_instance_t *, char *, char ...@@ -80,8 +84,11 @@ VLC_PUBLIC_API void libvlc_vlm_add_broadcast( libvlc_instance_t *, char *, char
* \param psz_mux the muxer of the vod media * \param psz_mux the muxer of the vod media
* \param p_e an initialized exception pointer * \param p_e an initialized exception pointer
*/ */
VLC_PUBLIC_API void libvlc_vlm_add_vod( libvlc_instance_t *, char *, char *, int, char **, VLC_PUBLIC_API void libvlc_vlm_add_vod( libvlc_instance_t *,
int, char *, libvlc_exception_t * ); const char *, const char *,
int, const char * const*,
int, const char *,
libvlc_exception_t * );
/** /**
* Delete a media (VOD or broadcast). * Delete a media (VOD or broadcast).
...@@ -90,7 +97,9 @@ VLC_PUBLIC_API void libvlc_vlm_add_vod( libvlc_instance_t *, char *, char *, int ...@@ -90,7 +97,9 @@ VLC_PUBLIC_API void libvlc_vlm_add_vod( libvlc_instance_t *, char *, char *, int
* \param psz_name the media to delete * \param psz_name the media to delete
* \param p_e an initialized exception pointer * \param p_e an initialized exception pointer
*/ */
VLC_PUBLIC_API void libvlc_vlm_del_media( libvlc_instance_t *, char *, libvlc_exception_t * ); VLC_PUBLIC_API void libvlc_vlm_del_media( libvlc_instance_t *,
const char *,
libvlc_exception_t * );
/** /**
* Enable or disable a media (VOD or broadcast). * Enable or disable a media (VOD or broadcast).
...@@ -100,8 +109,8 @@ VLC_PUBLIC_API void libvlc_vlm_del_media( libvlc_instance_t *, char *, libvlc_ex ...@@ -100,8 +109,8 @@ VLC_PUBLIC_API void libvlc_vlm_del_media( libvlc_instance_t *, char *, libvlc_ex
* \param b_enabled the new status * \param b_enabled the new status
* \param p_e an initialized exception pointer * \param p_e an initialized exception pointer
*/ */
VLC_PUBLIC_API void libvlc_vlm_set_enabled( libvlc_instance_t *, char *, int, VLC_PUBLIC_API void libvlc_vlm_set_enabled( libvlc_instance_t *, const char *,
libvlc_exception_t *); int, libvlc_exception_t * );
/** /**
* Set the output for a media. * Set the output for a media.
...@@ -111,8 +120,9 @@ VLC_PUBLIC_API void libvlc_vlm_set_enabled( libvlc_instance_t *, char *, int, ...@@ -111,8 +120,9 @@ VLC_PUBLIC_API void libvlc_vlm_set_enabled( libvlc_instance_t *, char *, int,
* \param psz_output the output MRL (the parameter to the "sout" variable) * \param psz_output the output MRL (the parameter to the "sout" variable)
* \param p_e an initialized exception pointer * \param p_e an initialized exception pointer
*/ */
VLC_PUBLIC_API void libvlc_vlm_set_output( libvlc_instance_t *, char *, char*, VLC_PUBLIC_API void libvlc_vlm_set_output( libvlc_instance_t *, const char *,
libvlc_exception_t *); const char *,
libvlc_exception_t * );
/** /**
* Set a media's input MRL. This will delete all existing inputs and * Set a media's input MRL. This will delete all existing inputs and
...@@ -123,8 +133,9 @@ VLC_PUBLIC_API void libvlc_vlm_set_output( libvlc_instance_t *, char *, char*, ...@@ -123,8 +133,9 @@ VLC_PUBLIC_API void libvlc_vlm_set_output( libvlc_instance_t *, char *, char*,
* \param psz_input the input MRL * \param psz_input the input MRL
* \param p_e an initialized exception pointer * \param p_e an initialized exception pointer
*/ */
VLC_PUBLIC_API void libvlc_vlm_set_input( libvlc_instance_t *, char *, char*, VLC_PUBLIC_API void libvlc_vlm_set_input( libvlc_instance_t *, const char *,
libvlc_exception_t *); const char *,
libvlc_exception_t * );
/** /**
* Add a media's input MRL. This will add the specified one. * Add a media's input MRL. This will add the specified one.
...@@ -134,8 +145,9 @@ VLC_PUBLIC_API void libvlc_vlm_set_input( libvlc_instance_t *, char *, char*, ...@@ -134,8 +145,9 @@ VLC_PUBLIC_API void libvlc_vlm_set_input( libvlc_instance_t *, char *, char*,
* \param psz_input the input MRL * \param psz_input the input MRL
* \param p_e an initialized exception pointer * \param p_e an initialized exception pointer
*/ */
VLC_PUBLIC_API void libvlc_vlm_add_input( libvlc_instance_t *, char *, char *, VLC_PUBLIC_API void libvlc_vlm_add_input( libvlc_instance_t *, const char *,
libvlc_exception_t *p_exception ); const char *,
libvlc_exception_t * );
/** /**
* Set a media's loop status. * Set a media's loop status.
* *
...@@ -144,8 +156,8 @@ VLC_PUBLIC_API void libvlc_vlm_add_input( libvlc_instance_t *, char *, char *, ...@@ -144,8 +156,8 @@ VLC_PUBLIC_API void libvlc_vlm_add_input( libvlc_instance_t *, char *, char *,
* \param b_loop the new status * \param b_loop the new status
* \param p_e an initialized exception pointer * \param p_e an initialized exception pointer
*/ */
VLC_PUBLIC_API void libvlc_vlm_set_loop( libvlc_instance_t *, char *, int, VLC_PUBLIC_API void libvlc_vlm_set_loop( libvlc_instance_t *, const char *,
libvlc_exception_t *); int, libvlc_exception_t * );
/** /**
* Set a media's vod muxer. * Set a media's vod muxer.
...@@ -155,8 +167,8 @@ VLC_PUBLIC_API void libvlc_vlm_set_loop( libvlc_instance_t *, char *, int, ...@@ -155,8 +167,8 @@ VLC_PUBLIC_API void libvlc_vlm_set_loop( libvlc_instance_t *, char *, int,
* \param psz_mux the new muxer * \param psz_mux the new muxer
* \param p_e an initialized exception pointer * \param p_e an initialized exception pointer
*/ */
VLC_PUBLIC_API void libvlc_vlm_set_mux( libvlc_instance_t *p_instance, char *psz_name, VLC_PUBLIC_API void libvlc_vlm_set_mux( libvlc_instance_t *, const char *,
char *psz_mux, libvlc_exception_t *p_exception ); const char *, libvlc_exception_t * );
/** /**
* Edit the parameters of a media. This will delete all existing inputs and * Edit the parameters of a media. This will delete all existing inputs and
...@@ -172,8 +184,11 @@ VLC_PUBLIC_API void libvlc_vlm_set_mux( libvlc_instance_t *p_instance, char *psz ...@@ -172,8 +184,11 @@ VLC_PUBLIC_API void libvlc_vlm_set_mux( libvlc_instance_t *p_instance, char *psz
* \param b_loop Should this broadcast be played in loop ? * \param b_loop Should this broadcast be played in loop ?
* \param p_e an initialized exception pointer * \param p_e an initialized exception pointer
*/ */
VLC_PUBLIC_API void libvlc_vlm_change_media( libvlc_instance_t *, char *, char *, char* , VLC_PUBLIC_API void libvlc_vlm_change_media( libvlc_instance_t *,
int, char **, int, int, libvlc_exception_t * ); const char *, const char *,
const char* , int,
const char * const *, int, int,
libvlc_exception_t * );
/** /**
* Play the named broadcast. * Play the named broadcast.
...@@ -182,7 +197,8 @@ VLC_PUBLIC_API void libvlc_vlm_change_media( libvlc_instance_t *, char *, char * ...@@ -182,7 +197,8 @@ VLC_PUBLIC_API void libvlc_vlm_change_media( libvlc_instance_t *, char *, char *
* \param psz_name the name of the broadcast * \param psz_name the name of the broadcast
* \param p_e an initialized exception pointer * \param p_e an initialized exception pointer
*/ */
VLC_PUBLIC_API void libvlc_vlm_play_media ( libvlc_instance_t *, char *, libvlc_exception_t * ); VLC_PUBLIC_API void libvlc_vlm_play_media ( libvlc_instance_t *, const char *,
libvlc_exception_t * );
/** /**
* Stop the named broadcast. * Stop the named broadcast.
...@@ -191,7 +207,8 @@ VLC_PUBLIC_API void libvlc_vlm_play_media ( libvlc_instance_t *, char *, libvlc_ ...@@ -191,7 +207,8 @@ VLC_PUBLIC_API void libvlc_vlm_play_media ( libvlc_instance_t *, char *, libvlc_
* \param psz_name the name of the broadcast * \param psz_name the name of the broadcast
* \param p_e an initialized exception pointer * \param p_e an initialized exception pointer
*/ */
VLC_PUBLIC_API void libvlc_vlm_stop_media ( libvlc_instance_t *, char *, libvlc_exception_t * ); VLC_PUBLIC_API void libvlc_vlm_stop_media ( libvlc_instance_t *, const char *,
libvlc_exception_t * );
/** /**
* Pause the named broadcast. * Pause the named broadcast.
...@@ -200,7 +217,8 @@ VLC_PUBLIC_API void libvlc_vlm_stop_media ( libvlc_instance_t *, char *, libvlc_ ...@@ -200,7 +217,8 @@ VLC_PUBLIC_API void libvlc_vlm_stop_media ( libvlc_instance_t *, char *, libvlc_
* \param psz_name the name of the broadcast * \param psz_name the name of the broadcast
* \param p_e an initialized exception pointer * \param p_e an initialized exception pointer
*/ */
VLC_PUBLIC_API void libvlc_vlm_pause_media( libvlc_instance_t *, char *, libvlc_exception_t * ); VLC_PUBLIC_API void libvlc_vlm_pause_media( libvlc_instance_t *, const char *,
libvlc_exception_t * );
/** /**
* Seek in the named broadcast. * Seek in the named broadcast.
...@@ -210,7 +228,7 @@ VLC_PUBLIC_API void libvlc_vlm_pause_media( libvlc_instance_t *, char *, libvlc_ ...@@ -210,7 +228,7 @@ VLC_PUBLIC_API void libvlc_vlm_pause_media( libvlc_instance_t *, char *, libvlc_
* \param f_percentage the percentage to seek to * \param f_percentage the percentage to seek to
* \param p_e an initialized exception pointer * \param p_e an initialized exception pointer
*/ */
VLC_PUBLIC_API void libvlc_vlm_seek_media( libvlc_instance_t *, char *, VLC_PUBLIC_API void libvlc_vlm_seek_media( libvlc_instance_t *, const char *,
float, libvlc_exception_t * ); float, libvlc_exception_t * );
/** /**
...@@ -221,7 +239,8 @@ VLC_PUBLIC_API void libvlc_vlm_seek_media( libvlc_instance_t *, char *, ...@@ -221,7 +239,8 @@ VLC_PUBLIC_API void libvlc_vlm_seek_media( libvlc_instance_t *, char *,
* \param p_e an initialized exception pointer * \param p_e an initialized exception pointer
* \return string with information about named media * \return string with information about named media
*/ */
VLC_PUBLIC_API char* libvlc_vlm_show_media( libvlc_instance_t *, char *, libvlc_exception_t * ); VLC_PUBLIC_API char* libvlc_vlm_show_media( libvlc_instance_t *, const char *,
libvlc_exception_t * );
/** /**
* Get vlm_media instance position by name or instance id * Get vlm_media instance position by name or instance id
...@@ -232,8 +251,9 @@ VLC_PUBLIC_API char* libvlc_vlm_show_media( libvlc_instance_t *, char *, libvlc_ ...@@ -232,8 +251,9 @@ VLC_PUBLIC_API char* libvlc_vlm_show_media( libvlc_instance_t *, char *, libvlc_
* \param p_e an initialized exception pointer * \param p_e an initialized exception pointer
* \return position as float * \return position as float
*/ */
VLC_PUBLIC_API float libvlc_vlm_get_media_instance_position( libvlc_instance_t *p_instance, VLC_PUBLIC_API float libvlc_vlm_get_media_instance_position( libvlc_instance_t *,
char *psz_name, int i_instance, libvlc_exception_t *p_e ); const char *, int,
libvlc_exception_t * );
/** /**
* Get vlm_media instance time by name or instance id * Get vlm_media instance time by name or instance id
...@@ -244,8 +264,9 @@ VLC_PUBLIC_API float libvlc_vlm_get_media_instance_position( libvlc_instance_t * ...@@ -244,8 +264,9 @@ VLC_PUBLIC_API float libvlc_vlm_get_media_instance_position( libvlc_instance_t *
* \param p_e an initialized exception pointer * \param p_e an initialized exception pointer
* \return time as integer * \return time as integer
*/ */
VLC_PUBLIC_API int libvlc_vlm_get_media_instance_time( libvlc_instance_t *p_instance, VLC_PUBLIC_API int libvlc_vlm_get_media_instance_time( libvlc_instance_t *,
char *psz_name, int i_instance, libvlc_exception_t *p_e ); const char *, int,
libvlc_exception_t * );
/** /**
* Get vlm_media instance length by name or instance id * Get vlm_media instance length by name or instance id
...@@ -256,8 +277,9 @@ VLC_PUBLIC_API int libvlc_vlm_get_media_instance_time( libvlc_instance_t *p_inst ...@@ -256,8 +277,9 @@ VLC_PUBLIC_API int libvlc_vlm_get_media_instance_time( libvlc_instance_t *p_inst
* \param p_e an initialized exception pointer * \param p_e an initialized exception pointer
* \return length of media item * \return length of media item
*/ */
VLC_PUBLIC_API int libvlc_vlm_get_media_instance_length( libvlc_instance_t *p_instance, VLC_PUBLIC_API int libvlc_vlm_get_media_instance_length( libvlc_instance_t *,
char *psz_name, int i_instance, libvlc_exception_t *p_e ); const char *, int ,
libvlc_exception_t * );
/** /**
* Get vlm_media instance playback rate by name or instance id * Get vlm_media instance playback rate by name or instance id
...@@ -268,8 +290,9 @@ VLC_PUBLIC_API int libvlc_vlm_get_media_instance_length( libvlc_instance_t *p_in ...@@ -268,8 +290,9 @@ VLC_PUBLIC_API int libvlc_vlm_get_media_instance_length( libvlc_instance_t *p_in
* \param p_e an initialized exception pointer * \param p_e an initialized exception pointer
* \return playback rate * \return playback rate
*/ */
VLC_PUBLIC_API int libvlc_vlm_get_media_instance_rate( libvlc_instance_t *p_instance, VLC_PUBLIC_API int libvlc_vlm_get_media_instance_rate( libvlc_instance_t *,
char *psz_name, int i_instance, libvlc_exception_t *p_e ); const char *, int,
libvlc_exception_t * );
/** /**
* Get vlm_media instance title number by name or instance id * Get vlm_media instance title number by name or instance id
...@@ -280,8 +303,9 @@ VLC_PUBLIC_API int libvlc_vlm_get_media_instance_rate( libvlc_instance_t *p_inst ...@@ -280,8 +303,9 @@ VLC_PUBLIC_API int libvlc_vlm_get_media_instance_rate( libvlc_instance_t *p_inst
* \param p_e an initialized exception pointer * \param p_e an initialized exception pointer
* \return title as number * \return title as number
*/ */
VLC_PUBLIC_API int libvlc_vlm_get_media_instance_title( libvlc_instance_t *p_instance, VLC_PUBLIC_API int libvlc_vlm_get_media_instance_title( libvlc_instance_t *,
char *psz_name, int i_instance, libvlc_exception_t *p_e ); const char *, int,
libvlc_exception_t * );
/** /**
* Get vlm_media instance chapter number by name or instance id * Get vlm_media instance chapter number by name or instance id
...@@ -292,8 +316,9 @@ VLC_PUBLIC_API int libvlc_vlm_get_media_instance_title( libvlc_instance_t *p_ins ...@@ -292,8 +316,9 @@ VLC_PUBLIC_API int libvlc_vlm_get_media_instance_title( libvlc_instance_t *p_ins
* \param p_e an initialized exception pointer * \param p_e an initialized exception pointer
* \return chapter as number * \return chapter as number
*/ */
VLC_PUBLIC_API int libvlc_vlm_get_media_instance_chapter( libvlc_instance_t *p_instance, VLC_PUBLIC_API int libvlc_vlm_get_media_instance_chapter( libvlc_instance_t *,
char *psz_name, int i_instance, libvlc_exception_t *p_e ); const char *, int,
libvlc_exception_t * );
/** /**
* Is libvlc instance seekable ? * Is libvlc instance seekable ?
...@@ -304,8 +329,9 @@ VLC_PUBLIC_API int libvlc_vlm_get_media_instance_chapter( libvlc_instance_t *p_i ...@@ -304,8 +329,9 @@ VLC_PUBLIC_API int libvlc_vlm_get_media_instance_chapter( libvlc_instance_t *p_i
* \param p_e an initialized exception pointer * \param p_e an initialized exception pointer
* \return 1 if seekable, 0 if not * \return 1 if seekable, 0 if not
*/ */
VLC_PUBLIC_API int libvlc_vlm_get_media_instance_seekable( libvlc_instance_t *p_instance, VLC_PUBLIC_API int libvlc_vlm_get_media_instance_seekable( libvlc_instance_t *,
char *psz_name, int i_instance, libvlc_exception_t *p_e ); const char *, int,
libvlc_exception_t * );
/** @} */ /** @} */
......
...@@ -98,7 +98,8 @@ char* libvlc_vlm_show_media( libvlc_instance_t *p_instance, char *psz_name, ...@@ -98,7 +98,8 @@ char* libvlc_vlm_show_media( libvlc_instance_t *p_instance, char *psz_name,
} }
#else #else
char* libvlc_vlm_show_media( libvlc_instance_t *p_instance, char *psz_name, char* libvlc_vlm_show_media( libvlc_instance_t *p_instance,
const char *psz_name,
libvlc_exception_t *p_exception ) libvlc_exception_t *p_exception )
{ {
#ifdef ENABLE_VLM #ifdef ENABLE_VLM
...@@ -140,7 +141,8 @@ static int libvlc_vlm_init( libvlc_instance_t *p_instance, ...@@ -140,7 +141,8 @@ static int libvlc_vlm_init( libvlc_instance_t *p_instance,
#define VLM(p) VLM_RET(p,) #define VLM(p) VLM_RET(p,)
static vlm_media_instance_t *libvlc_vlm_get_media_instance( libvlc_instance_t *p_instance, static vlm_media_instance_t *libvlc_vlm_get_media_instance( libvlc_instance_t *p_instance,
char *psz_name, int i_minstance_idx, const char *psz_name,
int i_minstance_idx,
libvlc_exception_t *p_exception ) libvlc_exception_t *p_exception )
{ {
#ifdef ENABLE_VLM #ifdef ENABLE_VLM
...@@ -189,9 +191,11 @@ void libvlc_vlm_release( libvlc_instance_t *p_instance, libvlc_exception_t *p_ex ...@@ -189,9 +191,11 @@ void libvlc_vlm_release( libvlc_instance_t *p_instance, libvlc_exception_t *p_ex
#endif #endif
} }
void libvlc_vlm_add_broadcast( libvlc_instance_t *p_instance, char *psz_name, void libvlc_vlm_add_broadcast( libvlc_instance_t *p_instance,
char *psz_input, char *psz_output, const char *psz_name,
int i_options, char **ppsz_options, const char *psz_input,
const char *psz_output, int i_options,
const char * const *ppsz_options,
int b_enabled, int b_loop, int b_enabled, int b_loop,
libvlc_exception_t *p_exception ) libvlc_exception_t *p_exception )
{ {
...@@ -224,10 +228,10 @@ void libvlc_vlm_add_broadcast( libvlc_instance_t *p_instance, char *psz_name, ...@@ -224,10 +228,10 @@ void libvlc_vlm_add_broadcast( libvlc_instance_t *p_instance, char *psz_name,
#endif #endif
} }
void libvlc_vlm_add_vod( libvlc_instance_t *p_instance, char *psz_name, void libvlc_vlm_add_vod( libvlc_instance_t *p_instance, const char *psz_name,
char *psz_input, int i_options, const char *psz_input, int i_options,
char **ppsz_options, int b_enabled, const char * const *ppsz_options, int b_enabled,
char *psz_mux, libvlc_exception_t *p_exception ) const char *psz_mux, libvlc_exception_t *p_exception )
{ {
#ifdef ENABLE_VLM #ifdef ENABLE_VLM
vlm_t *p_vlm; vlm_t *p_vlm;
...@@ -256,7 +260,7 @@ void libvlc_vlm_add_vod( libvlc_instance_t *p_instance, char *psz_name, ...@@ -256,7 +260,7 @@ void libvlc_vlm_add_vod( libvlc_instance_t *p_instance, char *psz_name,
#endif #endif
} }
void libvlc_vlm_del_media( libvlc_instance_t *p_instance, char *psz_name, void libvlc_vlm_del_media( libvlc_instance_t *p_instance, const char *psz_name,
libvlc_exception_t *p_exception ) libvlc_exception_t *p_exception )
{ {
#ifdef ENABLE_VLM #ifdef ENABLE_VLM
...@@ -300,8 +304,9 @@ void libvlc_vlm_del_media( libvlc_instance_t *p_instance, char *psz_name, ...@@ -300,8 +304,9 @@ void libvlc_vlm_del_media( libvlc_instance_t *p_instance, char *psz_name,
libvlc_exception_raise( p_exception, psz_error, psz_name );\ libvlc_exception_raise( p_exception, psz_error, psz_name );\
} while(0) } while(0)
void libvlc_vlm_set_enabled( libvlc_instance_t *p_instance, char *psz_name, void libvlc_vlm_set_enabled( libvlc_instance_t *p_instance,
int b_enabled, libvlc_exception_t *p_exception ) const char *psz_name, int b_enabled,
libvlc_exception_t *p_exception )
{ {
#ifdef ENABLE_VLM #ifdef ENABLE_VLM
#define VLM_CHANGE_CODE { p_media->b_enabled = b_enabled; } #define VLM_CHANGE_CODE { p_media->b_enabled = b_enabled; }
...@@ -313,7 +318,7 @@ void libvlc_vlm_set_enabled( libvlc_instance_t *p_instance, char *psz_name, ...@@ -313,7 +318,7 @@ void libvlc_vlm_set_enabled( libvlc_instance_t *p_instance, char *psz_name,
#endif #endif
} }
void libvlc_vlm_set_loop( libvlc_instance_t *p_instance, char *psz_name, void libvlc_vlm_set_loop( libvlc_instance_t *p_instance, const char *psz_name,
int b_loop, libvlc_exception_t *p_exception ) int b_loop, libvlc_exception_t *p_exception )
{ {
#ifdef ENABLE_VLM #ifdef ENABLE_VLM
...@@ -326,8 +331,8 @@ void libvlc_vlm_set_loop( libvlc_instance_t *p_instance, char *psz_name, ...@@ -326,8 +331,8 @@ void libvlc_vlm_set_loop( libvlc_instance_t *p_instance, char *psz_name,
#endif #endif
} }
void libvlc_vlm_set_mux( libvlc_instance_t *p_instance, char *psz_name, void libvlc_vlm_set_mux( libvlc_instance_t *p_instance, const char *psz_name,
char *psz_mux, libvlc_exception_t *p_exception ) const char *psz_mux, libvlc_exception_t *p_exception )
{ {
#ifdef ENABLE_VLM #ifdef ENABLE_VLM
#define VLM_CHANGE_CODE { if( p_media->b_vod ) { \ #define VLM_CHANGE_CODE { if( p_media->b_vod ) { \
...@@ -342,8 +347,9 @@ void libvlc_vlm_set_mux( libvlc_instance_t *p_instance, char *psz_name, ...@@ -342,8 +347,9 @@ void libvlc_vlm_set_mux( libvlc_instance_t *p_instance, char *psz_name,
#endif #endif
} }
void libvlc_vlm_set_output( libvlc_instance_t *p_instance, char *psz_name, void libvlc_vlm_set_output( libvlc_instance_t *p_instance,
char *psz_output, libvlc_exception_t *p_exception ) const char *psz_name, const char *psz_output,
libvlc_exception_t *p_exception )
{ {
#ifdef ENABLE_VLM #ifdef ENABLE_VLM
#define VLM_CHANGE_CODE { free( p_media->psz_output ); \ #define VLM_CHANGE_CODE { free( p_media->psz_output ); \
...@@ -356,8 +362,9 @@ void libvlc_vlm_set_output( libvlc_instance_t *p_instance, char *psz_name, ...@@ -356,8 +362,9 @@ void libvlc_vlm_set_output( libvlc_instance_t *p_instance, char *psz_name,
#endif #endif
} }
void libvlc_vlm_set_input( libvlc_instance_t *p_instance, char *psz_name, void libvlc_vlm_set_input( libvlc_instance_t *p_instance,
char *psz_input, libvlc_exception_t *p_exception ) const char *psz_name, const char *psz_input,
libvlc_exception_t *p_exception )
{ {
#ifdef ENABLE_VLM #ifdef ENABLE_VLM
#define VLM_CHANGE_CODE { while( p_media->i_input > 0 ) \ #define VLM_CHANGE_CODE { while( p_media->i_input > 0 ) \
...@@ -371,8 +378,9 @@ void libvlc_vlm_set_input( libvlc_instance_t *p_instance, char *psz_name, ...@@ -371,8 +378,9 @@ void libvlc_vlm_set_input( libvlc_instance_t *p_instance, char *psz_name,
#endif #endif
} }
void libvlc_vlm_add_input( libvlc_instance_t *p_instance, char *psz_name, void libvlc_vlm_add_input( libvlc_instance_t *p_instance,
char *psz_input, libvlc_exception_t *p_exception ) const char *psz_name, const char *psz_input,
libvlc_exception_t *p_exception )
{ {
#ifdef ENABLE_VLM #ifdef ENABLE_VLM
#define VLM_CHANGE_CODE { TAB_APPEND( p_media->i_input, p_media->ppsz_input, strdup(psz_input) ); } #define VLM_CHANGE_CODE { TAB_APPEND( p_media->i_input, p_media->ppsz_input, strdup(psz_input) ); }
...@@ -384,10 +392,11 @@ void libvlc_vlm_add_input( libvlc_instance_t *p_instance, char *psz_name, ...@@ -384,10 +392,11 @@ void libvlc_vlm_add_input( libvlc_instance_t *p_instance, char *psz_name,
#endif #endif
} }
void libvlc_vlm_change_media( libvlc_instance_t *p_instance, char *psz_name, void libvlc_vlm_change_media( libvlc_instance_t *p_instance,
char *psz_input, char *psz_output, int i_options, const char *psz_name, const char *psz_input,
char **ppsz_options, int b_enabled, int b_loop, const char *psz_output, int i_options,
libvlc_exception_t *p_exception ) const char * const *ppsz_options, int b_enabled,
int b_loop, libvlc_exception_t *p_exception )
{ {
#ifdef ENABLE_VLM #ifdef ENABLE_VLM
#define VLM_CHANGE_CODE { int n; \ #define VLM_CHANGE_CODE { int n; \
...@@ -412,7 +421,8 @@ void libvlc_vlm_change_media( libvlc_instance_t *p_instance, char *psz_name, ...@@ -412,7 +421,8 @@ void libvlc_vlm_change_media( libvlc_instance_t *p_instance, char *psz_name,
#endif #endif
} }
void libvlc_vlm_play_media( libvlc_instance_t *p_instance, char *psz_name, void libvlc_vlm_play_media( libvlc_instance_t *p_instance,
const char *psz_name,
libvlc_exception_t *p_exception ) libvlc_exception_t *p_exception )
{ {
#ifdef ENABLE_VLM #ifdef ENABLE_VLM
...@@ -432,7 +442,8 @@ void libvlc_vlm_play_media( libvlc_instance_t *p_instance, char *psz_name, ...@@ -432,7 +442,8 @@ void libvlc_vlm_play_media( libvlc_instance_t *p_instance, char *psz_name,
#endif #endif
} }
void libvlc_vlm_stop_media( libvlc_instance_t *p_instance, char *psz_name, void libvlc_vlm_stop_media( libvlc_instance_t *p_instance,
const char *psz_name,
libvlc_exception_t *p_exception ) libvlc_exception_t *p_exception )
{ {
#ifdef ENABLE_VLM #ifdef ENABLE_VLM
...@@ -452,8 +463,9 @@ void libvlc_vlm_stop_media( libvlc_instance_t *p_instance, char *psz_name, ...@@ -452,8 +463,9 @@ void libvlc_vlm_stop_media( libvlc_instance_t *p_instance, char *psz_name,
#endif #endif
} }
void libvlc_vlm_pause_media( libvlc_instance_t *p_instance, char *psz_name, void libvlc_vlm_pause_media( libvlc_instance_t *p_instance,
libvlc_exception_t *p_exception ) const char *psz_name,
libvlc_exception_t *p_exception )
{ {
#ifdef ENABLE_VLM #ifdef ENABLE_VLM
vlm_t *p_vlm; vlm_t *p_vlm;
...@@ -472,8 +484,9 @@ void libvlc_vlm_pause_media( libvlc_instance_t *p_instance, char *psz_name, ...@@ -472,8 +484,9 @@ void libvlc_vlm_pause_media( libvlc_instance_t *p_instance, char *psz_name,
#endif #endif
} }
void libvlc_vlm_seek_media( libvlc_instance_t *p_instance, char *psz_name, void libvlc_vlm_seek_media( libvlc_instance_t *p_instance,
float f_percentage, libvlc_exception_t *p_exception ) const char *psz_name, float f_percentage,
libvlc_exception_t *p_exception )
{ {
#ifdef ENABLE_VLM #ifdef ENABLE_VLM
vlm_t *p_vlm; vlm_t *p_vlm;
...@@ -493,7 +506,9 @@ void libvlc_vlm_seek_media( libvlc_instance_t *p_instance, char *psz_name, ...@@ -493,7 +506,9 @@ void libvlc_vlm_seek_media( libvlc_instance_t *p_instance, char *psz_name,
} }
float libvlc_vlm_get_media_instance_position( libvlc_instance_t *p_instance, float libvlc_vlm_get_media_instance_position( libvlc_instance_t *p_instance,
char *psz_name, int i_instance, libvlc_exception_t *p_exception ) const char *psz_name,
int i_instance,
libvlc_exception_t *p_exception )
{ {
#ifdef ENABLE_VLM #ifdef ENABLE_VLM
float result = -1; float result = -1;
...@@ -514,7 +529,8 @@ float libvlc_vlm_get_media_instance_position( libvlc_instance_t *p_instance, ...@@ -514,7 +529,8 @@ float libvlc_vlm_get_media_instance_position( libvlc_instance_t *p_instance,
} }
int libvlc_vlm_get_media_instance_time( libvlc_instance_t *p_instance, int libvlc_vlm_get_media_instance_time( libvlc_instance_t *p_instance,
char *psz_name, int i_instance, libvlc_exception_t *p_exception ) const char *psz_name, int i_instance,
libvlc_exception_t *p_exception )
{ {
#ifdef ENABLE_VLM #ifdef ENABLE_VLM
int result = -1; int result = -1;
...@@ -535,7 +551,9 @@ int libvlc_vlm_get_media_instance_time( libvlc_instance_t *p_instance, ...@@ -535,7 +551,9 @@ int libvlc_vlm_get_media_instance_time( libvlc_instance_t *p_instance,
} }
int libvlc_vlm_get_media_instance_length( libvlc_instance_t *p_instance, int libvlc_vlm_get_media_instance_length( libvlc_instance_t *p_instance,
char *psz_name, int i_instance, libvlc_exception_t *p_exception ) const char *psz_name,
int i_instance,
libvlc_exception_t *p_exception )
{ {
#ifdef ENABLE_VLM #ifdef ENABLE_VLM
int result = -1; int result = -1;
...@@ -556,7 +574,8 @@ int libvlc_vlm_get_media_instance_length( libvlc_instance_t *p_instance, ...@@ -556,7 +574,8 @@ int libvlc_vlm_get_media_instance_length( libvlc_instance_t *p_instance,
} }
int libvlc_vlm_get_media_instance_rate( libvlc_instance_t *p_instance, int libvlc_vlm_get_media_instance_rate( libvlc_instance_t *p_instance,
char *psz_name, int i_instance, libvlc_exception_t *p_exception ) const char *psz_name, int i_instance,
libvlc_exception_t *p_exception )
{ {
#ifdef ENABLE_VLM #ifdef ENABLE_VLM
int result = -1; int result = -1;
...@@ -577,7 +596,8 @@ int libvlc_vlm_get_media_instance_rate( libvlc_instance_t *p_instance, ...@@ -577,7 +596,8 @@ int libvlc_vlm_get_media_instance_rate( libvlc_instance_t *p_instance,
} }
int libvlc_vlm_get_media_instance_title( libvlc_instance_t *p_instance, int libvlc_vlm_get_media_instance_title( libvlc_instance_t *p_instance,
char *psz_name, int i_instance, libvlc_exception_t *p_exception ) const char *psz_name, int i_instance,
libvlc_exception_t *p_exception )
{ {
#ifdef ENABLE_VLM #ifdef ENABLE_VLM
int result = 0; int result = 0;
...@@ -597,7 +617,9 @@ int libvlc_vlm_get_media_instance_title( libvlc_instance_t *p_instance, ...@@ -597,7 +617,9 @@ int libvlc_vlm_get_media_instance_title( libvlc_instance_t *p_instance,
} }
int libvlc_vlm_get_media_instance_chapter( libvlc_instance_t *p_instance, int libvlc_vlm_get_media_instance_chapter( libvlc_instance_t *p_instance,
char *psz_name, int i_instance, libvlc_exception_t *p_exception ) const char *psz_name,
int i_instance,
libvlc_exception_t *p_exception )
{ {
#ifdef ENABLE_VLM #ifdef ENABLE_VLM
int result = 0; int result = 0;
...@@ -617,7 +639,9 @@ int libvlc_vlm_get_media_instance_chapter( libvlc_instance_t *p_instance, ...@@ -617,7 +639,9 @@ int libvlc_vlm_get_media_instance_chapter( libvlc_instance_t *p_instance,
} }
int libvlc_vlm_get_media_instance_seekable( libvlc_instance_t *p_instance, int libvlc_vlm_get_media_instance_seekable( libvlc_instance_t *p_instance,
char *psz_name, int i_instance, libvlc_exception_t *p_exception ) const char *psz_name,
int i_instance,
libvlc_exception_t *p_exception )
{ {
#ifdef ENABLE_VLM #ifdef ENABLE_VLM
bool result = 0; bool result = 0;
......
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