Commit 312754c3 authored by Laurent Aimar's avatar Laurent Aimar

* all : declaration of http and httpd.

parent 84aaa859
...@@ -170,6 +170,7 @@ HEADERS_include = \ ...@@ -170,6 +170,7 @@ HEADERS_include = \
include/interface.h \ include/interface.h \
include/intf_eject.h \ include/intf_eject.h \
include/iso_lang.h \ include/iso_lang.h \
include/httpd.h \
include/main.h \ include/main.h \
include/mmx.h \ include/mmx.h \
include/modules.h \ include/modules.h \
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* vlc_objects.h: vlc_object_t definition. * vlc_objects.h: vlc_object_t definition.
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 VideoLAN * 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> * Authors: Samuel Hocevar <sam@zoy.org>
* *
...@@ -33,6 +33,8 @@ ...@@ -33,6 +33,8 @@
#define VLC_OBJECT_VOUT (-9) #define VLC_OBJECT_VOUT (-9)
#define VLC_OBJECT_AOUT (-10) #define VLC_OBJECT_AOUT (-10)
#define VLC_OBJECT_SOUT (-11) #define VLC_OBJECT_SOUT (-11)
#define VLC_OBJECT_HTTPD (-12)
#define VLC_OBJECT_GENERIC (-666) #define VLC_OBJECT_GENERIC (-666)
/* Object search mode */ /* Object search mode */
......
SOURCES_access_output_dummy = modules/access_output/dummy.c SOURCES_access_output_dummy = modules/access_output/dummy.c
SOURCES_access_output_file = modules/access_output/file.c SOURCES_access_output_file = modules/access_output/file.c
SOURCES_access_output_udp = modules/access_output/udp.c SOURCES_access_output_udp = modules/access_output/udp.c
SOURCES_access_output_http = modules/access_output/http.c
...@@ -3,3 +3,4 @@ SOURCES_gnome_main = modules/misc/gtk_main.c ...@@ -3,3 +3,4 @@ SOURCES_gnome_main = modules/misc/gtk_main.c
SOURCES_sap = modules/misc/sap.c SOURCES_sap = modules/misc/sap.c
SOURCES_screensaver = modules/misc/screensaver.c SOURCES_screensaver = modules/misc/screensaver.c
SOURCES_qte_main = modules/misc/qte_main.cpp SOURCES_qte_main = modules/misc/qte_main.cpp
SOURCES_httpd = modules/misc/httpd.c
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* objects.c: vlc_object_t handling * objects.c: vlc_object_t handling
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 VideoLAN * 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> * Authors: Samuel Hocevar <sam@zoy.org>
* *
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
#include "vlc_playlist.h" #include "vlc_playlist.h"
#include "interface.h" #include "interface.h"
#include "httpd.h"
/***************************************************************************** /*****************************************************************************
* Local prototypes * Local prototypes
*****************************************************************************/ *****************************************************************************/
...@@ -123,6 +124,10 @@ void * __vlc_object_create( vlc_object_t *p_this, int i_type ) ...@@ -123,6 +124,10 @@ void * __vlc_object_create( vlc_object_t *p_this, int i_type )
i_size = sizeof(sout_instance_t); i_size = sizeof(sout_instance_t);
psz_type = "stream output"; psz_type = "stream output";
break; break;
case VLC_OBJECT_HTTPD:
i_size = sizeof( httpd_t );
psz_type = "http daemon";
break;
default: default:
i_size = i_type > 0 i_size = i_type > 0
? i_type > (int)sizeof(vlc_object_t) ? i_type > (int)sizeof(vlc_object_t)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment