From 19eb3d9a3a4adddf39deff8ffaa4359b5b2d31dd Mon Sep 17 00:00:00 2001 From: Eric Petit Date: Tue, 27 May 2003 13:22:46 +0000 Subject: [PATCH] * src/stream_output/announce.c : BeOS compile fix. setsockopt( IP_MULTICAST_TTL ) is done in network/ipvx.c (if supported), so there is no need to do it here again. * modules/gui/beos/* : minor fixes --- modules/gui/beos/InterfaceWindow.cpp | 6 +++--- modules/gui/beos/PreferencesWindow.cpp | 8 +++++--- src/stream_output/announce.c | 14 +++++--------- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/modules/gui/beos/InterfaceWindow.cpp b/modules/gui/beos/InterfaceWindow.cpp index 3598788011..ba6104b13a 100644 --- a/modules/gui/beos/InterfaceWindow.cpp +++ b/modules/gui/beos/InterfaceWindow.cpp @@ -2,7 +2,7 @@ * InterfaceWindow.cpp: beos interface ***************************************************************************** * Copyright (C) 1999, 2000, 2001 VideoLAN - * $Id: InterfaceWindow.cpp,v 1.38 2003/05/17 15:20:46 titer Exp $ + * $Id: InterfaceWindow.cpp,v 1.39 2003/05/27 13:22:45 titer Exp $ * * Authors: Jean-Marc Dressler * Samuel Hocevar @@ -965,9 +965,9 @@ InterfaceWindow::_RestoreSettings() set_window_pos( fMessagesWindow, frame ); if (fSettings->FindRect( "settings frame", &frame ) == B_OK ) { - /* FIXME: Preferences horizontal resizing doesn't work - correctly now */ + /* FIXME: Preferences resizing doesn't work correctly yet */ frame.right = frame.left + fPreferencesWindow->Frame().Width(); + frame.bottom = frame.top + fPreferencesWindow->Frame().Height(); set_window_pos( fPreferencesWindow, frame ); } diff --git a/modules/gui/beos/PreferencesWindow.cpp b/modules/gui/beos/PreferencesWindow.cpp index 44a496046a..baeaa8a7a6 100644 --- a/modules/gui/beos/PreferencesWindow.cpp +++ b/modules/gui/beos/PreferencesWindow.cpp @@ -2,7 +2,7 @@ * PreferencesWindow.cpp: beos interface ***************************************************************************** * Copyright (C) 1999, 2000, 2001 VideoLAN - * $Id: PreferencesWindow.cpp,v 1.24 2003/05/25 17:21:36 titer Exp $ + * $Id: PreferencesWindow.cpp,v 1.25 2003/05/27 13:22:45 titer Exp $ * * Authors: Eric Petit * @@ -23,6 +23,8 @@ #include /* atoi(), strtod() */ +#include + #include #include @@ -30,7 +32,7 @@ /* TODO: - add the needed LockLooper()s - - fix horizontal window resizing */ + - fix window resizing */ /* We use this function to order the items of the BOutlineView */ int compare_func( const BListItem * _first, const BListItem * _second ) @@ -54,7 +56,7 @@ int compare_func( const BListItem * _first, const BListItem * _second ) PreferencesWindow::PreferencesWindow( intf_thread_t * p_interface, BRect frame, const char * name ) : BWindow( frame, name, B_FLOATING_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL, - B_NOT_ZOOMABLE | B_NOT_H_RESIZABLE ), + B_NOT_ZOOMABLE | B_NOT_RESIZABLE ), fConfigScroll( NULL ), p_intf( p_interface ) { diff --git a/src/stream_output/announce.c b/src/stream_output/announce.c index 03474d7c9a..ca60cbaa47 100644 --- a/src/stream_output/announce.c +++ b/src/stream_output/announce.c @@ -49,7 +49,6 @@ sap_session_t * sout_SAPNew ( sout_instance_t *p_sout , char * psz_url_arg , cha network_socket_t socket_desc; char psz_network[12]; struct sockaddr_in addr; - int ttl=15; p_new = (sap_session_t *)malloc( sizeof ( sap_session_t ) ) ; @@ -60,13 +59,13 @@ sap_session_t * sout_SAPNew ( sout_instance_t *p_sout , char * psz_url_arg , cha msg_Dbg (p_sout , "Creating SAP Socket" ); socket_desc.i_type = NETWORK_UDP; - socket_desc.psz_bind_addr = SAP_ADDR; - socket_desc.i_bind_port = SAP_PORT; - socket_desc.psz_server_addr = ""; - socket_desc.i_server_port = 0; + socket_desc.psz_bind_addr = ""; + socket_desc.i_bind_port = 0; + socket_desc.psz_server_addr = SAP_ADDR; + socket_desc.i_server_port = SAP_PORT; socket_desc.i_handle = 0; - sprintf ( psz_network,"ipv4" ); + sprintf ( psz_network, "ipv4" ); p_sout->p_private=(void*) &socket_desc; @@ -84,9 +83,6 @@ sap_session_t * sout_SAPNew ( sout_instance_t *p_sout , char * psz_url_arg , cha addr.sin_addr.s_addr = inet_addr(SAP_ADDR); addr.sin_port = htons( SAP_PORT ); - setsockopt( p_new->socket, IPPROTO_IP, IP_MULTICAST_TTL, - (void*)&ttl, sizeof(ttl) ); - p_new->addr = addr; return(p_new); -- 2.39.2