Skip to content

V
vlc-1.1
Commit ebd0d973 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman
Browse files
Options

* README.MacOSX.rtf: updated section on subtitles. 

* vlc.ebuild: added amd64 keyword. changed script to use emake again.
  Removed MODULES from the doc installation.
* src/libvlc.h: added the new ffmpeg a/v encoders to the list for the prefs.
* share/vlc_win32_rc.rc: Changed the Win32 name of VLC from,
  "An Opensource Media Player" to "VLC media player".
* other: added the new transcoding codecs, channels option and SAP option
  to the stream output dialog.
parent d2c52a32
Show whitespace changes
Inline Side-by-side
Showing with 104 additions and 46 deletions
README.MacOSX.rtf
View file @ ebd0d973
......@@ -2,7 +2,6 @@
{\fonttbl\f0\fswiss\fcharset77 Helvetica;\f1\fswiss\fcharset77 Helvetica-Bold;\f2\fmodern\fcharset77 Courier;
}
{\colortbl;\red255\green255\blue255;}
\vieww15300\viewh14120\viewkind0
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
\f0\fs48 \cf0 VLC media player, version 0.6\
......@@ -100,8 +99,6 @@ Simply drag VLC from the place where you have installed it, to the Trash.\
\f0\b0 \ulnone Support for subtitles in separate files is still very much in a testing phase.\
- DVD subtitles (not experimental) can be used trough the Controls->Subtitles menu-item. Subtitle files NOT. Read on for those.\
- Subfiles need to be opened at the same moment as the video to which you want to add subtitles. You can do this in the File->Open menu.\
- As of yet it is not yet possible to adapt the font, size and/or position of the subtitles.\
- You need to specify the subtitle when you open the file.\
- A subtitle is global instead of bound to a playlist-item. This will be fixed in a future version.\
- Only MicroDVD, SubRIP, SSA1-4. SAMI and vplayer subtitle files are supported at the moment.\
- Subs can only be added to .avi files. .ogm file can have subs included into the .ogm file, these should work as well.\
......@@ -132,4 +129,4 @@ Thanks for reading this file. For additional information, subscribe to the VLC m
-- \
Christophe Massiot <massiot@via.ecp.fr> and\
Derk-Jan Hartman <thedj@users.sourceforge.net> for the VideoLAN team.\
$Id: README.MacOSX.rtf,v 1.21 2003/06/20 01:27:55 hartman Exp $}
\ No newline at end of file
$Id: README.MacOSX.rtf,v 1.22 2003/07/20 19:48:30 hartman Exp $}
\ No newline at end of file
extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
View file @ ebd0d973
......@@ -256,6 +256,7 @@
outputInfoChanged = id;
outputMethodChanged = id;
outputSettings = id;
sapChanged = id;
streamPortStepperChanged = id;
streamTTLStepperChanged = id;
transcodeChanged = id;
......@@ -269,6 +270,7 @@
"o_display" = id;
"o_file_field" = id;
"o_method" = id;
"o_misc_lbl" = id;
"o_mux_lbl" = id;
"o_mux_selector" = id;
"o_open_panel" = id;
......@@ -276,6 +278,8 @@
"o_output_ckbox" = id;
"o_output_settings" = id;
"o_output_sheet" = id;
"o_sap_chkbox" = id;
"o_sap_name" = id;
"o_stream_address" = id;
"o_stream_address_lbl" = id;
"o_stream_port" = id;
......@@ -288,6 +292,8 @@
"o_stream_type_lbl" = id;
"o_transcode_audio_bitrate" = id;
"o_transcode_audio_bitrate_lbl" = id;
"o_transcode_audio_channels" = id;
"o_transcode_audio_channels_lbl" = id;
"o_transcode_audio_chkbox" = id;
"o_transcode_audio_selector" = id;
"o_transcode_lbl" = id;
......
modules/gui/macosx/output.h
View file @ ebd0d973
......@@ -2,7 +2,7 @@
* output.h: MacOS X Output Dialog
*****************************************************************************
* Copyright (C) 2002-2003 VideoLAN
* $Id: output.h,v 1.1 2003/04/30 23:58:56 hartman Exp $
* $Id: output.h,v 1.2 2003/07/20 19:48:30 hartman Exp $
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr>
......@@ -55,6 +55,8 @@
IBOutlet id o_transcode_audio_bitrate;
IBOutlet id o_transcode_audio_bitrate_lbl;
IBOutlet id o_transcode_audio_channels;
IBOutlet id o_transcode_audio_channels_lbl;
IBOutlet id o_transcode_audio_chkbox;
IBOutlet id o_transcode_audio_selector;
IBOutlet id o_transcode_lbl;
......@@ -63,6 +65,10 @@
IBOutlet id o_transcode_video_chkbox;
IBOutlet id o_transcode_video_selector;
IBOutlet id o_misc_lbl;
IBOutlet id o_sap_chkbox;
IBOutlet id o_sap_name;
NSString *o_mrl;
NSString *o_transcode;
}
......@@ -81,5 +87,5 @@
- (IBAction)outputFileBrowse:(id)sender;
- (void)transcodeChanged:(NSNotification *)o_notification;
- (void)transcodeInfoChanged:(NSNotification *)o_notification;
- (IBAction)sapChanged:(id)sender;
@end
modules/gui/macosx/output.m
View file @ ebd0d973
......@@ -2,7 +2,7 @@
* output.m: MacOS X Output Dialog
*****************************************************************************
* Copyright (C) 2002-2003 VideoLAN
* $Id: output.m,v 1.9 2003/06/22 15:30:22 hartman Exp $
* $Id: output.m,v 1.10 2003/07/20 19:48:30 hartman Exp $
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr>
......@@ -105,6 +105,14 @@
selector: @selector(transcodeInfoChanged:)
name: NSControlTextDidChangeNotification
object: o_transcode_audio_bitrate];
[[NSNotificationCenter defaultCenter] addObserver: self
selector: @selector(transcodeInfoChanged:)
name: NSControlTextDidChangeNotification
object: o_transcode_audio_channels];
[[NSNotificationCenter defaultCenter] addObserver: self
selector: @selector(transcodeInfoChanged:)
name: NSControlTextDidChangeNotification
object: o_sap_name];
[o_mux_selector setAutoenablesItems: NO];
[self transcodeChanged:nil];
......@@ -112,9 +120,14 @@
- (void)initStrings
{
NSArray *o_a_bitrates = [NSArray arrayWithObjects:@"96", @"128", @"192", @"256", @"512", nil];
NSArray *o_a_channels = [NSArray arrayWithObjects: @"1", @"2", @"4", @"6", nil];
NSArray *o_a_bitrates = [NSArray arrayWithObjects: @"96", @"128", @"192", @"256", @"512", nil];
NSArray *o_v_bitrates = [NSArray arrayWithObjects:
@"100", @"150", @"200", @"400", @"500", @"500", @"750", @"1000", @"2000", @"3000", nil];
@"100", @"150", @"200", @"400", @"500", @"750", @"1000", @"2000", @"3000", nil];
NSArray *o_a_codecs = [NSArray arrayWithObjects:
@"mpga", @"mp3 ", @"a52 ", @"vorb", nil];
NSArray *o_v_codecs = [NSArray arrayWithObjects:
@"mpgv", @"mp4v", @"DIV1", @"DIV2", @"DIV3", @"H263", @"I263", @"WMV1", @"WMV2", @"MJPG", nil];
[o_output_ckbox setTitle: _NS("Advanced output:")];
[o_output_settings setTitle: _NS("Settings...")];
......@@ -136,27 +149,30 @@
[o_mux_lbl setStringValue: _NS("Encapsulation Method")];
[[o_mux_selector itemAtIndex: 0] setTitle: _NS("MPEG TS")];
[[o_mux_selector itemAtIndex: 1] setTitle: _NS("MPEG PS")];
[[o_mux_selector itemAtIndex: 2] setTitle: _NS("AVI")];
[[o_mux_selector itemAtIndex: 3] setTitle: _NS("Ogg")];
//[[o_mux_selector itemAtIndex: 4] setTitle: _NS("mp4")];
[[o_mux_selector itemAtIndex: 1] setTitle: _NS("MPEG1")];
[[o_mux_selector itemAtIndex: 3] setTitle: _NS("AVI")];
[[o_mux_selector itemAtIndex: 4] setTitle: _NS("Ogg")];
//[[o_mux_selector itemAtIndex: 5] setTitle: _NS("mp4")];
[o_transcode_lbl setTitle: _NS("Transcode options")];
[o_transcode_video_chkbox setTitle: _NS("Video")];
[[o_transcode_video_selector itemAtIndex: 0] setTitle: @"mpgv"];
[[o_transcode_video_selector itemAtIndex: 1] setTitle: @"mp4v"];
[[o_transcode_video_selector itemAtIndex: 2] setTitle: @"DIV1"];
[[o_transcode_video_selector itemAtIndex: 3] setTitle: @"DIV2"];
[[o_transcode_video_selector itemAtIndex: 4] setTitle: @"DIV3"];
[[o_transcode_video_selector itemAtIndex: 5] setTitle: @"H263"];
[[o_transcode_video_selector itemAtIndex: 6] setTitle: @"I263"];
[[o_transcode_video_selector itemAtIndex: 7] setTitle: @"WMV1"];
[o_transcode_video_selector removeAllItems];
[o_transcode_video_selector addItemsWithTitles: o_v_codecs];
[o_transcode_video_bitrate_lbl setStringValue: _NS("Bitrate (kb/s)")];
[o_transcode_video_bitrate removeAllItems];
[o_transcode_video_bitrate addItemsWithObjectValues: o_v_bitrates];
[o_transcode_audio_chkbox setTitle: _NS("Audio")];
[[o_transcode_audio_selector itemAtIndex: 0] setTitle: @"mpga"];
[[o_transcode_audio_selector itemAtIndex: 1] setTitle: @"a52 "];
[o_transcode_audio_selector removeAllItems];
[o_transcode_audio_selector addItemsWithTitles: o_a_codecs];
[o_transcode_audio_bitrate_lbl setStringValue: _NS("Bitrate (kb/s)")];
[o_transcode_audio_bitrate removeAllItems];
[o_transcode_audio_bitrate addItemsWithObjectValues: o_a_bitrates];
[o_transcode_audio_channels_lbl setStringValue: _NS("Channels")];
[o_transcode_audio_channels removeAllItems];
[o_transcode_audio_channels addItemsWithObjectValues: o_a_channels];
[o_misc_lbl setTitle: _NS("Miscellaneous Options")];
[o_sap_chkbox setTitle: _NS("Announce streams via SAP Channel:")];
}
- (IBAction)outputChanged:(id)sender;
......@@ -194,9 +210,11 @@
- (void)outputMethodChanged:(NSNotification *)o_notification
{
NSString *o_mode;
o_mode = [[o_method selectedCell] title];
[o_sap_chkbox setEnabled: NO];
[o_sap_name setEnabled: NO];
if( [o_mode isEqualToString: _NS("File")] )
{
[o_file_field setEnabled: YES];
......@@ -211,7 +229,8 @@
[[o_mux_selector itemAtIndex: 1] setEnabled: YES];
[[o_mux_selector itemAtIndex: 2] setEnabled: YES];
[[o_mux_selector itemAtIndex: 3] setEnabled: YES];
//[[o_mux_selector itemAtIndex: 4] setEnabled: YES];
[[o_mux_selector itemAtIndex: 4] setEnabled: YES];
//[[o_mux_selector itemAtIndex: 5] setEnabled: YES];
}
else if( [o_mode isEqualToString: _NS("Stream")] )
{
......@@ -230,9 +249,10 @@
[o_stream_ttl setEnabled: NO];
[o_stream_ttl_stp setEnabled: NO];
[[o_mux_selector itemAtIndex: 1] setEnabled: YES];
[[o_mux_selector itemAtIndex: 2] setEnabled: NO];
[[o_mux_selector itemAtIndex: 3] setEnabled: YES];
//[[o_mux_selector itemAtIndex: 4] setEnabled: NO];
[[o_mux_selector itemAtIndex: 2] setEnabled: YES];
[[o_mux_selector itemAtIndex: 3] setEnabled: NO];
[[o_mux_selector itemAtIndex: 4] setEnabled: YES];
//[[o_mux_selector itemAtIndex: 5] setEnabled: NO];
}
else if( [o_mode isEqualToString: _NS("UDP")] )
{
......@@ -242,7 +262,10 @@
[[o_mux_selector itemAtIndex: 1] setEnabled: NO];
[[o_mux_selector itemAtIndex: 2] setEnabled: NO];
[[o_mux_selector itemAtIndex: 3] setEnabled: NO];
//[[o_mux_selector itemAtIndex: 4] setEnabled: NO];
[[o_mux_selector itemAtIndex: 4] setEnabled: NO];
//[[o_mux_selector itemAtIndex: 5] setEnabled: NO];
[o_sap_chkbox setEnabled: YES];
[o_sap_name setEnabled: YES];
}
else if( [o_mode isEqualToString: _NS("RTP")] )
{
......@@ -252,7 +275,8 @@
[[o_mux_selector itemAtIndex: 1] setEnabled: NO];
[[o_mux_selector itemAtIndex: 2] setEnabled: NO];
[[o_mux_selector itemAtIndex: 3] setEnabled: NO];
//[[o_mux_selector itemAtIndex: 4] setEnabled: NO];
[[o_mux_selector itemAtIndex: 4] setEnabled: NO];
//[[o_mux_selector itemAtIndex: 5] setEnabled: NO];
}
}
if( ![[o_mux_selector selectedItem] isEnabled] )
......@@ -264,7 +288,7 @@
- (void)outputInfoChanged:(NSNotification *)o_notification
{
NSString *o_mode, *o_mux, *o_mux_string;
NSString *o_mode, *o_mux, *o_mux_string, *o_sap;
NSMutableString *o_mrl_string = [NSMutableString stringWithString:@"#"];
[o_mrl_string appendString: o_transcode];
......@@ -280,6 +304,7 @@
else if ( [o_mux isEqualToString: _NS("Ogg")] ) o_mux_string = @"ogg";
else if ( [o_mux isEqualToString: _NS("MPEG PS")] ) o_mux_string = @"ps";
else if ( [o_mux isEqualToString: _NS("mp4")] ) o_mux_string = @"mp4";
else if ( [o_mux isEqualToString: _NS("MPEG1")] ) o_mux_string = @"mpeg1";
else o_mux_string = @"ts";
if( [o_mode isEqualToString: _NS("File")] )
......@@ -291,17 +316,27 @@
else if( [o_mode isEqualToString: _NS("Stream")] )
{
o_mode = [o_stream_type titleOfSelectedItem];
o_sap = @"";
if ( [o_mode isEqualToString: _NS("HTTP")] ) o_mode = @"http";
if ( [o_mode isEqualToString: _NS("HTTP")] )
o_mode = @"http";
else if ( [o_mode isEqualToString: _NS("UDP")] )
{
o_mode = @"udp";
if( [o_sap_chkbox state] == NSOnState )
{
o_sap = @",sap";
if ( ![[o_sap_name stringValue] isEqualToString: @""] )
o_sap = [NSString stringWithFormat:@",sap=%@", [o_sap_name stringValue]];
}
}
else if ( [o_mode isEqualToString: _NS("RTP")] )
o_mode = @"rtp";
[o_mrl_string appendFormat:
@"std{access=%@,mux=%@,url=\"%@:%@\"}",
@"std{access=%@,mux=%@,url=\"%@:%@\"%@}",
o_mode, o_mux_string, [o_stream_address stringValue],
[o_stream_port stringValue]];
[o_stream_port stringValue], o_sap];
}
if( [o_display state] == NSOnState )
{
......@@ -322,6 +357,8 @@
NSString *o_mux_string;
if ( [[o_mux_selector titleOfSelectedItem] isEqualToString: _NS("MPEG PS")] )
o_mux_string = @"vob";
else if ( [[o_mux_selector titleOfSelectedItem] isEqualToString: _NS("MPEG1")] )
o_mux_string = @"mpg";
else if ( [[o_mux_selector titleOfSelectedItem] isEqualToString: _NS("AVI")] )
o_mux_string = @"avi";
else if ( [[o_mux_selector titleOfSelectedItem] isEqualToString: _NS("Ogg")] )
......@@ -374,11 +411,13 @@
{
[o_transcode_audio_selector setEnabled: YES];
[o_transcode_audio_bitrate setEnabled: YES];
[o_transcode_audio_channels setEnabled: YES];
}
else
{
[o_transcode_audio_selector setEnabled: NO];
[o_transcode_audio_bitrate setEnabled: NO];
[o_transcode_audio_channels setEnabled: NO];
}
[self transcodeInfoChanged:nil];
......@@ -418,4 +457,12 @@
[self outputInfoChanged:nil];
}
- (IBAction)sapChanged:(id)sender
{
[o_sap_name setEnabled: [o_sap_chkbox state]];
[self outputInfoChanged: nil];
}
@end
share/vlc_win32_rc.rc
View file @ ebd0d973
......@@ -18,7 +18,7 @@ BEGIN
BEGIN
VALUE "CompanyName", "VideoLAN"
VALUE "FileVersion", "VERSION"
VALUE "FileDescription", "An Opensource Media Player"
VALUE "FileDescription", "VLC media player"
VALUE "LegalCopyright", "(c) 1996-2003 VideoLAN"
END
END
......
src/libvlc.h
View file @ ebd0d973
......@@ -2,7 +2,7 @@
* libvlc.h: main libvlc header
*****************************************************************************
* Copyright (C) 1998-2002 VideoLAN
* $Id: libvlc.h,v 1.76 2003/07/18 20:52:10 gbazin Exp $
* $Id: libvlc.h,v 1.77 2003/07/20 19:48:30 hartman Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -25,9 +25,10 @@
#define Nothing here, this is just to prevent update-po from being stupid
static char *ppsz_sout_acodec[] = { "", "mpga", "a52", NULL };
static char *ppsz_sout_acodec[] = { "", "mpga", "mp3", "vorb", "a52", NULL };
static char *ppsz_sout_vcodec[] = { "", "mpgv", "mp4v", "DIV1", "DIV2",
"DIV3", "h263", "i263", "WMV1", NULL };
"DIV3", "h263", "i263", "WMV1", "WMV2",
"MJPG", NULL };
static char *ppsz_language[] = { "auto", "en", "en_GB", "de", "fr", "it",
"ja", "nl", "no", "pl", "ru", "sv", NULL };
......
vlc.ebuild
View file @ ebd0d973
......@@ -2,7 +2,7 @@
# vlc.ebuild: A Gentoo ebuild for vlc
###############################################################################
# Copyright (C) 2003 VideoLAN
# $Id: vlc.ebuild,v 1.15 2003/07/19 00:02:35 hartman Exp $
# $Id: vlc.ebuild,v 1.16 2003/07/20 19:48:30 hartman Exp $
#
# Authors: Derk-Jan Hartman <thedj at users.sf.net>
#
......@@ -25,7 +25,7 @@
# Thanks to the Gentoo Team for supporting us.
###############################################################################
IUSE="arts qt ncurses dvd gtk nls 3dfx matrox svga fbcon esd kde X alsa ggi oggvorbis gnome xv oss sdl fbcon aalib slp truetype v4l lirc wxwindows imlib matroska dvb pvr mozilla mad debug"
IUSE="arts qt ncurses dvd gtk nls 3dfx matrox svga fbcon esd kde X alsa ggi oggvorbis gnome xv oss sdl fbcon aalib slp truetype v4l lirc wxwindows imlib matroska dvb pvr mozilla mad debug xvid"
# Change these to correspond with the
# unpacked dirnames of the CVS snapshots.
......@@ -45,7 +45,7 @@ HOMEPAGE="http://www.videolan.org/vlc"
SLOT="0"
LICENSE="GPL-2"
KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa"
KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~amd64"
DEPEND="X? ( virtual/x11 )
aalib? ( >=media-libs/aalib-1.4_rc4-r2 )
......@@ -75,6 +75,7 @@ DEPEND="X? ( virtual/x11 )
slp? ( >=net-libs/openslp-1.0.10 )
truetype? ( >=media-libs/freetype-2.1.4 )
wxwindows? ( >=x11-libs/wxGTK-2.4.1 )
xvid? ( >=media-libs/xvid-0.9.1 )
>=media-sound/lame-3.93.1
>=media-libs/libdvbpsi-0.1.2
>=media-libs/faad2-1.1
......@@ -212,16 +213,15 @@ src_compile(){
use mad && myconf="${myconf} --enable-mad"
use truetype && myconf="${myconf} --enable-freetype"
# xvid is a local USE var, see /usr/portage/profiles/use.local.desc for more details
use xvid && myconf="${myconf} --enable-xvid"
use truetype && myconf="${myconf} --enable-freetype"
# v4l is a local USE var, see /usr/portage/profiles/use.local.desc for more details
use v4l && myconf="${myconf} --enable-v4l"
# wxwindows is a local USE var. already enabled by default, but depends on wxGTK
# but if we use wxwindows and imlib, then we can also use skins
# If we use wxwindows and imlib, then we can also use skins
(use imlib && use wxwindows) && myconf="${myconf} --enable-skins"
# matroska is a local USE var.
......@@ -271,7 +271,8 @@ src_compile(){
# parallel make doesn't work with our complicated makefile
# this is also the reason as why you shouldn't run autoconf
# or automake yourself. (or bootstrap for that matter)
make || die "make of VLC failed"
MAKEOPTS="${MAKEOPTS} -j1
emake || die "make of VLC failed"
}
src_install() {
......@@ -279,6 +280,6 @@ src_install() {
einstall || die "make install failed"
dodoc ABOUT-NLS AUTHORS COPYING ChangeLog HACKING INSTALL* \
MAINTAINERS NEWS README* MODULES THANKS doc/ChangeLog-*
MAINTAINERS NEWS README* THANKS doc/ChangeLog-*
}
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