mirror of
https://code.videolan.org/videolan/vlc
synced 2024-09-24 20:48:52 +02:00
VLM: build if ENABLE_VLM rather than ENABLE_SOUT
This commit is contained in:
parent
8b9b6da88e
commit
91a4847521
@ -1695,6 +1695,7 @@ AS_IF([test "${enable_vlm}" != "no"], [
|
||||
AC_DEFINE(ENABLE_VLM, 1, [Define if you want the VideoLAN manager support])
|
||||
VLC_ADD_PLUGIN([telnet])
|
||||
])
|
||||
AM_CONDITIONAL([ENABLE_VLM], [test "${enable_vlm}" != "no"])
|
||||
|
||||
dnl
|
||||
dnl Growl notification plugin
|
||||
|
@ -201,6 +201,7 @@ EXTRA_libvlccore_la_SOURCES = \
|
||||
$(SOURCES_libvlc_dirent) \
|
||||
$(SOURCES_libvlc_getopt) \
|
||||
$(SOURCES_libvlc_sout) \
|
||||
$(SOURCES_libvlc_vlm) \
|
||||
$(NULL)
|
||||
if HAVE_BEOS
|
||||
libvlccore_la_SOURCES += $(SOURCES_libvlc_beos)
|
||||
@ -231,6 +232,9 @@ libvlccore_la_SOURCES += $(SOURCES_libvlc_getopt)
|
||||
endif
|
||||
if ENABLE_SOUT
|
||||
libvlccore_la_SOURCES += $(SOURCES_libvlc_sout)
|
||||
if ENABLE_VLM
|
||||
libvlccore_la_SOURCES += $(SOURCES_libvlc_vlm)
|
||||
endif
|
||||
endif
|
||||
|
||||
SOURCES_libvlc_beos = \
|
||||
@ -365,8 +369,6 @@ SOURCES_libvlc_common = \
|
||||
$(NULL)
|
||||
|
||||
SOURCES_libvlc_sout = \
|
||||
input/vlm.c \
|
||||
input/vlmshell.c \
|
||||
stream_output/stream_output.c \
|
||||
stream_output/stream_output.h \
|
||||
stream_output/announce.c \
|
||||
@ -375,6 +377,11 @@ SOURCES_libvlc_sout = \
|
||||
stream_output/sdp.c \
|
||||
$(NULL)
|
||||
|
||||
SOURCES_libvlc_vlm = \
|
||||
input/vlm.c \
|
||||
input/vlmshell.c \
|
||||
$(NULL)
|
||||
|
||||
SOURCES_libvlc = \
|
||||
$(SOURCES_libvlc_common) \
|
||||
$(OPT_SOURCES_libvlc_beos) \
|
||||
|
@ -38,8 +38,6 @@
|
||||
|
||||
#include <vlc_vlm.h>
|
||||
|
||||
#ifdef ENABLE_VLM
|
||||
|
||||
#ifndef WIN32
|
||||
# include <sys/time.h> /* gettimeofday() */
|
||||
#endif
|
||||
@ -1138,48 +1136,3 @@ int vlm_Control( vlm_t *p_vlm, int i_query, ... )
|
||||
|
||||
return i_result;
|
||||
}
|
||||
|
||||
#else /* ENABLE_VLM */
|
||||
|
||||
/* We just define an empty wrapper */
|
||||
vlm_t *__vlm_New( vlc_object_t *a )
|
||||
{
|
||||
msg_Err( a, "VideoLAN manager support is disabled" );
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void vlm_Delete( vlm_t *a )
|
||||
{
|
||||
(void)a;
|
||||
}
|
||||
|
||||
int vlm_ExecuteCommand( vlm_t *a, const char *b, vlm_message_t **c )
|
||||
{
|
||||
abort();
|
||||
}
|
||||
|
||||
vlm_message_t *vlm_MessageNew( const char *psz_name,
|
||||
const char *psz_format, ... )
|
||||
{
|
||||
(void)psz_name; (void)psz_format;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
vlm_message_t *vlm_MessageAdd( vlm_message_t *p_message,
|
||||
vlm_message_t *p_child )
|
||||
{
|
||||
abort();
|
||||
}
|
||||
|
||||
void vlm_MessageDelete( vlm_message_t *a )
|
||||
{
|
||||
(void)a;
|
||||
}
|
||||
|
||||
int vlm_Control( vlm_t *p_vlm, int i_query, ... )
|
||||
{
|
||||
(void)p_vlm; (void)i_query;
|
||||
return VLC_EGENERIC;
|
||||
}
|
||||
|
||||
#endif /* ENABLE_VLM */
|
||||
|
Loading…
Reference in New Issue
Block a user