Skip to content

V
vlc-1.1
Commit 9e82d79b authored by Christophe Massiot's avatar Christophe Massiot
Browse files
Options

* GNU make detection 

* Deleted non-working fullscreen menu item [OS X]
* udp and http no longer modify p_input->psz_name
parent 5322a29b
Hide whitespace changes
Inline Side-by-side
Showing with 509 additions and 414 deletions
configure
View file @ 9e82d79b
This source diff could not be displayed because it is too large. You can view the blob instead.
configure.in
View file @ 9e82d79b
......@@ -33,6 +33,23 @@ AC_PROG_CPP
dnl Find the right ranlib, even when cross-compiling
AC_CHECK_TOOL(RANLIB, ranlib, :)
dnl Check for GNU make
AC_PATH_PROG(GMAKE, gmake, no)
if test "x$GMAKE" = "xno"; then
AC_CACHE_CHECK([whether GNU make is installed],
[ac_cv_gmake],
[if make --version | grep -q -i gnu; then
ac_cv_gmake="yes"
else
echo "This software needs you to install GNU make to compile properly."
echo "You can get it from http://www.gnu.org/."
exit
fi])
VLC_MAKE="make"
else
VLC_MAKE="gmake"
fi
dnl Gettext stuff
ALL_LINGUAS="de fr no ru"
......@@ -1702,11 +1719,11 @@ which modules get compiled as plugins.
"
if test x${HAVE_VLC} = x1
then
echo "To build vlc and its plugins, type \`make'."
echo "To build vlc and its plugins, type \`$VLC_MAKE'."
fi
if test x${NEED_LIBDVDCSS} = x1
then
echo "To build libdvdcss only, type \`make libdvdcss'."
echo "To build libdvdcss only, type \`$VLC_MAKE libdvdcss'."
fi
echo ""
extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
View file @ 9e82d79b
......@@ -7,7 +7,7 @@
<key>IBEditorPositions</key>
<dict>
<key>29</key>
<string>110 456 257 44 0 0 1600 1178 </string>
<string>73 282 257 44 0 0 1152 746 </string>
<key>460</key>
<string>120 456 104 66 0 0 1600 1178 </string>
</dict>
......
plugins/access/http.c
View file @ 9e82d79b
......@@ -2,7 +2,7 @@
* http.c: HTTP access plug-in
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: http.c,v 1.5 2002/03/19 05:49:30 sam Exp $
* $Id: http.c,v 1.6 2002/03/26 23:39:43 massiot Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -51,6 +51,7 @@
*****************************************************************************/
static void input_getfunctions( function_list_t * );
static int HTTPOpen ( struct input_thread_s * );
static void HTTPClose ( struct input_thread_s * );
static int HTTPSetProgram ( struct input_thread_s * , pgrm_descriptor_t * );
static void HTTPSeek ( struct input_thread_s *, off_t );
......@@ -84,7 +85,7 @@ static void input_getfunctions( function_list_t * p_function_list )
#define input p_function_list->functions.access
input.pf_open = HTTPOpen;
input.pf_read = input_FDNetworkRead;
input.pf_close = input_FDClose;
input.pf_close = HTTPClose;
input.pf_set_program = HTTPSetProgram;
input.pf_set_area = NULL;
input.pf_seek = HTTPSeek;
......@@ -102,6 +103,7 @@ typedef struct _input_socket_s
char * psz_network;
network_socket_t socket_desc;
char psz_buffer[256];
char * psz_name;
} _input_socket_t;
/*****************************************************************************
......@@ -215,7 +217,8 @@ static int HTTPConnect( input_thread_t * p_input, off_t i_tell )
static int HTTPOpen( input_thread_t * p_input )
{
_input_socket_t * p_access_data;
char * psz_parser = p_input->psz_name;
char * psz_name = strdup(p_input->psz_name);
char * psz_parser = psz_name;
char * psz_server_addr = "";
char * psz_server_port = "";
char * psz_path = "";
......@@ -226,9 +229,11 @@ static int HTTPOpen( input_thread_t * p_input )
if( p_access_data == NULL )
{
intf_ErrMsg( "http error: Out of memory" );
free(psz_name);
return( -1 );
}
p_access_data->psz_name = psz_name;
p_access_data->psz_network = "";
if( config_GetIntVariable( "ipv4" ) )
{
......@@ -292,6 +297,7 @@ static int HTTPOpen( input_thread_t * p_input )
intf_ErrMsg( "input error: cannot parse server port near %s",
psz_parser );
free( p_input->p_access_data );
free( psz_name );
return( -1 );
}
}
......@@ -305,6 +311,7 @@ static int HTTPOpen( input_thread_t * p_input )
{
intf_ErrMsg( "input error: no server given" );
free( p_input->p_access_data );
free( psz_name );
return( -1 );
}
......@@ -367,6 +374,7 @@ static int HTTPOpen( input_thread_t * p_input )
{
intf_ErrMsg( "input error: http_proxy environment variable is invalid !" );
free( p_input->p_access_data );
free( psz_name );
return( -1 );
}
......@@ -406,6 +414,15 @@ static int HTTPOpen( input_thread_t * p_input )
return( HTTPConnect( p_input, 0 ) );
}
/*****************************************************************************
* HTTPClose: free unused data structures
*****************************************************************************/
static void HTTPClose( input_thread_t * p_input )
{
free( p_input->psz_name );
input_FDClose( p_input );
}
/*****************************************************************************
* HTTPSetProgram: do nothing
*****************************************************************************/
......
plugins/access/udp.c
View file @ 9e82d79b
......@@ -2,7 +2,7 @@
* udp.c: raw UDP access plug-in
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: udp.c,v 1.4 2002/03/15 04:41:54 sam Exp $
* $Id: udp.c,v 1.5 2002/03/26 23:39:43 massiot Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -99,7 +99,8 @@ static int UDPOpen( input_thread_t * p_input )
input_socket_t * p_access_data;
struct module_s * p_network;
char * psz_network = "";
char * psz_parser = p_input->psz_name;
char * psz_name = strdup(p_input->psz_name);
char * psz_parser = psz_name;
char * psz_server_addr = "";
char * psz_server_port = "";
char * psz_bind_addr = "";
......@@ -207,6 +208,7 @@ static int UDPOpen( input_thread_t * p_input )
{
intf_ErrMsg( "input error: cannot parse server port near %s",
psz_parser );
free(psz_name);
return( -1 );
}
}
......@@ -218,6 +220,7 @@ static int UDPOpen( input_thread_t * p_input )
{
intf_ErrMsg( "input error: cannot parse bind port near %s",
psz_parser );
free(psz_name);
return( -1 );
}
}
......@@ -242,12 +245,12 @@ static int UDPOpen( input_thread_t * p_input )
/* Find an appropriate network module */
p_network = module_Need( MODULE_CAPABILITY_NETWORK, psz_network,
&socket_desc );
free(psz_name);
if( p_network == NULL )
{
return( -1 );
}
module_Unneed( p_network );
p_access_data = p_input->p_access_data = malloc( sizeof(input_socket_t) );
if( p_access_data == NULL )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment