X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmissing.c;h=a19a798e3bc0fd3580cb0ab983cb2649c41a04cd;hb=19092b0414c63b2a4a246cfbee731869584a112f;hp=34f3925e36b288814d5b5fe370a7a5a1ac9b03ec;hpb=3080bfc4ef9febca11f280cbcde61fff60e8d89d;p=vlc diff --git a/src/missing.c b/src/missing.c index 34f3925e36..a19a798e3b 100644 --- a/src/missing.c +++ b/src/missing.c @@ -3,19 +3,19 @@ ***************************************************************************** * 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 @@ -32,9 +32,9 @@ #ifndef ENABLE_HTTPD # include -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); } @@ -59,12 +59,11 @@ httpd_file_sys_t *httpd_FileDelete (httpd_file_t *file) 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); } @@ -77,12 +76,11 @@ httpd_handler_sys_t *httpd_HandlerDelete (httpd_handler_t *handler) 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) login; (void) password; (void) acl; + (void) login; (void) password; (void) cb; (void) data; assert (0); } @@ -93,9 +91,22 @@ void httpd_HostDelete (httpd_host_t *h) 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, ...) @@ -123,9 +134,9 @@ httpd_redirect_t *httpd_RedirectNew (httpd_host_t *host, 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); } @@ -143,30 +154,19 @@ int httpd_StreamHeader (httpd_stream_t *stream, uint8_t *data, int count) 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); } -int httpd_StreamSend (httpd_stream_t *stream, uint8_t *data, int count) +int httpd_StreamSend (httpd_stream_t *stream, const block_t *p_block) { - (void) stream; (void) data; (void) count; + (void) stream; (void) p_block; 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) { @@ -181,18 +181,9 @@ void httpd_UrlDelete (httpd_url_t *url) } httpd_url_t *httpd_UrlNew (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; - 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) -{ - (void) host; (void) url; (void) login; (void) password; (void) acl; + (void) host; (void) url; (void) login; (void) password; assert (0); } #endif /* !ENABLE_HTTPD */ @@ -313,12 +304,6 @@ sout_stream_t *sout_StreamChainNew (sout_instance_t *p_sout, char *psz_chain, assert (0); } -void sout_UpdateStatistic (sout_instance_t *instance, sout_statistic_t stat, - int value) -{ - assert (0); -} - char *vlc_sdp_Start (vlc_object_t *obj, const char *cfg, const struct sockaddr *src, size_t srclen, const struct sockaddr *addr, size_t addrlen) @@ -383,102 +368,3 @@ vlm_t *vlm_New (vlc_object_t *obj) return NULL; } #endif /* !ENABLE_VLM */ - -#ifndef MEDIA_LIBRARY -#include - -#undef ml_Hold -media_library_t* ml_Hold ( vlc_object_t* p_this ) -{ - VLC_UNUSED( p_this ); - return NULL; -} - -#undef ml_Release -void ml_Release ( vlc_object_t* p_this ) -{ - VLC_UNUSED( p_this ); - assert( 0 ); -} - -media_library_t* ml_Create ( vlc_object_t *p_this, char* psz_name ) -{ - VLC_UNUSED( p_this ); - VLC_UNUSED( psz_name ); - return NULL; -} - -void ml_Destroy( vlc_object_t * p_this ) -{ - VLC_UNUSED( p_this ); - assert( 0 ); -} - -ml_media_t* media_New( media_library_t* p_ml, int id, ml_select_e select, bool reload ) -{ - VLC_UNUSED( p_ml ); - VLC_UNUSED( id ); - VLC_UNUSED( select ); - VLC_UNUSED( reload ); - assert( 0 ); - return NULL; -} - -#undef ml_UpdateSimple -int ml_UpdateSimple( media_library_t *p_media_library, ml_select_e selected_type, - const char* psz_lvalue, int id, ... ) -{ - VLC_UNUSED( p_media_library ); - VLC_UNUSED( selected_type ); - VLC_UNUSED( psz_lvalue ); - VLC_UNUSED( id ); - assert( 0 ); - return 0; -} - -ml_ftree_t* ml_OpConnectChilds( ml_op_e op, ml_ftree_t* left, ml_ftree_t* right ) -{ - VLC_UNUSED( op ); - VLC_UNUSED( left ); - VLC_UNUSED( right ); - assert( 0 ); - return NULL; -} - -ml_ftree_t* ml_FtreeSpec( ml_ftree_t* tree, ml_select_e crit, int limit, - char* sort ) -{ - VLC_UNUSED( tree ); - VLC_UNUSED( crit ); - VLC_UNUSED( limit ); - VLC_UNUSED( sort ); - assert( 0 ); - return NULL; -} - -void ml_PlaySmartPlaylistBasedOn( media_library_t* p_ml, - ml_ftree_t* p_tree ) -{ - VLC_UNUSED( p_ml ); - VLC_UNUSED( p_tree ); - assert( 0 ); -} - -void ml_DeletePersonTypeFromMedia( ml_media_t* p_media, const char *psz_role ) -{ - VLC_UNUSED( p_media ); - VLC_UNUSED( psz_role ); - assert( 0 ); -} - -ml_person_t* ml_GetPersonsFromMedia( media_library_t* p_ml, - ml_media_t* p_media, - const char *psz_role ) -{ - VLC_UNUSED( p_ml ); - VLC_UNUSED( p_media ); - VLC_UNUSED( psz_role ); - assert( 0 ); - return NULL; -} -#endif /* !MEDIA_LIBRARY */