*****************************************************************************
* 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
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser 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.
+ * You should have received a copy of the GNU Lesser 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
#ifndef ENABLE_HTTPD
# include <vlc_httpd.h>
-char *httpd_ClientIP (const httpd_client_t *cl, char *psz_ip)
+char *httpd_ClientIP (const httpd_client_t *cl, char *psz_ip, int *port)
{
- (void) cl; (void) psz_ip;
+ (void) cl; (void) psz_ip; (void) port;
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)
{
(void) host;
(void) url; (void) content_type;
- (void) login; (void) password; (void) acl;
+ (void) login; (void) password;
(void) cb; (void) data;
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)
{
- (void) host; (void) url; (void) content_type;
- (void) login; (void) password; (void) acl;
+ (void) host; (void) url;
+ (void) login; (void) password;
(void) cb; (void) data;
assert (0);
}
assert (0);
}
-httpd_host_t *httpd_HostNew (vlc_object_t *obj, const char *host, int port)
+httpd_host_t *vlc_http_HostNew (vlc_object_t *obj)
{
- return httpd_TLSHostNew (obj, host, port, NULL, NULL, NULL, NULL);
+ msg_Err (obj, "HTTP server not compiled-in!");
+ return NULL;
+}
+
+httpd_host_t *vlc_https_HostNew (vlc_object_t *obj)
+{
+ msg_Err (obj, "HTTPS server not compiled-in!");
+ return NULL;
+}
+
+httpd_host_t *vlc_rtsp_HostNew (vlc_object_t *obj)
+{
+ msg_Err (obj, "RTSP server not compiled-in!");
+ return NULL;
}
void httpd_MsgAdd (httpd_message_t *m, const char *name, const char *fmt, ...)
assert (0);
}
-char *httpd_ServerIP (const httpd_client_t *client, char *ip)
+char *httpd_ServerIP (const httpd_client_t *client, char *ip, int *port)
{
- (void) client; (void) ip;
+ (void) client; (void) ip; (void) port;
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)
+ const char *login, const char *password)
{
(void) host; (void) url; (void) content_type;
- (void) login; (void) password; (void) acl;
+ (void) login; (void) password;
assert (0);
}
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)
-{
- (void) host; (void) port;
- (void) cert; (void) key; (void) ca; (void) 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)
{
}
httpd_url_t *httpd_UrlNew (httpd_host_t *host, const char *url,
- const char *login, const char *password,
- const vlc_acl_t *acl)
-{
- (void) host; (void) url; (void) login; (void) password; (void) 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)
+ const char *login, const char *password)
{
- (void) host; (void) url; (void) login; (void) password; (void) acl;
+ (void) host; (void) url; (void) login; (void) password;
assert (0);
}
#endif /* !ENABLE_HTTPD */
#undef sout_AnnounceRegisterSDP
session_descriptor_t *sout_AnnounceRegisterSDP (vlc_object_t *obj,
const char *sdp,
- const char *dst,
- announce_method_t *method)
+ const char *dst)
{
msg_Err (obj, "SDP export not compiled-in!");
- assert (method == NULL);
return NULL;
}
return NULL;
}
-void sout_MethodRelease (announce_method_t *method)
-{
- (void)method;
-}
-
sout_input_t *sout_MuxAddStream (sout_mux_t *mux, es_format_t *fmt)
{
assert (0);
assert (0);
}
-sout_mux_t *sout_MuxNew (sout_instance_t *instance, char *mux,
- sout_access_out_t *out)
+int sout_MuxGetStream (sout_mux_t *p_mux, int i_blocks, mtime_t *pi_dts)
{
assert (0);
}
-void sout_MuxSendBuffer (sout_mux_t *mux, sout_input_t *input, block_t *block)
+sout_mux_t *sout_MuxNew (sout_instance_t *instance, const char *mux,
+ sout_access_out_t *out)
{
assert (0);
}
-announce_method_t *sout_SAPMethod (void)
-{
- return NULL;
-}
-
-void sout_StreamDelete (sout_stream_t *stream)
+void sout_MuxSendBuffer (sout_mux_t *mux, sout_input_t *input, block_t *block)
{
assert (0);
}
-sout_stream_t *sout_StreamNew (sout_instance_t *instance, char *chain)
+void sout_StreamChainDelete (sout_stream_t *p_first, sout_stream_t *p_last)
{
assert (0);
}
-void sout_UpdateStatistic (sout_instance_t *instance, sout_statistic_t stat,
- int value)
+sout_stream_t *sout_StreamChainNew (sout_instance_t *p_sout, char *psz_chain,
+ sout_stream_t *p_next,
+ sout_stream_t **pp_last)
{
assert (0);
}
int vlm_Control (vlm_t *vlm, int query, ...)
{
+ VLC_UNUSED (vlm);
assert (0);
}
void vlm_Delete (vlm_t *vlm)
{
+ VLC_UNUSED (vlm);
assert (0);
}
int vlm_ExecuteCommand (vlm_t *vlm, const char *cmd, vlm_message_t **pm)
{
+ VLC_UNUSED (vlm);
+ VLC_UNUSED (cmd);
+ VLC_UNUSED (pm);
assert (0);
}
vlm_message_t *vlm_MessageAdd (vlm_message_t *a, vlm_message_t *b)
{
+ VLC_UNUSED (a);
+ VLC_UNUSED (b);
assert (0);
}
void vlm_MessageDelete (vlm_message_t *m)
{
+ VLC_UNUSED (m);
assert (0);
}
-vlm_message_t *vlm_MessageNew (const char *a, const char *fmt, ...)
+vlm_message_t *vlm_MessageSimpleNew (const char *a)
{
+ VLC_UNUSED (a);
return NULL;
}
-vlm_t *__vlm_New (vlc_object_t *obj)
+vlm_message_t *vlm_MessageNew (const char *a, const char *fmt, ...)
+{
+ VLC_UNUSED (a);
+ VLC_UNUSED (fmt);
+ return vlm_MessageSimpleNew (a);
+}
+
+#undef vlm_New
+vlm_t *vlm_New (vlc_object_t *obj)
{
msg_Err (obj, "VLM not compiled-in!");
return NULL;
projects / vlc / blobdiff