* all : declaration of http and httpd.

diff --git a/Makefile.am b/Makefile.am
index 0bbdfb871ef8aa1ca8d8e559ba8c4236630b076e..f50f4e862406855bfc553e24c2d8e586d1faba47 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -170,6 +170,7 @@ HEADERS_include = \
        include/interface.h \
        include/intf_eject.h \
        include/iso_lang.h \
+       include/httpd.h \
        include/main.h \
        include/mmx.h \
        include/modules.h \

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index 956e595e198142203c4cbd1250578762930bdb5b..f1e4757e9c23b15c5c205da6e7862ad5f5b4a8f8 100644 (file)
--- a/include/vlc_objects.h
+++ b/include/vlc_objects.h
@@ -2,7 +2,7 @@
  * vlc_objects.h: vlc_object_t definition.
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: vlc_objects.h,v 1.15 2003/01/27 17:41:01 ipkiss Exp $
+ * $Id: vlc_objects.h,v 1.16 2003/02/23 19:07:02 fenrir Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -33,6 +33,8 @@
 #define VLC_OBJECT_VOUT       (-9)
 #define VLC_OBJECT_AOUT      (-10)
 #define VLC_OBJECT_SOUT      (-11)
+#define VLC_OBJECT_HTTPD     (-12)
+
 #define VLC_OBJECT_GENERIC  (-666)
 
 /* Object search mode */

diff --git a/modules/access_output/Modules.am b/modules/access_output/Modules.am
index 4fcabbb4ebd2a3c140120040fea931bd43b89880..0e642847fd108b2247b55a2671c9bf21124020c0 100644 (file)
--- a/modules/access_output/Modules.am
+++ b/modules/access_output/Modules.am
@@ -1,3 +1,4 @@
 SOURCES_access_output_dummy = modules/access_output/dummy.c
 SOURCES_access_output_file = modules/access_output/file.c
 SOURCES_access_output_udp = modules/access_output/udp.c
+SOURCES_access_output_http = modules/access_output/http.c

diff --git a/modules/misc/Modules.am b/modules/misc/Modules.am
index e1fd98fd0f3732f2cab5cd26ef3103ade7568a71..a8ea75d7f2bcdac8681f85acd733263d7cc7ecca 100644 (file)
--- a/modules/misc/Modules.am
+++ b/modules/misc/Modules.am
@@ -3,3 +3,4 @@ SOURCES_gnome_main = modules/misc/gtk_main.c
 SOURCES_sap = modules/misc/sap.c
 SOURCES_screensaver = modules/misc/screensaver.c
 SOURCES_qte_main = modules/misc/qte_main.cpp
+SOURCES_httpd = modules/misc/httpd.c

diff --git a/src/misc/objects.c b/src/misc/objects.c
index 347d4b41dfc5478f25344fdac49ff49953f7bbdc..d8e0cdd2be7b0de0b8f5f7a842c6ff135d5edaf2 100644 (file)
--- a/src/misc/objects.c
+++ b/src/misc/objects.c
@@ -2,7 +2,7 @@
  * objects.c: vlc_object_t handling
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: objects.c,v 1.34 2003/01/27 17:41:01 ipkiss Exp $
+ * $Id: objects.c,v 1.35 2003/02/23 19:07:02 fenrir Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -44,6 +44,7 @@
 #include "vlc_playlist.h"
 #include "interface.h"
 
+#include "httpd.h"
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/
@@ -123,6 +124,10 @@ void * __vlc_object_create( vlc_object_t *p_this, int i_type )
             i_size = sizeof(sout_instance_t);
             psz_type = "stream output";
             break;
+        case VLC_OBJECT_HTTPD:
+            i_size = sizeof( httpd_t );
+            psz_type = "http daemon";
+            break;
         default:
             i_size = i_type > 0
                       ? i_type > (int)sizeof(vlc_object_t)