################################################################################
# Audio output settings
-AOUT = dsp
+AOUT += dsp
#AOUT += esd
# Not yet supported
#AOUT += alsa
AOUT += dummy
# Video output settings
-VOUT = x11
+VOUT += x11
#VOUT += fb
#VOUT += ggi
#VOUT += glide
# Not yet supported
-#VOUT = beos
+VOUT += gnome
+#VOUT += beos
#VOUT += dga
# Fallback method that should always work
VOUT += dummy
# Interface settings
-INTF = x11
+INTF += x11
#INTF += fb
#INTF += ggi
#INTF += glide
# Not yet supported
-#INTF = beos
+INTF += gnome
+#INTF += beos
#INTF += dga
# Fallback method that should always work
INTF += dummy
DEFINE += -DARCH_$(shell echo $(ARCH) | cut -f1 -d' ')
DEFINE += -DSYS_$(SYS)
DEFINE += -DPLUGIN_PATH="\"$(PREFIX)/lib/videolan/vlc\""
-DEFINE += -DPROGRAM_VERSION="\"0.1.99\""
-DEFINE += -DPROGRAM_CODENAME="\"Onatopp\""
#DEFINE += -DPROGRAM_OPTIONS="\"$(shell echo $(PROGRAM_OPTIONS) | tr 'A-Z' 'a-z')\""
#DEFINE += -DPROGRAM_BUILD="\"$(PROGRAM_BUILD)\""
ifeq ($(DEBUG),1)
@echo "compiling $*.so from $*.c"
@$(CC) $(CCFLAGS) $(CFLAGS) -I/usr/X11R6/include -L/usr/X11R6/lib -lX11 -lXext -shared -o $@ $<
+plugins/intf/intf_gnome.so: %.so: %.c
+ @echo "compiling $*.so from $*.c"
+ @$(CC) $(CCFLAGS) $(CFLAGS) $(LCFLAGS) `gnome-config --libs --cflags gnomeui` -shared -o $@ $< plugins/intf/intf_gnome_callbacks.c plugins/intf/intf_gnome_interface.c plugins/intf/intf_gnome_support.c
+
+plugins/vout/vout_gnome.so: %.so: %.c
+ @echo "compiling $*.so from $*.c"
+ @$(CC) $(CCFLAGS) $(CFLAGS) -I/usr/X11R6/include -L/usr/X11R6/lib -lX11 -lXext -shared -o $@ $<
+
plugins/intf/intf_glide.so plugins/vout/vout_glide.so: %.so: %.c
@echo "compiling $*.so from $*.c"
@$(CC) $(CCFLAGS) $(CFLAGS) -I/usr/include/glide -lglide2x -shared -o $@ $<
*****************************************************************************/
/* Program version and copyright message */
+#define VERSION_MESSAGE "vlc @VLC_VERSION@ @VLC_CODENAME@" \
+ /* " (" PROGRAM_BUILD ") (" PROGRAM_OPTIONS ")\n" */ \
+ "Copyright 1996-2000 VideoLAN\n"
#define COPYRIGHT_MESSAGE "VideoLAN Client - version @VLC_VERSION@" \
" @VLC_CODENAME@ - (c)1996-2000 VideoLAN"
}
/* Get plugins */
- p_intf->p_sys_create = GetPluginFunction( p_intf->intf_plugin, "intf_SysCreate" );
- p_intf->p_sys_manage = GetPluginFunction( p_intf->intf_plugin, "intf_SysManage" );
- p_intf->p_sys_destroy = GetPluginFunction( p_intf->intf_plugin, "intf_SysDestroy" );
+ p_intf->p_sys_create
+ = GetPluginFunction( p_intf->intf_plugin, "intf_SysCreate" );
+ p_intf->p_sys_manage
+ = GetPluginFunction( p_intf->intf_plugin, "intf_SysManage" );
+ p_intf->p_sys_destroy
+ = GetPluginFunction( p_intf->intf_plugin, "intf_SysDestroy" );
/* Initialize structure */
p_intf->b_die = 0;
*****************************************************************************/
static void Version( void )
{
- intf_Msg( "vlc " " "
- " (" ") (" ")\n"
- "Copyright 1996-2000 VideoLAN\n"
+ intf_Msg( VERSION_MESSAGE
"This program comes with NO WARRANTY, to the extent permitted by law.\n"
"You may redistribute it under the terms of the GNU General Public License;\n"
"see the file named COPYING for details.\n"
snooze( delay );
#else
+#ifdef HAVE_USLEEP
+ struct timeval tv_date;
+
+#else
struct timeval tv_date, tv_delay;
+
+#endif
mtime_t delay; /* delay in msec, signed to detect errors */
/* see mdate() about gettimeofday() possible errors */
#include <netinet/in.h> /* BSD: struct in_addr */
#include <sys/socket.h> /* BSD: struct sockaddr */
-#ifdef (HAVE_ARPA_INET_H)
+#ifdef HAVE_ARPA_INET_H
#include <arpa/inet.h> /* inet_ntoa(), inet_aton() */
#endif
-#if defined (HAVE_SYS_IOCTL_H) && defined(HAVE_NET_IF_H)
+#if defined (HAVE_SYS_IOCTL_H) && defined (HAVE_NET_IF_H)
#include <sys/ioctl.h> /* ioctl() */
#include <net/if.h> /* interface (arch-dependent) */
#endif
*****************************************************************************/
int ReadNetConf(int i_sockfd, net_descr_t* p_net_descr)
{
-#if defined (HAVE_SYS_IOCTL_H) && defined(HAVE_NET_IF_H)
+#if defined (HAVE_SYS_IOCTL_H) && defined (HAVE_NET_IF_H)
struct ifreq* a_ifr_ifconf = NULL;
struct ifreq* p_ifr_current_if;
struct ifconf ifc_netconf;
#endif
int i_rc = 0;
-#if defined (HAVE_SYS_IOCTL_H) && defined(HAVE_NET_IF_H)
+#if defined (HAVE_SYS_IOCTL_H) && defined (HAVE_NET_IF_H)
ASSERT(p_net_descr);
/* Start by assuming we have few than 3 interfaces (i_if_number will