* modules/misc/sap.c: Fixed a stupid option (no-ipv4-sap)

* NEWS: added some more stuff

diff --git a/NEWS b/NEWS
index bf6eac43d229054b8bf9322db392110f7bf0288f..1ed2e45f42a6c949ce312768be188aa1137aaba7 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-$Id: NEWS,v 1.67 2003/10/12 23:28:36 hartman Exp $
+$Id: NEWS,v 1.68 2003/10/13 05:48:08 zorglub Exp $
 
 Changes between 0.6.2 and 0.6.3:
 ---------------------------------
@@ -17,12 +17,18 @@ Input:
  * Fixed seeking support in FLAC files.
  * cddax and vcdx
  * Reworked DVB tuning
+ * Better Icecast support
 
 Codecs:
  * Support for AAC + SBR.
  * MPEG 2.5 support.
  * removed old a52, mpeg_video and mpeg_audio codecs, since we are using others now.
 
+Interface:
+ * Improvements to the wxwindows playlist 
+   (Sort,Search, mode buttons)
+ * Help in the preferences window
+
 Mac OS X port:
  * Mozilla plugin for Mac OS X (experimental).
  * Save playlist.
@@ -45,6 +51,7 @@ Miscellaneous:
  * Audio visual effects filters (spectrum, scope and random).
  * Audio visual effects filter using goom.
  * Spanish and Portugese Brazilian translations.
+ * SAP now supports HTTP streams
 
 Changes between 0.6.1 and 0.6.2:
 ---------------------------------

diff --git a/modules/misc/sap.c b/modules/misc/sap.c
index fa8419626fc1f66bf6e9edffe02c6e470b51bf9f..98c8b54e89c1dd6b865b465a87094b211e917089 100644 (file)
--- a/modules/misc/sap.c
+++ b/modules/misc/sap.c
@@ -2,7 +2,7 @@
  * sap.c :  SAP interface module
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: sap.c,v 1.26 2003/10/08 18:26:58 gbazin Exp $
+ * $Id: sap.c,v 1.27 2003/10/13 05:48:08 zorglub Exp $
  *
  * Authors: Arnaud Schauly <gitan@via.ecp.fr>
  *          Clément Stenac <zorglub@via.ecp.fr>
@@ -154,8 +154,8 @@ struct attr_descr_t
 
 #define SAP_ADDR_TEXT N_("SAP multicast address")
 #define SAP_ADDR_LONGTEXT N_("SAP multicast address")
-#define SAP_IPV4_TEXT N_("No IPv4-SAP listening")
-#define SAP_IPV4_LONGTEXT N_("Set this if you do not want SAP to listen for IPv4 announces")
+#define SAP_IPV4_TEXT N_("IPv4-SAP listening")
+#define SAP_IPV4_LONGTEXT N_("Set this if you want SAP to listen for IPv4 announces")
 #define SAP_IPV6_TEXT N_("IPv6-SAP listening")
 #define SAP_IPV6_LONGTEXT N_("Set this if you want SAP to listen for IPv6 announces")
 #define SAP_SCOPE_TEXT N_("IPv6 SAP scope")
@@ -169,7 +169,7 @@ vlc_module_begin();
         add_string( "sap-addr", NULL, NULL,
                      SAP_ADDR_TEXT, SAP_ADDR_LONGTEXT, VLC_TRUE );
 
-        add_bool( "no-sap-ipv4", 0 , NULL,
+        add_bool( "sap-ipv4", 1 , NULL,
                      SAP_IPV4_TEXT,SAP_IPV4_LONGTEXT, VLC_TRUE);
 
         add_bool( "sap-ipv6", 0 , NULL,
@@ -213,7 +213,7 @@ static void Run( intf_thread_t *p_intf )
     int fd            = - 1;
     int fdv6          = -1;
 
-    int no_sap_ipv4      = config_GetInt( p_intf, "no-sap-ipv4" );
+    int sap_ipv4         = config_GetInt( p_intf, "sap-ipv4" );
     int sap_ipv6         = config_GetInt( p_intf, "sap-ipv6" );
     char *sap_ipv6_scope = config_GetPsz( p_intf, "sap-ipv6-scope" );
 
@@ -222,14 +222,14 @@ static void Run( intf_thread_t *p_intf )
     module_t            *p_network;
     network_socket_t    socket_desc;
 
-    if( no_sap_ipv4 == -1 || sap_ipv6 == -1 || sap_ipv6_scope == NULL )
+    if( sap_ipv4 == -1 || sap_ipv6 == -1 || sap_ipv6_scope == NULL )
     {
         msg_Warn( p_intf, "Unable to parse module configuration" );
         return;
     }
 
     /* Prepare IPv4 Networking */
-    if ( no_sap_ipv4 == 0)
+    if ( sap_ipv4 == 1)
     {
         if( !(psz_addr = config_GetPsz( p_intf, "sap-addr" ) ) )
         {
@@ -322,14 +322,14 @@ static void Run( intf_thread_t *p_intf )
     }
 
     /* Closing socket */
-    if( fd )
+    if( fd > 0)
     {
         if( close( fd ) )
         {
             msg_Warn( p_intf, "Ohoh, unable to close the socket" );
         }
     }
-    if( fdv6 )
+    if( fdv6 > 0)
     {
         if( close( fdv6 ) )
         {