Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
4678f5e8
Commit
4678f5e8
authored
Feb 03, 2010
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
LibVLC VoD: remove exceptions
parent
3bcf3fa0
Changes
2
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
112 additions
and
139 deletions
+112
-139
include/vlc/libvlc_vlm.h
include/vlc/libvlc_vlm.h
+49
-60
src/control/vlm.c
src/control/vlm.c
+63
-79
No files found.
include/vlc/libvlc_vlm.h
View file @
4678f5e8
...
@@ -62,14 +62,13 @@ VLC_PUBLIC_API void libvlc_vlm_release( libvlc_instance_t * );
...
@@ -62,14 +62,13 @@ VLC_PUBLIC_API void libvlc_vlm_release( libvlc_instance_t * );
* \param ppsz_options additional options
* \param ppsz_options additional options
* \param b_enabled boolean for enabling the new broadcast
* \param b_enabled boolean for enabling the new broadcast
* \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 pointe
r
* \
return 0 on success, -1 on erro
r
*/
*/
VLC_PUBLIC_API
void
libvlc_vlm_add_broadcast
(
libvlc_instance_t
*
,
VLC_PUBLIC_API
int
libvlc_vlm_add_broadcast
(
libvlc_instance_t
*
,
const
char
*
,
const
char
*
,
const
char
*
,
const
char
*
,
const
char
*
,
int
,
const
char
*
,
int
,
const
char
*
const
*
,
const
char
*
const
*
,
int
,
int
,
int
,
int
);
libvlc_exception_t
*
);
/**
/**
* Add a vod, with one input.
* Add a vod, with one input.
...
@@ -81,24 +80,21 @@ VLC_PUBLIC_API void libvlc_vlm_add_broadcast( libvlc_instance_t *,
...
@@ -81,24 +80,21 @@ VLC_PUBLIC_API void libvlc_vlm_add_broadcast( libvlc_instance_t *,
* \param ppsz_options additional options
* \param ppsz_options additional options
* \param b_enabled boolean for enabling the new vod
* \param b_enabled boolean for enabling the new vod
* \param psz_mux the muxer of the vod media
* \param psz_mux the muxer of the vod media
* \param
p_e an initialized exception pointe
r
* \param
0 on success, -1 on erro
r
*/
*/
VLC_PUBLIC_API
void
libvlc_vlm_add_vod
(
libvlc_instance_t
*
,
VLC_PUBLIC_API
int
libvlc_vlm_add_vod
(
libvlc_instance_t
*
,
const
char
*
,
const
char
*
,
const
char
*
,
const
char
*
,
int
,
const
char
*
const
*
,
int
,
const
char
*
const
*
,
int
,
const
char
*
,
int
,
const
char
*
);
libvlc_exception_t
*
);
/**
/**
* Delete a media (VOD or broadcast).
* Delete a media (VOD or broadcast).
*
*
* \param p_instance the instance
* \param p_instance the instance
* \param psz_name the media to delete
* \param psz_name the media to delete
* \
param p_e an initialized exception pointe
r
* \
return 0 on success, -1 on erro
r
*/
*/
VLC_PUBLIC_API
void
libvlc_vlm_del_media
(
libvlc_instance_t
*
,
VLC_PUBLIC_API
int
libvlc_vlm_del_media
(
libvlc_instance_t
*
,
const
char
*
);
const
char
*
,
libvlc_exception_t
*
);
/**
/**
* Enable or disable a media (VOD or broadcast).
* Enable or disable a media (VOD or broadcast).
...
@@ -106,10 +102,10 @@ VLC_PUBLIC_API void libvlc_vlm_del_media( libvlc_instance_t *,
...
@@ -106,10 +102,10 @@ VLC_PUBLIC_API void libvlc_vlm_del_media( libvlc_instance_t *,
* \param p_instance the instance
* \param p_instance the instance
* \param psz_name the media to work on
* \param psz_name the media to work on
* \param b_enabled the new status
* \param b_enabled the new status
* \
param p_e an initialized exception pointe
r
* \
return 0 on success, -1 on erro
r
*/
*/
VLC_PUBLIC_API
void
libvlc_vlm_set_enabled
(
libvlc_instance_t
*
,
const
char
*
,
VLC_PUBLIC_API
int
libvlc_vlm_set_enabled
(
libvlc_instance_t
*
,
const
char
*
,
int
,
libvlc_exception_t
*
);
int
);
/**
/**
* Set the output for a media.
* Set the output for a media.
...
@@ -117,11 +113,10 @@ VLC_PUBLIC_API void libvlc_vlm_set_enabled( libvlc_instance_t *, const char *,
...
@@ -117,11 +113,10 @@ VLC_PUBLIC_API void libvlc_vlm_set_enabled( libvlc_instance_t *, const char *,
* \param p_instance the instance
* \param p_instance the instance
* \param psz_name the media to work on
* \param psz_name the media to work on
* \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 pointe
r
* \
return 0 on success, -1 on erro
r
*/
*/
VLC_PUBLIC_API
void
libvlc_vlm_set_output
(
libvlc_instance_t
*
,
const
char
*
,
VLC_PUBLIC_API
int
libvlc_vlm_set_output
(
libvlc_instance_t
*
,
const
char
*
,
const
char
*
,
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
...
@@ -130,11 +125,10 @@ VLC_PUBLIC_API void libvlc_vlm_set_output( libvlc_instance_t *, const char *,
...
@@ -130,11 +125,10 @@ VLC_PUBLIC_API void libvlc_vlm_set_output( libvlc_instance_t *, const char *,
* \param p_instance the instance
* \param p_instance the instance
* \param psz_name the media to work on
* \param psz_name the media to work on
* \param psz_input the input MRL
* \param psz_input the input MRL
* \
param p_e an initialized exception pointe
r
* \
return 0 on success, -1 on erro
r
*/
*/
VLC_PUBLIC_API
void
libvlc_vlm_set_input
(
libvlc_instance_t
*
,
const
char
*
,
VLC_PUBLIC_API
int
libvlc_vlm_set_input
(
libvlc_instance_t
*
,
const
char
*
,
const
char
*
,
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.
...
@@ -142,21 +136,21 @@ VLC_PUBLIC_API void libvlc_vlm_set_input( libvlc_instance_t *, const char *,
...
@@ -142,21 +136,21 @@ VLC_PUBLIC_API void libvlc_vlm_set_input( libvlc_instance_t *, const char *,
* \param p_instance the instance
* \param p_instance the instance
* \param psz_name the media to work on
* \param psz_name the media to work on
* \param psz_input the input MRL
* \param psz_input the input MRL
* \
param p_e an initialized exception pointe
r
* \
return 0 on success, -1 on erro
r
*/
*/
VLC_PUBLIC_API
void
libvlc_vlm_add_input
(
libvlc_instance_t
*
,
const
char
*
,
VLC_PUBLIC_API
int
libvlc_vlm_add_input
(
libvlc_instance_t
*
,
const
char
*
,
const
char
*
,
const
char
*
);
libvlc_exception_t
*
);
/**
/**
* Set a media's loop status.
* Set a media's loop status.
*
*
* \param p_instance the instance
* \param p_instance the instance
* \param psz_name the media to work on
* \param psz_name the media to work on
* \param b_loop the new status
* \param b_loop the new status
* \
param p_e an initialized exception pointe
r
* \
return 0 on success, -1 on erro
r
*/
*/
VLC_PUBLIC_API
void
libvlc_vlm_set_loop
(
libvlc_instance_t
*
,
const
char
*
,
VLC_PUBLIC_API
int
libvlc_vlm_set_loop
(
libvlc_instance_t
*
,
const
char
*
,
int
,
libvlc_exception_t
*
);
int
);
/**
/**
* Set a media's vod muxer.
* Set a media's vod muxer.
...
@@ -164,10 +158,10 @@ VLC_PUBLIC_API void libvlc_vlm_set_loop( libvlc_instance_t *, const char *,
...
@@ -164,10 +158,10 @@ VLC_PUBLIC_API void libvlc_vlm_set_loop( libvlc_instance_t *, const char *,
* \param p_instance the instance
* \param p_instance the instance
* \param psz_name the media to work on
* \param psz_name the media to work on
* \param psz_mux the new muxer
* \param psz_mux the new muxer
* \
param p_e an initialized exception pointe
r
* \
return 0 on success, -1 on erro
r
*/
*/
VLC_PUBLIC_API
void
libvlc_vlm_set_mux
(
libvlc_instance_t
*
,
const
char
*
,
VLC_PUBLIC_API
int
libvlc_vlm_set_mux
(
libvlc_instance_t
*
,
const
char
*
,
const
char
*
,
libvlc_exception_t
*
);
const
char
*
);
/**
/**
* 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
...
@@ -181,43 +175,39 @@ VLC_PUBLIC_API void libvlc_vlm_set_mux( libvlc_instance_t *, const char *,
...
@@ -181,43 +175,39 @@ VLC_PUBLIC_API void libvlc_vlm_set_mux( libvlc_instance_t *, const char *,
* \param ppsz_options additional options
* \param ppsz_options additional options
* \param b_enabled boolean for enabling the new broadcast
* \param b_enabled boolean for enabling the new broadcast
* \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 pointe
r
* \
return 0 on success, -1 on erro
r
*/
*/
VLC_PUBLIC_API
void
libvlc_vlm_change_media
(
libvlc_instance_t
*
,
VLC_PUBLIC_API
int
libvlc_vlm_change_media
(
libvlc_instance_t
*
,
const
char
*
,
const
char
*
,
const
char
*
,
const
char
*
,
const
char
*
,
int
,
const
char
*
,
int
,
const
char
*
const
*
,
int
,
int
,
const
char
*
const
*
,
int
,
int
);
libvlc_exception_t
*
);
/**
/**
* Play the named broadcast.
* Play the named broadcast.
*
*
* \param p_instance the instance
* \param p_instance the instance
* \param psz_name the name of the broadcast
* \param psz_name the name of the broadcast
* \
param p_e an initialized exception pointe
r
* \
return 0 on success, -1 on erro
r
*/
*/
VLC_PUBLIC_API
void
libvlc_vlm_play_media
(
libvlc_instance_t
*
,
const
char
*
,
VLC_PUBLIC_API
int
libvlc_vlm_play_media
(
libvlc_instance_t
*
,
const
char
*
);
libvlc_exception_t
*
);
/**
/**
* Stop the named broadcast.
* Stop the named broadcast.
*
*
* \param p_instance the instance
* \param p_instance the instance
* \param psz_name the name of the broadcast
* \param psz_name the name of the broadcast
* \
param p_e an initialized exception pointe
r
* \
return 0 on success, -1 on erro
r
*/
*/
VLC_PUBLIC_API
void
libvlc_vlm_stop_media
(
libvlc_instance_t
*
,
const
char
*
,
VLC_PUBLIC_API
int
libvlc_vlm_stop_media
(
libvlc_instance_t
*
,
const
char
*
);
libvlc_exception_t
*
);
/**
/**
* Pause the named broadcast.
* Pause the named broadcast.
*
*
* \param p_instance the instance
* \param p_instance the instance
* \param psz_name the name of the broadcast
* \param psz_name the name of the broadcast
* \
param p_e an initialized exception pointe
r
* \
return 0 on success, -1 on erro
r
*/
*/
VLC_PUBLIC_API
void
libvlc_vlm_pause_media
(
libvlc_instance_t
*
,
const
char
*
,
VLC_PUBLIC_API
int
libvlc_vlm_pause_media
(
libvlc_instance_t
*
,
const
char
*
);
libvlc_exception_t
*
);
/**
/**
* Seek in the named broadcast.
* Seek in the named broadcast.
...
@@ -225,10 +215,10 @@ VLC_PUBLIC_API void libvlc_vlm_pause_media( libvlc_instance_t *, const char *,
...
@@ -225,10 +215,10 @@ VLC_PUBLIC_API void libvlc_vlm_pause_media( libvlc_instance_t *, const char *,
* \param p_instance the instance
* \param p_instance the instance
* \param psz_name the name of the broadcast
* \param psz_name the name of the broadcast
* \param f_percentage the percentage to seek to
* \param f_percentage the percentage to seek to
* \
param p_e an initialized exception pointe
r
* \
return 0 on success, -1 on erro
r
*/
*/
VLC_PUBLIC_API
void
libvlc_vlm_seek_media
(
libvlc_instance_t
*
,
const
char
*
,
VLC_PUBLIC_API
int
libvlc_vlm_seek_media
(
libvlc_instance_t
*
,
const
char
*
,
float
,
libvlc_exception_t
*
);
float
);
/**
/**
* Return information about the named media as a JSON
* Return information about the named media as a JSON
...
@@ -244,11 +234,10 @@ VLC_PUBLIC_API void libvlc_vlm_seek_media( libvlc_instance_t *, const char *,
...
@@ -244,11 +234,10 @@ VLC_PUBLIC_API void libvlc_vlm_seek_media( libvlc_instance_t *, const char *,
* \param p_instance the instance
* \param p_instance the instance
* \param psz_name the name of the media,
* \param psz_name the name of the media,
* if the name is an empty string, all media is described
* if the name is an empty string, all media is described
* \param p_e an initialized exception pointer
* \return string with information about named media, or NULL on error
* \return string with information about named media
*/
*/
VLC_PUBLIC_API
const
char
*
libvlc_vlm_show_media
(
libvlc_instance_t
*
,
const
char
*
,
VLC_PUBLIC_API
const
char
*
libvlc_vlm_show_media
(
libvlc_instance_t
*
,
libvlc_exception_t
*
);
const
char
*
);
/**
/**
* Get vlm_media instance position by name or instance id
* Get vlm_media instance position by name or instance id
...
...
src/control/vlm.c
View file @
4678f5e8
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment