Changeset 0e1b522e9b6b5aae8aa288331d1e42c0271429a1

Timestamp:

03/30/08 16:15:09 (5 months ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1206886509 +0300

git-parent:

[ae8e44aedb05f1693a856306d50a276c53273a31]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1206884131 +0300

Message:

Remove HTTPD object type

Files:

• include/vlc_objects.h (modified) (1 diff)
• modules/misc/lua/objects.c (modified) (1 diff)
• src/network/httpd.c (modified) (4 diffs)

include/vlc_objects.h

@@ -48 +48 @@
-#define VLC_OBJECT_AOUT        (-10)
-#define VLC_OBJECT_SOUT        (-11)
-
+
-#define VLC_OBJECT_PACKETIZER  (-13)
-#define VLC_OBJECT_ENCODER     (-14)

modules/misc/lua/objects.c

@@ -118 +118 @@
-          { VLC_OBJECT_AOUT, "aout" },
-          { VLC_OBJECT_SOUT, "sout" },
-          { VLC_OBJECT_HTTPD, "httpd" },
-          { VLC_OBJECT_PACKETIZER, "packetizer" },
-          { VLC_OBJECT_ENCODER, "encoder" },

src/network/httpd.c

@@ -982 +982 @@
-    tls_server_t *p_tls;
-    char *psz_host;
-
+, ptrval
-    int i;
-
@@ -997 +997 @@
-    /* to be sure to avoid multiple creation */
-    var_Create( p_this->p_libvlc, "httpd_mutex", VLC_VAR_MUTEX );
+    var_Create( p_this->p_libvlc, "httpd_object", VLC_VAR_ADDRESS );
-    var_Get( p_this->p_libvlc, "httpd_mutex", &lockval );
-    vlc_mutex_lock( lockval.p_address );
-
-
+
+
+
+
+
-    {
-        msg_Info( p_this, "creating httpd" );
-        httpd = (httpd_t *)vlc_custom_create( p_this, sizeof (*httpd),
-HTTPD
+GENERIC
-                                              psz_object_type );
-        if( httpd == NULL )
@@ -1016 +1020 @@
-        httpd->host   = NULL;
-
+        ptrval.p_address = httpd;
+        var_Set( p_this->p_libvlc, "httpd_object", ptrval );
-        vlc_object_yield( httpd );
-        vlc_object_attach( httpd, p_this->p_libvlc );
@@ -1192 +1198 @@
-    if( httpd->i_host <= 0 )
-    {
+        vlc_value_t ptrval;
+
-        msg_Dbg( httpd, "no host left, stopping httpd" );
+
+        ptrval.p_address = NULL;
+        var_Set( httpd->p_libvlc, "httpd_object", ptrval );
-        vlc_object_detach( httpd );
-        vlc_object_release( httpd );
+
-    }
-    vlc_mutex_unlock( lockval.p_address );