Changeset 1ff5e7267e7a4711f60cbe7300060d13d2955bd7

Timestamp:

01/10/04 20:04:09 (4 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1096653849 +0000

git-parent:

[bb1ef14f0a2d4f7a71912bee5cb04dd2af3723d9]

git-author:

Gildas Bazin <gbazin@videolan.org> 1096653849 +0000

Message:

* configure.ac: added an --enable-httpd and --enable-vlm option
* src/misc/httpd.c: use dummy wrapper if httpd is disabled.
* src/misc/vlm.c: use dummy wrapper if vlm is disabled.
* modules/control/http.c, telnet.c: properly handle cases where http/vlm is not available.

Files:

• configure.ac (modified) (4 diffs)
• modules/control/http.c (modified) (6 diffs)
• modules/control/telnet.c (modified) (3 diffs)
• src/misc/httpd.c (modified) (3 diffs)
• src/misc/vlm.c (modified) (2 diffs)

configure.ac

@@ -1186 +1186 @@
-#  VLC_ADD_PLUGINS([stream_out_transrate])
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-dnl
@@ -1631 +1650 @@
-dnl
-AC_ARG_ENABLE(screen,
-   
+
-if test "${enable_screen}" != "no"; then
-  if test "${SYS}" = "darwin"; then
@@ -2001 +2020 @@
-dnl
-AC_ARG_ENABLE(toolame,
- 
+
-if test "${enable_toolame}" = "yes"
-then
@@ -2662 +2681 @@
-dnl
-AC_ARG_ENABLE(opengl,
-   
+
-if test "${enable_opengl}" != "no" && test "${SYS}" != "beos"; then
-  if test "${SYS}" != "darwin"; then

modules/control/http.c

@@ -1125 +1125 @@
-
-    /* fprintf( stderr," mvar_VlmSetNew: name=`%s'\n", name ); */
-
-
+ return s;
+
-    if( vlm_ExecuteCommand( vlm, "show", &msg ) )
-    {
@@ -1975 +1975 @@
-                        p_intf->p_sys->p_vlm = vlm_New( p_intf );
-
+                    if( p_intf->p_sys->p_vlm == NULL ) break;
+
-                    uri_extract_value( p_request, "name", name, 512 );
-                    if( StrToMacroType( control ) == MVLC_VLM_NEW )
@@ -2032 +2034 @@
-                        p_intf->p_sys->p_vlm = vlm_New( p_intf );
-
+                    if( p_intf->p_sys->p_vlm == NULL ) break;
+
-                    uri_extract_value( p_request, "name", name, 512 );
-                    sprintf( psz, "del %s", name );
@@ -2051 +2055 @@
-                    if( p_intf->p_sys->p_vlm == NULL )
-                        p_intf->p_sys->p_vlm = vlm_New( p_intf );
+
+                    if( p_intf->p_sys->p_vlm == NULL ) break;
-
-                    uri_extract_value( p_request, "name", name, 512 );
@@ -2080 +2086 @@
-                    if( p_intf->p_sys->p_vlm == NULL )
-                        p_intf->p_sys->p_vlm = vlm_New( p_intf );
+
+                    if( p_intf->p_sys->p_vlm == NULL ) break;
-
-                    uri_extract_value( p_request, "file", file, 512 );
@@ -2371 +2379 @@
-                        {
-                            if( p_intf->p_sys->p_vlm == NULL )
-                            {
-                                p_intf->p_sys->p_vlm = vlm_New( p_intf );
-                            }
-                            index = mvar_VlmSetNew( m.param1, p_intf->p_sys->p_vlm );
-                        }

modules/control/telnet.c

@@ -117 +117 @@
-   int             i_clients;
-   int             fd;
-
+ 
-};
-
@@ -126 +126 @@
-{
-    intf_thread_t *p_intf = (intf_thread_t*) p_this;
+    vlm_t *mediatheque;
-    int i_telnetport;
-
+    if( !(mediatheque = vlm_New( p_intf )) )
+    {
+        msg_Err( p_intf, "cannot start VLM" );
+        return VLC_EGENERIC;
+    }
+
+    msg_Info( p_intf, _("Using the VLM interface plugin...") );
+
-    i_telnetport = config_GetInt( p_intf, "telnet-port" );
-
-#ifdef WIN32
-    vlc_bool_t b_quiet;
-    b_quiet = config_GetInt( p_intf, "dummy-quiet" );
-    if( !b_quiet )
-        CONSOLE_INTRO_MSG;
-#endif
-
-    msg_Info( p_intf, _("Using the VLM interface plugin...") );
-
-    p_intf->pf_run = Run;
-
-    p_intf->p_sys = malloc( sizeof( intf_sys_t ) );
@@ -152 +150 @@
-    p_intf->p_sys->i_clients   = 0;
-    p_intf->p_sys->clients     = NULL;
-
+
+
-
-    return VLC_SUCCESS;

src/misc/httpd.c

@@ -26 +26 @@
-#include <vlc/vlc.h>
-
+#ifdef ENABLE_HTTPD
+
-#include "vlc_httpd.h"
-#include "network.h"
@@ -377 +379 @@
-    { ".jpeg",  "image/jpeg" },
-    { ".png",   "image/png" },
+    { ".mpjpeg","multipart/x-mixed-replace; boundary=This Random String" },
-
-    /* media mime */
@@ -2472 +2475 @@
-    return ntohs( i_port );
-}
+
+#else /* ENABLE_HTTPD */
+
+/* We just define an empty wrapper */
+httpd_host_t *httpd_HostNew( vlc_object_t *a, char *b, int c )
+{
+    msg_Err( a, "HTTP daemon support is disabled" );
+    return 0;
+}
+void httpd_HostDelete( httpd_host_t *a ){}
+httpd_url_t *httpd_UrlNew( httpd_host_t *a, char *b ){ return 0; }
+httpd_url_t *httpd_UrlNewUnique( httpd_host_t *a, char *b, char *c,
+                                 char *d ){ return 0; }
+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( httpd_client_t *a ){ return 0; }
+void httpd_ClientModeStream( httpd_client_t *a ){}
+void httpd_ClientModeBidir( httpd_client_t *a ){}
+
+void httpd_FileDelete( httpd_file_t *a ){}
+httpd_file_t *httpd_FileNew( httpd_host_t *a, char *b, char *c, char *d,
+                             char *e, httpd_file_callback_t f,
+                             httpd_file_sys_t *g ){ return 0; }
+
+void httpd_RedirectDelete( httpd_redirect_t *a ){}
+httpd_redirect_t *httpd_RedirectNew( httpd_host_t *a,
+                                     char *b, char *c ){ return 0; }
+
+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 *a, char *b, char *c,
+                                 char *d, char *e ){ return 0; }
+
+void httpd_MsgInit ( httpd_message_t *a ){}
+void httpd_MsgAdd  ( httpd_message_t *a, char *b, char *c, ... ){}
+char *httpd_MsgGet ( httpd_message_t *a, char *b ){ return 0; }
+void httpd_MsgClean( httpd_message_t *a ){}
+
+#endif /* ENABLE_HTTPD */

src/misc/vlm.c

@@ -30 +30 @@
-
-#include <vlc/vlc.h>
+
+#ifdef ENABLE_VLM
+
-#include <vlc/intf.h>
-#include <vlc/input.h>
@@ -2134 +2137 @@
-    return VLC_SUCCESS;
-}
+
+#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 0;
+}
+void vlm_Delete( vlm_t *a ){}
+int vlm_ExecuteCommand( vlm_t *a, char *b, vlm_message_t **c ){ return -1; }
+void vlm_MessageDelete( vlm_message_t *a ){}
+
+#endif /* ENABLE_VLM */