Skip to content

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

* modules/gui/macosx/open.m: Removed channel server support 

* po/*: Updated po files just before the 0.5.1 release
* modules/audio_filter/resampler/linear.c: fixed an initialization bug
parent 89c82172
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1691 additions and 2249 deletions
NEWS
View file @ d0588ae7
$Id: NEWS,v 1.17 2003/02/15 20:02:16 jpsaman Exp $
$Id: NEWS,v 1.18 2003/02/16 01:29:39 massiot Exp $
Changes between 0.5.0 and 0.5.1:
--------------------------------
......@@ -39,6 +39,7 @@ Mac OS X port:
* added half, normal and double video window menu items
* new step forward/step backward commands
* the dock should no longer be visible in fullscreen mode
* the Mac OS X binary is now compiled with Ogg/theora support
* vlc.app is now VLC.app
Win32 port:
......
extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
View file @ d0588ae7
......@@ -23,9 +23,10 @@
</array>
<key>IBOpenObjects</key>
<array>
<integer>636</integer>
<integer>29</integer>
</array>
<key>IBSystem Version</key>
<string>6G30</string>
<string>6I32</string>
</dict>
</plist>
modules/audio_filter/resampler/linear.c
View file @ d0588ae7
......@@ -2,7 +2,7 @@
* linear.c : linear interpolation resampler
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: linear.c,v 1.7 2002/12/13 01:50:31 gbazin Exp $
* $Id: linear.c,v 1.8 2003/02/16 01:29:40 massiot Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
* Sigmund Augdal <sigmunau@idi.ntnu.no>
......@@ -86,7 +86,7 @@ static int Create( vlc_object_t *p_this )
return VLC_ENOMEM;
}
p_filter->p_sys->p_prev_sample = malloc(
p_filter->input.i_physical_channels * sizeof(int32_t) );
aout_FormatNbChannels( &p_filter->input ) * sizeof(int32_t) );
if( p_filter->p_sys->p_prev_sample == NULL )
{
msg_Err( p_filter, "out of memory" );
......
modules/gui/macosx/open.h
View file @ d0588ae7
......@@ -2,7 +2,7 @@
* open.h: MacOS X plugin for vlc
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: open.h,v 1.10 2003/02/05 02:31:27 hartman Exp $
* $Id: open.h,v 1.11 2003/02/16 01:29:40 massiot Exp $
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr>
......@@ -75,11 +75,6 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
IBOutlet id o_net_udpm_port;
IBOutlet id o_net_udpm_port_lbl;
IBOutlet id o_net_udpm_port_stp;
IBOutlet id o_net_cs_addr;
IBOutlet id o_net_cs_addr_lbl;
IBOutlet id o_net_cs_port;
IBOutlet id o_net_cs_port_lbl;
IBOutlet id o_net_cs_port_stp;
IBOutlet id o_net_http_url;
IBOutlet id o_net_http_url_lbl;
......
modules/gui/macosx/open.m
View file @ d0588ae7
......@@ -2,7 +2,7 @@
* open.m: MacOS X plugin for vlc
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: open.m,v 1.22 2003/02/09 19:28:43 massiot Exp $
* $Id: open.m,v 1.23 2003/02/16 01:29:40 massiot Exp $
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr>
......@@ -192,19 +192,14 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
[o_net_udp_port_lbl setStringValue: _NS("Port")];
[o_net_udpm_addr_lbl setStringValue: _NS("Address")];
[o_net_udpm_port_lbl setStringValue: _NS("Port")];
[o_net_cs_addr_lbl setStringValue: _NS("Address")];
[o_net_cs_port_lbl setStringValue: _NS("Port")];
[o_net_http_url_lbl setStringValue: _NS("URL")];
[[o_net_mode cellAtRow:0 column:0] setTitle: _NS("UDP/RTP")];
[[o_net_mode cellAtRow:1 column:0] setTitle: _NS("UDP/RTP Multicast")];
[[o_net_mode cellAtRow:2 column:0] setTitle: _NS("Channel server")];
[[o_net_mode cellAtRow:3 column:0] setTitle: _NS("HTTP/FTP/MMS")];
[[o_net_mode cellAtRow:2 column:0] setTitle: _NS("HTTP/FTP/MMS")];
[o_net_udp_port setIntValue: config_GetInt( p_intf, "server-port" )];
[o_net_udp_port_stp setIntValue: config_GetInt( p_intf, "server-port" )];
[o_net_cs_port setIntValue: config_GetInt( p_intf, "channel-port" )];
[o_net_cs_port_stp setIntValue: config_GetInt( p_intf, "channel-port" )];
[o_sout_cbox setTitle: _NS("Stream output")];
[o_sout_mrl_lbl setTitle: _NS("Stream output MRL")];
......@@ -254,14 +249,6 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
selector: @selector(openNetInfoChanged:)
name: NSControlTextDidChangeNotification
object: o_net_udpm_port];
[[NSNotificationCenter defaultCenter] addObserver: self
selector: @selector(openNetInfoChanged:)
name: NSControlTextDidChangeNotification
object: o_net_cs_addr];
[[NSNotificationCenter defaultCenter] addObserver: self
selector: @selector(openNetInfoChanged:)
name: NSControlTextDidChangeNotification
object: o_net_cs_port];
[[NSNotificationCenter defaultCenter] addObserver: self
selector: @selector(openNetInfoChanged:)
name: NSControlTextDidChangeNotification
......@@ -597,14 +584,12 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
NSString *o_mode;
BOOL b_udp = FALSE;
BOOL b_udpm = FALSE;
BOOL b_cs = FALSE;
BOOL b_http = FALSE;
o_mode = [[o_net_mode selectedCell] title];
if( [o_mode isEqualToString: _NS("UDP/RTP")] ) b_udp = TRUE;
else if( [o_mode isEqualToString: _NS("UDP/RTP Multicast")] ) b_udpm = TRUE;
else if( [o_mode isEqualToString: _NS("Channel server")] ) b_cs = TRUE;
else if( [o_mode isEqualToString: _NS("HTTP/FTP/MMS")] ) b_http = TRUE;
[o_net_udp_port setEnabled: b_udp];
......@@ -612,9 +597,6 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
[o_net_udpm_addr setEnabled: b_udpm];
[o_net_udpm_port setEnabled: b_udpm];
[o_net_udpm_port_stp setEnabled: b_udpm];
[o_net_cs_addr setEnabled: b_cs];
[o_net_cs_port setEnabled: b_cs];
[o_net_cs_port_stp setEnabled: b_cs];
[o_net_http_url setEnabled: b_http];
[self openNetInfoChanged: nil];
......@@ -632,10 +614,6 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
{
[o_net_udpm_port setIntValue: [o_net_udpm_port_stp intValue]];
}
else if( i_tag == 2 )
{
[o_net_cs_port setIntValue: [o_net_cs_port_stp intValue]];
}
[self openNetInfoChanged: nil];
}
......@@ -643,15 +621,11 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
- (void)openNetInfoChanged:(NSNotification *)o_notification
{
NSString *o_mode;
vlc_bool_t b_channel;
NSString *o_mrl_string = [NSString string];
intf_thread_t * p_intf = [NSApp getIntf];
o_mode = [[o_net_mode selectedCell] title];
b_channel = (vlc_bool_t)[o_mode isEqualToString: _NS("Channel server")];
config_PutInt( p_intf, "network-channel", b_channel );
if( [o_mode isEqualToString: _NS("UDP/RTP")] )
{
int i_port = [o_net_udp_port intValue];
......@@ -677,25 +651,6 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
[o_mrl_string stringByAppendingFormat: @":%i", i_port];
}
}
else if( [o_mode isEqualToString: _NS("Channel server")] )
{
NSString *o_addr = [o_net_cs_addr stringValue];
int i_port = [o_net_cs_port intValue];
if( p_intf->p_vlc->p_channel == NULL )
{
network_ChannelCreate( p_intf );
}
config_PutPsz( p_intf, "channel-server", [o_addr lossyCString] );
if( i_port < 65536 )
{
config_PutInt( p_intf, "channel-port", i_port );
}
/* FIXME: we should use a playlist server instead */
o_mrl_string = [NSString stringWithString: @"udp://"];
}
else if( [o_mode isEqualToString: _NS("HTTP/FTP/MMS")] )
{
NSString *o_url = [o_net_http_url stringValue];
......
po/de.po
View file @ d0588ae7
This diff is collapsed.
po/en_GB.po
View file @ d0588ae7
This diff is collapsed.
po/fr.po
View file @ d0588ae7
This diff is collapsed.
po/it.po
View file @ d0588ae7
This diff is collapsed.
po/ja.po
View file @ d0588ae7
This diff is collapsed.
po/nl.po
View file @ d0588ae7
This diff is collapsed.
po/no.po
View file @ d0588ae7
This diff is collapsed.
po/pl.po
View file @ d0588ae7
This diff is collapsed.
po/ru.po
View file @ d0588ae7
This diff is collapsed.
po/sv.po
View file @ d0588ae7
This diff is collapsed.
po/vlc.pot
View file @ d0588ae7
This diff is collapsed.
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