X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmissing.c;h=f630aa4a6632ee9068f22c270355a6a179f83b4a;hb=7df0345e7f8917ae534592caea34eba1bef4c26e;hp=038598029b5e70fc81dbfa546b0f2bcfd2d0ac02;hpb=edeb940a36d5506254947fc8f3530d6881f9dff6;p=vlc diff --git a/src/missing.c b/src/missing.c index 038598029b..f630aa4a66 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); } @@ -93,9 +93,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 +136,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); } @@ -157,16 +170,6 @@ 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) -{ - (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) { @@ -251,11 +254,9 @@ ssize_t sout_AccessOutWrite (sout_access_out_t *out, block_t *block) #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; } @@ -272,11 +273,6 @@ encoder_t *sout_EncoderCreate( vlc_object_t *p_this ) 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); @@ -308,11 +304,6 @@ void sout_MuxSendBuffer (sout_mux_t *mux, sout_input_t *input, block_t *block) assert (0); } -announce_method_t *sout_SAPMethod (void) -{ - return NULL; -} - void sout_StreamChainDelete (sout_stream_t *p_first, sout_stream_t *p_last) { assert (0); @@ -325,12 +316,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) @@ -399,56 +384,80 @@ vlm_t *vlm_New (vlc_object_t *obj) #ifndef MEDIA_LIBRARY #include -media_library_t* __ml_Hold ( vlc_object_t* p_this ) +#undef ml_Get +media_library_t* ml_Get ( vlc_object_t* p_this ) { + VLC_UNUSED( p_this ); return NULL; } -void __ml_Release ( vlc_object_t* p_this ) -{ - assert( 0 ); -} - -media_library_t* __ml_Create ( vlc_object_t *p_this, char* psz_name ) +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 ) +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; } -int __ml_UpdateSimple( media_library_t *p_media_library, ml_select_e selected_type, +#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, +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 ); } @@ -456,6 +465,10 @@ 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 */