Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
fd78181d
Commit
fd78181d
authored
Jul 01, 2008
by
Antoine Cellerier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix compilation of VLC with --disable-vlm.
parent
6ca53488
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
70 additions
and
0 deletions
+70
-0
src/control/vlm.c
src/control/vlm.c
+70
-0
No files found.
src/control/vlm.c
View file @
fd78181d
...
@@ -127,6 +127,7 @@ static vlm_media_instance_t *libvlc_vlm_get_media_instance( libvlc_instance_t *p
...
@@ -127,6 +127,7 @@ static vlm_media_instance_t *libvlc_vlm_get_media_instance( libvlc_instance_t *p
char
*
psz_name
,
int
i_minstance_idx
,
char
*
psz_name
,
int
i_minstance_idx
,
libvlc_exception_t
*
p_exception
)
libvlc_exception_t
*
p_exception
)
{
{
#ifdef ENABLE_VLM
vlm_t
*
p_vlm
;
vlm_t
*
p_vlm
;
vlm_media_instance_t
**
pp_minstance
;
vlm_media_instance_t
**
pp_minstance
;
vlm_media_instance_t
*
p_minstance
;
vlm_media_instance_t
*
p_minstance
;
...
@@ -151,16 +152,25 @@ static vlm_media_instance_t *libvlc_vlm_get_media_instance( libvlc_instance_t *p
...
@@ -151,16 +152,25 @@ static vlm_media_instance_t *libvlc_vlm_get_media_instance( libvlc_instance_t *p
vlm_media_instance_Delete
(
pp_minstance
[
--
i_minstance
]
);
vlm_media_instance_Delete
(
pp_minstance
[
--
i_minstance
]
);
TAB_CLEAN
(
i_minstance
,
pp_minstance
);
TAB_CLEAN
(
i_minstance
,
pp_minstance
);
return
p_minstance
;
return
p_minstance
;
#else
libvlc_exception_raise
(
p_exception
,
"VLM has been disabled in this libvlc."
);
return
VLC_EGENERIC
;
#endif
}
}
void
libvlc_vlm_release
(
libvlc_instance_t
*
p_instance
,
libvlc_exception_t
*
p_exception
)
void
libvlc_vlm_release
(
libvlc_instance_t
*
p_instance
,
libvlc_exception_t
*
p_exception
)
{
{
#ifdef ENABLE_VLM
vlm_t
*
p_vlm
;
vlm_t
*
p_vlm
;
VLM
(
p_vlm
);
VLM
(
p_vlm
);
vlm_Delete
(
p_vlm
);
vlm_Delete
(
p_vlm
);
#else
libvlc_exception_raise
(
p_exception
,
"VLM has been disabled in this libvlc."
);
return
VLC_EGENERIC
;
#endif
}
}
...
@@ -170,6 +180,7 @@ void libvlc_vlm_add_broadcast( libvlc_instance_t *p_instance, char *psz_name,
...
@@ -170,6 +180,7 @@ void libvlc_vlm_add_broadcast( libvlc_instance_t *p_instance, char *psz_name,
int
b_enabled
,
int
b_loop
,
int
b_enabled
,
int
b_loop
,
libvlc_exception_t
*
p_exception
)
libvlc_exception_t
*
p_exception
)
{
{
#ifdef ENABLE_VLM
vlm_t
*
p_vlm
;
vlm_t
*
p_vlm
;
vlm_media_t
m
;
vlm_media_t
m
;
int
n
;
int
n
;
...
@@ -194,11 +205,16 @@ void libvlc_vlm_add_broadcast( libvlc_instance_t *p_instance, char *psz_name,
...
@@ -194,11 +205,16 @@ void libvlc_vlm_add_broadcast( libvlc_instance_t *p_instance, char *psz_name,
libvlc_exception_raise
(
p_exception
,
"Media %s creation failed"
,
psz_name
);
libvlc_exception_raise
(
p_exception
,
"Media %s creation failed"
,
psz_name
);
}
}
vlm_media_Clean
(
&
m
);
vlm_media_Clean
(
&
m
);
#else
libvlc_exception_raise
(
p_exception
,
"VLM has been disabled in this libvlc."
);
return
VLC_EGENERIC
;
#endif
}
}
void
libvlc_vlm_del_media
(
libvlc_instance_t
*
p_instance
,
char
*
psz_name
,
void
libvlc_vlm_del_media
(
libvlc_instance_t
*
p_instance
,
char
*
psz_name
,
libvlc_exception_t
*
p_exception
)
libvlc_exception_t
*
p_exception
)
{
{
#ifdef ENABLE_VLM
vlm_t
*
p_vlm
;
vlm_t
*
p_vlm
;
int64_t
id
;
int64_t
id
;
...
@@ -209,6 +225,10 @@ void libvlc_vlm_del_media( libvlc_instance_t *p_instance, char *psz_name,
...
@@ -209,6 +225,10 @@ void libvlc_vlm_del_media( libvlc_instance_t *p_instance, char *psz_name,
{
{
libvlc_exception_raise
(
p_exception
,
"Unable to delete %s"
,
psz_name
);
libvlc_exception_raise
(
p_exception
,
"Unable to delete %s"
,
psz_name
);
}
}
#else
libvlc_exception_raise
(
p_exception
,
"VLM has been disabled in this libvlc."
);
return
VLC_EGENERIC
;
#endif
}
}
#define VLM_CHANGE(psz_error, code ) do { \
#define VLM_CHANGE(psz_error, code ) do { \
...
@@ -238,44 +258,69 @@ void libvlc_vlm_del_media( libvlc_instance_t *p_instance, char *psz_name,
...
@@ -238,44 +258,69 @@ void libvlc_vlm_del_media( libvlc_instance_t *p_instance, char *psz_name,
void
libvlc_vlm_set_enabled
(
libvlc_instance_t
*
p_instance
,
char
*
psz_name
,
void
libvlc_vlm_set_enabled
(
libvlc_instance_t
*
p_instance
,
char
*
psz_name
,
int
b_enabled
,
libvlc_exception_t
*
p_exception
)
int
b_enabled
,
libvlc_exception_t
*
p_exception
)
{
{
#ifdef ENABLE_VLM
#define VLM_CHANGE_CODE { p_media->b_enabled = b_enabled; }
#define VLM_CHANGE_CODE { p_media->b_enabled = b_enabled; }
VLM_CHANGE
(
"Unable to delete %s"
,
VLM_CHANGE_CODE
);
VLM_CHANGE
(
"Unable to delete %s"
,
VLM_CHANGE_CODE
);
#undef VLM_CHANGE_CODE
#undef VLM_CHANGE_CODE
#else
libvlc_exception_raise
(
p_exception
,
"VLM has been disabled in this libvlc."
);
return
VLC_EGENERIC
;
#endif
}
}
void
libvlc_vlm_set_loop
(
libvlc_instance_t
*
p_instance
,
char
*
psz_name
,
void
libvlc_vlm_set_loop
(
libvlc_instance_t
*
p_instance
,
char
*
psz_name
,
int
b_loop
,
libvlc_exception_t
*
p_exception
)
int
b_loop
,
libvlc_exception_t
*
p_exception
)
{
{
#ifdef ENABLE_VLM
#define VLM_CHANGE_CODE { p_media->broadcast.b_loop = b_loop; }
#define VLM_CHANGE_CODE { p_media->broadcast.b_loop = b_loop; }
VLM_CHANGE
(
"Unable to change %s loop property"
,
VLM_CHANGE_CODE
);
VLM_CHANGE
(
"Unable to change %s loop property"
,
VLM_CHANGE_CODE
);
#undef VLM_CHANGE_CODE
#undef VLM_CHANGE_CODE
#else
libvlc_exception_raise
(
p_exception
,
"VLM has been disabled in this libvlc."
);
return
VLC_EGENERIC
;
#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_name
,
char
*
psz_output
,
libvlc_exception_t
*
p_exception
)
char
*
psz_output
,
libvlc_exception_t
*
p_exception
)
{
{
#ifdef ENABLE_VLM
#define VLM_CHANGE_CODE { free( p_media->psz_output ); \
#define VLM_CHANGE_CODE { free( p_media->psz_output ); \
p_media->psz_output = strdup( psz_output ); }
p_media->psz_output = strdup( psz_output ); }
VLM_CHANGE
(
"Unable to change %s output property"
,
VLM_CHANGE_CODE
);
VLM_CHANGE
(
"Unable to change %s output property"
,
VLM_CHANGE_CODE
);
#undef VLM_CHANGE_CODE
#undef VLM_CHANGE_CODE
#else
libvlc_exception_raise
(
p_exception
,
"VLM has been disabled in this libvlc."
);
return
VLC_EGENERIC
;
#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_name
,
char
*
psz_input
,
libvlc_exception_t
*
p_exception
)
char
*
psz_input
,
libvlc_exception_t
*
p_exception
)
{
{
#ifdef ENABLE_VLM
#define VLM_CHANGE_CODE { while( p_media->i_input > 0 ) \
#define VLM_CHANGE_CODE { while( p_media->i_input > 0 ) \
free( p_media->ppsz_input[--p_media->i_input] );\
free( p_media->ppsz_input[--p_media->i_input] );\
TAB_APPEND( p_media->i_input, p_media->ppsz_input, strdup(psz_input) ); }
TAB_APPEND( p_media->i_input, p_media->ppsz_input, strdup(psz_input) ); }
VLM_CHANGE
(
"Unable to change %s input property"
,
VLM_CHANGE_CODE
);
VLM_CHANGE
(
"Unable to change %s input property"
,
VLM_CHANGE_CODE
);
#undef VLM_CHANGE_CODE
#undef VLM_CHANGE_CODE
#else
libvlc_exception_raise
(
p_exception
,
"VLM has been disabled in this libvlc."
);
return
VLC_EGENERIC
;
#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_name
,
char
*
psz_input
,
libvlc_exception_t
*
p_exception
)
char
*
psz_input
,
libvlc_exception_t
*
p_exception
)
{
{
#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) ); }
VLM_CHANGE
(
"Unable to change %s input property"
,
VLM_CHANGE_CODE
);
VLM_CHANGE
(
"Unable to change %s input property"
,
VLM_CHANGE_CODE
);
#undef VLM_CHANGE_CODE
#undef VLM_CHANGE_CODE
#else
libvlc_exception_raise
(
p_exception
,
"VLM has been disabled in this libvlc."
);
return
VLC_EGENERIC
;
#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_name
,
...
@@ -283,6 +328,7 @@ void libvlc_vlm_change_media( libvlc_instance_t *p_instance, char *psz_name,
...
@@ -283,6 +328,7 @@ void libvlc_vlm_change_media( libvlc_instance_t *p_instance, char *psz_name,
char
**
ppsz_options
,
int
b_enabled
,
int
b_loop
,
char
**
ppsz_options
,
int
b_enabled
,
int
b_loop
,
libvlc_exception_t
*
p_exception
)
libvlc_exception_t
*
p_exception
)
{
{
#ifdef ENABLE_VLM
#define VLM_CHANGE_CODE { int n; \
#define VLM_CHANGE_CODE { int n; \
p_media->b_enabled = b_enabled; \
p_media->b_enabled = b_enabled; \
p_media->broadcast.b_loop = b_loop; \
p_media->broadcast.b_loop = b_loop; \
...
@@ -299,11 +345,16 @@ void libvlc_vlm_change_media( libvlc_instance_t *p_instance, char *psz_name,
...
@@ -299,11 +345,16 @@ void libvlc_vlm_change_media( libvlc_instance_t *p_instance, char *psz_name,
}
}
VLM_CHANGE
(
"Unable to change %s properties"
,
VLM_CHANGE_CODE
);
VLM_CHANGE
(
"Unable to change %s properties"
,
VLM_CHANGE_CODE
);
#undef VLM_CHANGE_CODE
#undef VLM_CHANGE_CODE
#else
libvlc_exception_raise
(
p_exception
,
"VLM has been disabled in this libvlc."
);
return
VLC_EGENERIC
;
#endif
}
}
void
libvlc_vlm_play_media
(
libvlc_instance_t
*
p_instance
,
char
*
psz_name
,
void
libvlc_vlm_play_media
(
libvlc_instance_t
*
p_instance
,
char
*
psz_name
,
libvlc_exception_t
*
p_exception
)
libvlc_exception_t
*
p_exception
)
{
{
#ifdef ENABLE_VLM
vlm_t
*
p_vlm
;
vlm_t
*
p_vlm
;
int64_t
id
;
int64_t
id
;
...
@@ -314,11 +365,16 @@ void libvlc_vlm_play_media( libvlc_instance_t *p_instance, char *psz_name,
...
@@ -314,11 +365,16 @@ void libvlc_vlm_play_media( libvlc_instance_t *p_instance, char *psz_name,
{
{
libvlc_exception_raise
(
p_exception
,
"Unable to play %s"
,
psz_name
);
libvlc_exception_raise
(
p_exception
,
"Unable to play %s"
,
psz_name
);
}
}
#else
libvlc_exception_raise
(
p_exception
,
"VLM has been disabled in this libvlc."
);
return
VLC_EGENERIC
;
#endif
}
}
void
libvlc_vlm_stop_media
(
libvlc_instance_t
*
p_instance
,
char
*
psz_name
,
void
libvlc_vlm_stop_media
(
libvlc_instance_t
*
p_instance
,
char
*
psz_name
,
libvlc_exception_t
*
p_exception
)
libvlc_exception_t
*
p_exception
)
{
{
#ifdef ENABLE_VLM
vlm_t
*
p_vlm
;
vlm_t
*
p_vlm
;
int64_t
id
;
int64_t
id
;
...
@@ -329,11 +385,16 @@ void libvlc_vlm_stop_media( libvlc_instance_t *p_instance, char *psz_name,
...
@@ -329,11 +385,16 @@ void libvlc_vlm_stop_media( libvlc_instance_t *p_instance, char *psz_name,
{
{
libvlc_exception_raise
(
p_exception
,
"Unable to stop %s"
,
psz_name
);
libvlc_exception_raise
(
p_exception
,
"Unable to stop %s"
,
psz_name
);
}
}
#else
libvlc_exception_raise
(
p_exception
,
"VLM has been disabled in this libvlc."
);
return
VLC_EGENERIC
;
#endif
}
}
void
libvlc_vlm_pause_media
(
libvlc_instance_t
*
p_instance
,
char
*
psz_name
,
void
libvlc_vlm_pause_media
(
libvlc_instance_t
*
p_instance
,
char
*
psz_name
,
libvlc_exception_t
*
p_exception
)
libvlc_exception_t
*
p_exception
)
{
{
#ifdef ENABLE_VLM
vlm_t
*
p_vlm
;
vlm_t
*
p_vlm
;
int64_t
id
;
int64_t
id
;
...
@@ -344,11 +405,16 @@ void libvlc_vlm_pause_media( libvlc_instance_t *p_instance, char *psz_name,
...
@@ -344,11 +405,16 @@ void libvlc_vlm_pause_media( libvlc_instance_t *p_instance, char *psz_name,
{
{
libvlc_exception_raise
(
p_exception
,
"Unable to pause %s"
,
psz_name
);
libvlc_exception_raise
(
p_exception
,
"Unable to pause %s"
,
psz_name
);
}
}
#else
libvlc_exception_raise
(
p_exception
,
"VLM has been disabled in this libvlc."
);
return
VLC_EGENERIC
;
#endif
}
}
void
libvlc_vlm_seek_media
(
libvlc_instance_t
*
p_instance
,
char
*
psz_name
,
void
libvlc_vlm_seek_media
(
libvlc_instance_t
*
p_instance
,
char
*
psz_name
,
float
f_percentage
,
libvlc_exception_t
*
p_exception
)
float
f_percentage
,
libvlc_exception_t
*
p_exception
)
{
{
#ifdef ENABLE_VLM
vlm_t
*
p_vlm
;
vlm_t
*
p_vlm
;
int64_t
id
;
int64_t
id
;
...
@@ -359,6 +425,10 @@ void libvlc_vlm_seek_media( libvlc_instance_t *p_instance, char *psz_name,
...
@@ -359,6 +425,10 @@ void libvlc_vlm_seek_media( libvlc_instance_t *p_instance, char *psz_name,
{
{
libvlc_exception_raise
(
p_exception
,
"Unable to seek %s to %f"
,
psz_name
,
f_percentage
);
libvlc_exception_raise
(
p_exception
,
"Unable to seek %s to %f"
,
psz_name
,
f_percentage
);
}
}
#else
libvlc_exception_raise
(
p_exception
,
"VLM has been disabled in this libvlc."
);
return
VLC_EGENERIC
;
#endif
}
}
#define LIBVLC_VLM_GET_MEDIA_ATTRIBUTE( attr, returnType, getType, ret, code )\
#define LIBVLC_VLM_GET_MEDIA_ATTRIBUTE( attr, returnType, getType, ret, code )\
...
...
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