From 312754c3a2ac0665983fde5590adeb07df5e5085 Mon Sep 17 00:00:00 2001 From: Laurent Aimar Date: Sun, 23 Feb 2003 19:07:02 +0000 Subject: [PATCH] * all : declaration of http and httpd. --- Makefile.am | 1 + include/vlc_objects.h | 4 +++- modules/access_output/Modules.am | 1 + modules/misc/Modules.am | 1 + src/misc/objects.c | 7 ++++++- 5 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 0bbdfb871e..f50f4e8624 100644 --- 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 956e595e19..f1e4757e9c 100644 --- 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 * @@ -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 4fcabbb4eb..0e642847fd 100644 --- 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 e1fd98fd0f..a8ea75d7f2 100644 --- 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 347d4b41df..d8e0cdd2be 100644 --- 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 * @@ -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)