. suppression d'un warning pour les machines n'ayant pas usleep()

 . correction d'une boulette que j'ai faite dans netutils.c
 . d�but de intf_gnome. vout_gnome est une copie de vout_x11 pour l'instant

diff --git a/Makefile.in b/Makefile.in
index 776657a352623b67fd50ba711b55f2c0df650209..89c64aa761434779cf6c439a287f81e661198e69 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -11,7 +11,7 @@
 ################################################################################
 
 # Audio output settings
-AOUT = dsp
+AOUT += dsp
 #AOUT += esd
 # Not yet supported
 #AOUT += alsa
@@ -19,23 +19,25 @@ AOUT = dsp
 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
@@ -88,8 +90,6 @@ PROGRAM_BUILD = `date` $(USER)
 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)
@@ -408,6 +408,14 @@ plugins/intf/intf_x11.so plugins/vout/vout_x11.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_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 $@ $<

diff --git a/include/config.h.in b/include/config.h.in
index 9e7d2b3ff5683cb25e1eba60ead81402e22a766f..9b48b2d2426ff32ad9288b74492bccc9529bd2ac 100644 (file)
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -41,6 +41,9 @@
  *****************************************************************************/
 
 /* 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"
 

diff --git a/src/interface/interface.c b/src/interface/interface.c
index e72b2f5701a79ae3dc9107acda9c923a832176f1..d82ffc6226faecc52570d6a305c0c716e124839d 100644 (file)
--- a/src/interface/interface.c
+++ b/src/interface/interface.c
@@ -110,9 +110,12 @@ intf_thread_t* intf_Create( void )
     }
 
     /* 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;

diff --git a/src/interface/main.c b/src/interface/main.c
index ba193c8fd021112d19e1ff5c06f5da54286117df..c50474fe3742fcf0c318a2eee3af9448d0138d57 100644 (file)
--- a/src/interface/main.c
+++ b/src/interface/main.c
@@ -520,9 +520,7 @@ static void Usage( int i_fashion )
  *****************************************************************************/
 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"

diff --git a/src/misc/mtime.c b/src/misc/mtime.c
index 866aa7e4320b6db8067b28ce568e462d63d4f80c..43ff74685634045e24beec513481d1668f4fcb38 100644 (file)
--- a/src/misc/mtime.c
+++ b/src/misc/mtime.c
@@ -106,7 +106,13 @@ void mwait( mtime_t date )
     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 */

diff --git a/src/misc/netutils.c b/src/misc/netutils.c
index ede43fe7f8248a18ddc2572743ecf8ea92981ded..d85f2af631ceb1796456ee91314bab5b369ed491 100644 (file)
--- a/src/misc/netutils.c
+++ b/src/misc/netutils.c
@@ -33,11 +33,11 @@
 
 #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
@@ -227,7 +227,7 @@ int ReadIfConf(int i_sockfd, if_descr_t* p_ifdescr, char* psz_name)
  *****************************************************************************/
 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;
@@ -237,7 +237,7 @@ int ReadNetConf(int i_sockfd, net_descr_t* p_net_descr)
 #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