Commit 5d2a5fd0 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

VLM: provide stubs for --disable-vlm

parent 081b18a1
......@@ -212,6 +212,7 @@ EXTRA_libvlccore_la_SOURCES = \
$(SOURCES_libvlc_other) \
$(SOURCES_libvlc_dirent) \
$(SOURCES_libvlc_getopt) \
$(SOURCES_libvlc_httpd) \
$(SOURCES_libvlc_sout) \
$(SOURCES_libvlc_vlm) \
$(NULL)
......@@ -242,6 +243,9 @@ endif
if BUILD_GETOPT
libvlccore_la_SOURCES += $(SOURCES_libvlc_getopt)
endif
if BUILD_HTTPD
libvlccore_la_SOURCES += $(SOURCES_libvlc_httpd)
endif
if ENABLE_SOUT
libvlccore_la_SOURCES += $(SOURCES_libvlc_sout)
if ENABLE_VLM
......@@ -281,6 +285,7 @@ SOURCES_libvlc_common = \
libvlc.c \
libvlc.h \
libvlc-module.c \
missing.c \
version.c \
interface/interface.h \
interface/interface.c \
......@@ -342,7 +347,6 @@ SOURCES_libvlc_common = \
network/io.c \
network/tcp.c \
network/udp.c \
network/httpd.c \
network/rootbind.c \
network/tls.c \
network/poll.c \
......@@ -388,6 +392,10 @@ SOURCES_libvlc_common = \
misc/filter_chain.c \
$(NULL)
SOURCES_libvlc_httpd = \
network/httpd.c \
$(NULL)
SOURCES_libvlc_sout = \
stream_output/stream_output.c \
stream_output/stream_output.h \
......
/*****************************************************************************
* missing.c: missing libvlccore symbols
*****************************************************************************
* Copyright (C) 2008 Rémi Denis-Courmont
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/** \file
* This file contains dummy replacement API for disabled features
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <vlc_common.h>
#ifndef ENABLE_HTTPD
# include <vlc_httpd.h>
char *httpd_ClientIP (const httpd_client_t *cl, char *psz_ip)
{
assert (0);
}
void httpd_ClientModeBidir (httpd_client_t *cl)
{
assert (0);
}
void httpd_ClientModeStream (httpd_client_t *cl)
{
assert (0);
}
httpd_file_sys_t *httpd_FileDelete (httpd_file_t *file)
{
assert (0);
}
httpd_file_t *httpd_FileNew (httpd_host_t *host,
const char *url, const char *content_type,
const char *login, const char *password,
const vlc_acl_t *acl,
httpd_file_callback_t cb, httpd_file_sys_t *data)
{
assert (0);
}
httpd_handler_sys_t *httpd_HandlerDelete (httpd_handler_t *handler)
{
assert (0);
}
httpd_handler_t *httpd_HandlerNew (httpd_host_t *host, const char *url,
const char *login, const char *password,
const vlc_acl_t *acl,
httpd_handler_callback_t cb,
httpd_handler_sys_t *data)
{
assert (0);
}
void httpd_HostDelete (httpd_host_t *h)
{
assert (0);
}
httpd_host_t *httpd_HostNew (vlc_object_t *obj, const char *host, int port)
{
return httpd_TLSHostNew (obj, host, port, NULL, NULL, NULL, NULL);
}
void httpd_MsgAdd (httpd_message_t *m, const char *name, const char *fmt, ...)
{
assert (0);
}
const char *httpd_MsgGet (const httpd_message_t *m, const char *name)
{
assert (0);
}
void httpd_RedirectDelete (httpd_redirect_t *r)
{
assert (0);
}
httpd_redirect_t *httpd_RedirectNew (httpd_host_t *host,
const char *dst, const char *src)
{
assert (0);
}
char *httpd_ServerIP (const httpd_client_t *client, char *ip)
{
assert (0);
}
void httpd_StreamDelete (httpd_stream_t *stream)
{
assert (0);
}
int httpd_StreamHeader (httpd_stream_t *stream, uint8_t *data, int count)
{
assert (0);
}
httpd_stream_t *httpd_StreamNew (httpd_host_t *host,
const char *url, const char *content_type,
const char *login, const char *password,
const vlc_acl_t *acl)
{
assert (0);
}
int httpd_StreamSend (httpd_stream_t *stream, uint8_t *data, int count)
{
assert (0);
}
httpd_host_t *httpd_TLSHostNew (vlc_object_t *obj, const char *host, int port,
const char *cert, const char *key,
const char *ca, const char *crl)
{
msg_Err (obj, "VLC httpd support not compiled-in!");
return NULL;
}
int httpd_UrlCatch (httpd_url_t *url, int request, httpd_callback_t cb,
httpd_callback_sys_t *data)
{
assert (0);
}
void httpd_UrlDelete (httpd_url_t *url)
{
assert (0);
}
httpd_url_t *httpd_UrlNew (httpd_host_t *host, const char *url,
const char *login, const char *password,
const vlc_acl_t *acl)
{
assert (0);
}
httpd_url_t *httpd_UrlNewUnique (httpd_host_t *host, const char *url,
const char *login, const char *password,
const vlc_acl_t *acl)
{
assert (0);
}
#endif /* !ENABLE_HTTPD */
#ifndef ENABLE_SOUT
# ifndef ENABLE_VLM
# include <vlc_vlm.h>
int vlm_Control (vlm_t *vlm, int query, ...)
{
assert (0);
}
void vlm_Delete (vlm_t *vlm)
{
assert (0);
}
int vlm_ExecuteCommand (vlm_t *vlm, const char *cmd, vlm_message_t **pm)
{
assert (0);
}
vlm_message_t *vlm_MessageAdd (vlm_message_t *a, vlm_message_t *b)
{
assert (0);
}
void vlm_MessageDelete (vlm_message_t *m)
{
assert (0);
}
vlm_message_t *vlm_MessageNew (const char *a, const char *fmt, ...)
{
return NULL;
}
vlm_t *__vlm_New (vlc_object_t *obj)
{
msg_Err (obj, "VLM not compiled-in!");
return NULL;
}
# endif /* !ENABLE_VLM */
#endif /* !ENABLE_SOUT */
......@@ -30,8 +30,6 @@
#include <vlc_common.h>
#include <vlc_httpd.h>
#ifdef ENABLE_HTTPD
#include <assert.h>
#include <vlc_network.h>
......@@ -2573,140 +2571,3 @@ retry:
vlc_restorecancel (canc);
return NULL;
}
#else /* ENABLE_HTTPD */
/* We just define an empty wrapper */
httpd_host_t *httpd_TLSHostNew( vlc_object_t *a, const char *b,
int c,
const char *e, const char *f,
const char *g, const char* h)
{
msg_Err( a, "HTTP daemon support is disabled" );
return NULL;
}
httpd_host_t *httpd_HostNew( vlc_object_t *a, const char *b,
int c )
{
msg_Err( a, "HTTP daemon support is disabled" );
return NULL;
}
void httpd_HostDelete( httpd_host_t *a )
{
}
httpd_url_t *httpd_UrlNew( httpd_host_t *host, const char *psz_url,
const char *psz_user, const char *psz_password,
const vlc_acl_t *p_acl )
{
return NULL;
}
httpd_url_t *httpd_UrlNewUnique( httpd_host_t *host, const char *psz_url,
const char *psz_user, const char *psz_password,
const vlc_acl_t *p_acl )
{
return NULL;
}
int httpd_UrlCatch( httpd_url_t *a, int b, httpd_callback_t c,
httpd_callback_sys_t *d )
{
return 0;
}
void httpd_UrlDelete( httpd_url_t *a )
{
}
char* httpd_ClientIP( const httpd_client_t *cl, char *psz_ip )
{
return NULL;
}
char* httpd_ServerIP( const httpd_client_t *cl, char *psz_ip )
{
return NULL;
}
void httpd_ClientModeStream( httpd_client_t *a )
{
}
void httpd_ClientModeBidir( httpd_client_t *a )
{
}
httpd_file_sys_t *httpd_FileDelete( httpd_file_t *file )
{
return NULL;
}
httpd_file_t *httpd_FileNew( httpd_host_t *host,
const char *psz_url, const char *psz_mime,
const char *psz_user, const char *psz_password,
const vlc_acl_t *p_acl, httpd_file_callback_t pf_fill,
httpd_file_sys_t *p_sys )
{
return NULL;
}
httpd_handler_t *httpd_HandlerNew( httpd_host_t *host, const char *psz_url,
const char *psz_user,
const char *psz_password,
const vlc_acl_t *p_acl,
httpd_handler_callback_t pf_fill,
httpd_handler_sys_t *p_sys )
{
return NULL;
}
httpd_handler_sys_t *httpd_HandlerDelete( httpd_handler_t *handler )
{
return NULL;
}
void httpd_RedirectDelete( httpd_redirect_t *a )
{
}
httpd_redirect_t *httpd_RedirectNew( httpd_host_t *host, const char *psz_url_dst,
const char *psz_url_src )
{
return NULL;
}
void httpd_StreamDelete( httpd_stream_t *a )
{
}
int httpd_StreamHeader( httpd_stream_t *a, uint8_t *b, int c )
{
return 0;
}
int httpd_StreamSend ( httpd_stream_t *a, uint8_t *b, int c )
{
return 0;
}
httpd_stream_t *httpd_StreamNew( httpd_host_t *host,
const char *psz_url, const char *psz_mime,
const char *psz_user, const char *psz_password,
const vlc_acl_t *p_acl )
{
return NULL;
}
void httpd_MsgAdd ( httpd_message_t *a, const char *b, const char *c, ... )
{
}
const char *httpd_MsgGet( const httpd_message_t *msg, const char *name )
{
return "";
}
#endif /* ENABLE_HTTPD */
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