/*****************************************************************************
* objects.c: vlc_object_t handling
*****************************************************************************
- * Copyright (C) 2004-2008 the VideoLAN team
+ * Copyright (C) 2004-2008 VLC authors and VideoLAN
* Copyright (C) 2006-2010 Rémi Denis-Courmont
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/**
# include <search.h>
#endif
-#ifndef WIN32
-# include <vlc_fs.h>
-# include <unistd.h>
-#else
+#ifdef __OS2__
+# include <sys/socket.h>
+# include <netinet/in.h>
+# include <unistd.h> // close(), write()
+#elif defined(WIN32)
# include <io.h>
# include <winsock2.h>
# include <ws2tcpip.h>
# define write( a, b, c ) send (a, b, c, 0)
# undef close
# define close( a ) closesocket (a)
+#else
+# include <vlc_fs.h>
+# include <unistd.h>
#endif
#include <limits.h>
#undef vlc_custom_create
void *vlc_custom_create (vlc_object_t *parent, size_t length,
- int type, const char *typename)
+ const char *typename)
{
/* NOTE:
* VLC objects are laid out as follow:
vlc_object_internals_t *priv = malloc (sizeof (*priv) + length);
if (unlikely(priv == NULL))
return NULL;
- priv->i_object_type = type;
priv->psz_name = NULL;
priv->var_root = NULL;
vlc_mutex_init (&priv->var_lock);
obj->psz_header = NULL;
obj->b_die = false;
obj->b_force = false;
+ memset (obj + 1, 0, length - sizeof (*obj)); /* type-specific stuff */
if (likely(parent != NULL))
{
vlc_restorecancel (canc);
}
- memset (obj + 1, 0, length - sizeof (*obj));
return obj;
}
*/
void *vlc_object_create( vlc_object_t *p_this, size_t i_size )
{
- return vlc_custom_create( p_this, i_size, VLC_OBJECT_GENERIC, "generic" );
+ return vlc_custom_create( p_this, i_size, "generic" );
}
#undef vlc_object_set_destructor
if( p_priv->pf_destructor )
p_priv->pf_destructor( p_this );
+ if (unlikely(p_this == VLC_OBJECT(p_this->p_libvlc)))
+ {
+ /* TODO: should be in src/libvlc.c */
+ var_DelCallback (p_this, "tree", DumpCommand, p_this);
+ var_DelCallback (p_this, "vars", DumpCommand, p_this);
+ }
+
/* Destroy the associated variables. */
var_DestroyAll( p_this );
}
-#ifdef WIN32
+#if defined(WIN32) || defined(__OS2__)
/**
* select()-able pipes emulated using Winsock
*/
# define vlc_pipe selectable_pipe
static int selectable_pipe (int fd[2])
{
- SOCKADDR_IN addr;
+ struct sockaddr_in addr;
int addrlen = sizeof (addr);
- SOCKET l = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP), a,
- c = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);
- if ((l == INVALID_SOCKET) || (c == INVALID_SOCKET))
+ int l = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP),
+ c = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);
+ if (l == -1 || c == -1)
goto error;
memset (&addr, 0, sizeof (addr));
addr.sin_family = AF_INET;
addr.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
- if (bind (l, (PSOCKADDR)&addr, sizeof (addr))
- || getsockname (l, (PSOCKADDR)&addr, &addrlen)
+ if (bind (l, (struct sockaddr *)&addr, sizeof (addr))
+ || getsockname (l, (struct sockaddr *)&addr, &addrlen)
|| listen (l, 1)
- || connect (c, (PSOCKADDR)&addr, addrlen))
+ || connect (c, (struct sockaddr *)&addr, addrlen))
goto error;
- a = accept (l, NULL, NULL);
- if (a == INVALID_SOCKET)
+ int a = accept (l, NULL, NULL);
+ if (a == -1)
goto error;
- closesocket (l);
+ close (l);
//shutdown (a, 0);
//shutdown (c, 1);
fd[0] = c;
return 0;
error:
- if (l != INVALID_SOCKET)
- closesocket (l);
- if (c != INVALID_SOCKET)
- closesocket (c);
+ if (l != -1)
+ close (l);
+ if (c != -1)
+ close (c);
return -1;
}
-#endif /* WIN32 */
+#endif /* WIN32 || __OS2__ */
static vlc_mutex_t pipe_lock = VLC_STATIC_MUTEX;
}
}
-static int objnamecmp(const vlc_object_t *obj, const char *name)
-{
- char *objname = vlc_object_get_name(obj);
- if (objname == NULL)
- return INT_MIN;
-
- int ret = strcmp (objname, name);
- free (objname);
- return ret;
-}
-
#undef vlc_object_find_name
/**
* Finds a named object and increment its reference count.
MYCASE( TIME, "time" );
MYCASE( COORDS, "coords" );
MYCASE( ADDRESS, "address" );
- MYCASE( MUTEX, "mutex" );
#undef MYCASE
}
printf( " *-o \"%s\" (%s", p_var->psz_name, psz_type );
switch( p_var->i_type & VLC_VAR_CLASS )
{
case VLC_VAR_VOID:
- case VLC_VAR_MUTEX:
break;
case VLC_VAR_BOOL:
printf( ": %s", p_var->val.b_bool ? "true" : "false" );
projects / vlc / blobdiff