Skip to content

V
vlc-gpu
Commit 3ad76f44 authored by Sam Hocevar's avatar Sam Hocevar
Browse files
Options 

  * BeOS icon and MIME resources courtesy of Wade Majors <guru@startrek.com>.
  * Updated icons.
  * Removed redefinition of NULL in src/audio_decoder/adec_layer?.c.
  * Created darwin_specific.c to store the program path at boot time.
    (XXX: check that it didn't break the OS X port)
  * Fixed a warning in netutils.c.
parent 4a286029
Expand all Show whitespace changes
Inline Side-by-side
Showing with 2118 additions and 1594 deletions
AUTHORS
View file @ 3ad76f44
......@@ -2,11 +2,12 @@
#
# Authors and contributors are listed alphabetically.
#
# The fields are: name (N), email (E), web-address (W), PGP key ID and
# fingerprint (P), description (D), and snail-mail address (S).
# The fields are: name (N), email (E), web-address (W), CVS account login (C),
# PGP key ID and fingerprint (P), description (D), and snail-mail address (S).
N: Pierre Baillet
E: oct@zoy.org
C: octplane
D: SDL audio and video output
N: Ethan C. Baldridge
......@@ -15,19 +16,23 @@ D: directory browsing code in modules.c
N: Stphane Borel
E: stef@via.ecp.fr
C: stef
D: MPEG video decoder
D: DVD input, IFO parsing, CSS decryption
N: Arnaud de Bossoreille de Ribou
E: bozo@via.ecp.fr
C: bozo
D: SDL video output
N: Tony Castley
E: tcastley@mail.powerup.com.au
C: tcastley
D: BeOS interface
N: Renaud Dartus
E: reno@via.ecp.fr
C: reno
D: AC3 decoder
N: Nilmoni Deb
......@@ -36,24 +41,29 @@ D: Minor configure.in and Makefile.in fixes
N: Colin Delacroix
E: colin@zoy.org
C: colin
D: MacOS X sound support
N: Jean-Marc Dressler
E: polux@via.ecp.fr
C: polux
D: BeOS port
D: MPEG video decoder
N: Rgis Duchesne
E: regis@via.ecp.fr
C: regis
N: Henri Fallon
E: henri@via.ecp.fr
C: henri
D: ALSA audio output
D: input netlist
D: MPEG TS input
N: Jean-Philippe Grimaldi
E: jeanphi@via.ecp.fr
C: jeanphi
D: Bug fixes
N: Shane Harper
......@@ -64,30 +74,36 @@ D: Gnome and Gtk+ interface enhancements
N: Gal Hendryckx
E: jimmy@via.ecp.fr
C: jimmy
D: IDCT and YUV transformations
N: Samuel Hocevar
E: sam@zoy.org
C: sam
D: playlist and modules system
D: Gnome and Gtk+ interfaces, Glide and fb video outputs, Esound audio output
D: DVD subtitles decoder
N: Eugenio Jarosiewicz
E: ej0@cise.ufl.edu
C: ej
D: MacOS X interface and fixes
N: Brieuc Jeunhomme
E: bbp@via.ecp.fr
C: bbp
D: Bug fixes
N: Michel Kaempf
E: maxx@via.ecp.fr
C: maxx
D: audio output
D: AC3 decoder
D: MPEG audio decoder
N: Andres Krapf
E: dae@via.ecp.fr
C: dae
D: FreeBSD port and tests
N: Markus Kuespert
......@@ -96,12 +112,18 @@ D: BeOS port of the DVD ioctls
N: Michel Lespinasse
E: walken@zoy.org
C: walken
D: AC3 decoder
D: MPEG audio decoder
D: MPEG video decoder
N: Wade Majors
E: guru@startrek.com
D: BeOS testing and icon integration
N: Christophe Massiot
E: massiot@via.ecp.fr
C: massiot
D: MPEG PS input
D: bitstream and input core functions
D: MPEG video decoder
......@@ -112,9 +134,11 @@ D: Makefile and configure patches
N: Olivier Pomel
E: pomel@via.ecp.fr
C: pomel
N: Vincent Seguin
E: seguin@via.ecp.fr
C: seguin
D: core vlc structure
D: interface and message queue
D: YUV transformations
......@@ -122,10 +146,12 @@ D: X11 and GGI video outputs
N: Richard Shepherd
E: richard@rshepherd.demon.co.uk
C: richards
D: BeOS video output (BBitmap and Overlay)
N: Benoit Steiner
E: benny@via.ecp.fr
C: benny
D: MPEG system input
D: network input
Makefile.in
View file @ 3ad76f44
......@@ -281,12 +281,16 @@ C_OBJ = $(INTERFACE) \
#
# CPP Objects
# Misc Objects
#
ifeq ($(SYS),beos)
CPP_OBJ = src/misc/beos_specific.o
endif
ifneq (,$(findstring darwin,$(SYS)))
C_OBJ += src/misc/darwin_specific.o
endif
#
# Assembler Objects
#
......@@ -561,9 +565,9 @@ snapshot:
changelog changelog-css rules rules-css vlc.dirs \
vlc.menu ; do \
cp debian/$$file /tmp/vlc-@VLC_VERSION@/debian/ ; done
for file in default8x16.psf default8x9.psf ; do \
for file in default8x16.psf default8x9.psf vlc_beos.rsrc ; do \
cp share/$$file /tmp/vlc-@VLC_VERSION@/share/ ; done
for icon in vlc gvlc qvlc gnome-vlc ; do \
for icon in vlc gvlc qvlc gnome-vlc kvlc ; do \
cp share/$$icon.xpm share/$$icon.png \
/tmp/vlc-@VLC_VERSION@/share/ ; done
......@@ -683,6 +687,8 @@ vlc: $(C_OBJ) $(CPP_OBJ) $(ASM_OBJ)
ifeq ($(SYS),beos)
rm -f ./plugins/_APP_
ln -s ../vlc ./plugins/_APP_
xres -o $@ ./share/vlc_beos.rsrc
mimeset -f $@
endif
vlc.app:
......
include/beos_specific.h
View file @ 3ad76f44
/*****************************************************************************
* beos_init.h: Initialization for BeOS specific features
* beos_specific.h: BeOS specific features
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: beos_specific.h,v 1.4 2001/03/21 13:42:33 sam Exp $
* $Id: beos_specific.h,v 1.5 2001/04/12 01:52:45 sam Exp $
*
* Authors: Jean-Marc Dressler <polux@via.ecp.fr>
*
......@@ -29,9 +29,9 @@
extern "C" {
#endif
void beos_Create( void );
void beos_Destroy( void );
char * beos_GetProgramPath( void );
void system_Create ( int *pi_argc, char *ppsz_argv[], char *ppsz_env[] );
void system_Destroy( void );
char * system_GetProgramPath( void );
#ifdef __cplusplus
}
......
include/darwin_specific.h 0 → 100644
View file @ 3ad76f44
/*****************************************************************************
* darwin_specific.h: Darwin specific features
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: darwin_specific.h,v 1.1 2001/04/12 01:52:45 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
/*****************************************************************************
* Prototypes
*****************************************************************************/
void system_Create ( int *pi_argc, char *ppsz_argv[], char *ppsz_env[] );
void system_Destroy( void );
char * system_GetProgramPath( void );
share/gnome-vlc.png
View replaced file @ 4a286029 View file @ 3ad76f44
share/gnome-vlc.png

2.74 KB | W: | H:

share/gnome-vlc.png

3.2 KB | W: | H:

share/gnome-vlc.png
share/gnome-vlc.png
share/gnome-vlc.png
share/gnome-vlc.png
  • 2-up
  • Swipe
  • Onion skin
share/gnome-vlc.xpm
View file @ 3ad76f44
This diff is collapsed.
share/gvlc.png
View replaced file @ 4a286029 View file @ 3ad76f44
share/gvlc.png

2.91 KB | W: | H:

share/gvlc.png

2.92 KB | W: | H:

share/gvlc.png
share/gvlc.png
share/gvlc.png
share/gvlc.png
  • 2-up
  • Swipe
  • Onion skin
share/gvlc.xpm
View file @ 3ad76f44
This diff is collapsed.
share/kvlc.png
View replaced file @ 4a286029 View file @ 3ad76f44
share/kvlc.png

1.63 KB | W: | H:

share/kvlc.png

2.37 KB | W: | H:

share/kvlc.png
share/kvlc.png
share/kvlc.png
share/kvlc.png
  • 2-up
  • Swipe
  • Onion skin
share/kvlc.xpm
View file @ 3ad76f44
This diff is collapsed.
share/qvlc.png
View replaced file @ 4a286029 View file @ 3ad76f44
share/qvlc.png

969 Bytes | W: | H:

share/qvlc.png

1.19 KB | W: | H:

share/qvlc.png
share/qvlc.png
share/qvlc.png
share/qvlc.png
  • 2-up
  • Swipe
  • Onion skin
share/qvlc.xpm
View file @ 3ad76f44
/* XPM */
static char * qvlc_xpm[] = {
"48 48 32 1",
"48 48 147 2",
" c None",
". c #000000",
"+ c #FF8C02",
"@ c #FE9B24",
"# c #FE8F08",
"$ c #FE981D",
"% c #FEDAAF",
"& c #FEDDB6",
"* c #FEAB48",
"= c #FE9F2C",
"- c #FED19B",
"; c #FEEDD9",
"> c #FEF9F5",
", c #FEEDDA",
"' c #FEEAD3",
") c #FEF6EE",
"! c #FEFAF6",
"~ c #FEFEFE",
"{ c #FEFDFD",
"] c #FEEAD2",
"^ c #FEFDFC",
"/ c #FECE94",
"( c #FE9C25",
"_ c #FE9E2B",
": c #0000D2",
"< c #0101D2",
"[ c #FEA840",
"} c #0606D1",
"| c #0C0CD4",
"1 c #FD8B03",
"2 c #0B0BD4",
"3 c #0A0AD4",
"+ c #FF8C00",
"@ c #FF981E",
"# c #FF9F2E",
"$ c #FFAB4A",
"% c #FFBF7B",
"& c #FFA946",
"* c #FFB056",
"= c #FFB766",
"- c #FFBE77",
"; c #FFA741",
"> c #FFAE51",
", c #FFB562",
"' c #FFBC72",
") c #FFA53C",
"! c #FFAC4D",
"~ c #FFB35D",
"{ c #FFBA6D",
"] c #FF9C27",
"^ c #FFA338",
"/ c #FFAA48",
"( c #FFB158",
"_ c #FFB869",
": c #FFBF79",
"< c #F9A23B",
"[ c #F9A849",
"} c #FDA947",
"| c #FFAF54",
"1 c #FFB664",
"2 c #FFBD74",
"3 c #FFC07E",
"4 c #FFC689",
"5 c #E2C29C",
"6 c #E1C6A6",
"7 c #F3B369",
"8 c #FAB667",
"9 c #FCBE77",
"0 c #FFC688",
"a c #FFD09F",
"b c #FFE5CB",
"c c #DBCCBA",
"d c #D7D3CF",
"e c #DBCEBF",
"f c #E7D9C9",
"g c #F3E6D7",
"h c #FFF3E6",
"i c #FFF5EC",
"j c #FFFAF6",
"k c #FFECD9",
"l c #E1C19A",
"m c #D6D6D6",
"n c #D6D5D5",
"o c #E3E2E2",
"p c #F1F0F0",
"q c #FFFEFE",
"r c #FFF3E8",
"s c #DDC9B1",
"t c #D6D5D4",
"u c #E3E3E3",
"v c #F1F1F1",
"w c #FFFFFF",
"x c #FFF5EB",
"y c #E2BF93",
"z c #DBCBB8",
"A c #D7D4D0",
"B c #FFFCFA",
"C c #FFE4C7",
"D c #F9961E",
"E c #F3A240",
"F c #E1C3A0",
"G c #DDCBB7",
"H c #E7D8C6",
"I c #F3E5D4",
"J c #FFF1E2",
"K c #FFF2E5",
"L c #FFC78D",
"M c #FD8E07",
"N c #F99C2C",
"O c #F8A340",
"P c #FAAC50",
"Q c #FCB460",
"R c #FFBC70",
"S c #FFC27D",
"T c #FFC687",
"U c #FF910E",
"V c #FFA63F",
"W c #FFAD4F",
"X c #FFB45F",
"Y c #FFBB70",
"Z c #FF8F09",
"` c #FF9619",
" . c #FF9D2A",
".. c #FFA43A",
"+. c #FFB25B",
"@. c #FFB96B",
"#. c #FF8D04",
"$. c #FF9415",
"%. c #FF9B25",
"&. c #FFA235",
"*. c #F9961D",
"=. c #FD8E05",
"-. c #FF9210",
";. c #FF9920",
">. c #FFA031",
",. c #0000D2",
"'. c #E1C199",
"). c #F3A03B",
"!. c #F89824",
"~. c #FD9110",
"{. c #FF971C",
"]. c #FF9E2C",
"^. c #FFBB71",
"/. c #FFC88D",
"(. c #0101D2",
"_. c #D7D3CE",
":. c #DBCBB7",
"<. c #FAA239",
"[. c #FCAA49",
"}. c #FFB259",
"|. c #FFB866",
"1. c #FFBE74",
"2. c #FFCB92",
"3. c #DCC9B1",
"4. c #E7D5BF",
"5. c #F3E2CE",
"6. c #FFEFDC",
"7. c #FFF0DF",
"8. c #E6B882",
"9. c #D8D1C8",
"0. c #0606D3",
"a. c #0C0CD4",
"b. c #F49E34",
"c. c #F89823",
"d. c #E7D4BC",
"e. c #F3E0CB",
"f. c #FFEDD9",
"g. c #FFEEDC",
"h. c #FA9A26",
"i. c #FCA031",
"j. c #FFA842",
"k. c #FFAE4F",
"l. c #FF8E07",
"m. c #FF9517",
"n. c #FF8C02",
"o. c #FF9312",
"p. c #FF9A23",
" ",
" ",
" ",
" ",
" .... ",
" .++++. ",
" ..+++.. ",
" .+...+. ",
" .++++++. ",
" .++++++. ",
" .++++++. ",
" .++++++++. ",
" .@@#+++#$. ",
" .%&*===*-. ",
" .;>,''',)&. ",
" .&!~{{{{{{]. ",
" .]^~~~~~~{;. ",
" .%;!{{{{{!]/. ",
" .(*&]''']&*@. ",
" .++#@_===_@#+. ",
" .+++++++++++++. ",
" .+++++++++++++. ",
" .+++++++++++++. ",
" .@@#++++++++++#$. ....... ",
" .%&*=@#+++++#(*-...:::::::.. ",
" .]>,]&*=====*&;).::::::::::<. ",
" .'{{{!,''''',!{.:::<.....::::. ",
" .,{~~~{{{{{{{~.:::.. ..:::. ",
" .-){{{~~~~~~~~{.::.. . .::. ",
" .[&]',!{{{{{{!.::}.. .:. .::|. ",
" .#@_=*&]'''']&.::.+. .:::. .::. ",
" .++++#@_====_@.::.++. .:::. .::. ",
" .++++++++++++++.::.++..:::. .::. ",
" ..++++++++++++++.::.++.:::::. .::. ",
" ..+.++++++++++++++.::.+.:::.:::. .::. ",
" .+++.++++++++++++++.:::.+.:.+.:::.::. ",
" .+++++++.++++++++++++.::.+1.+++.:::::. ",
" ..+++++++...+++++++++.:::..+++. .:::. ",
" ....++++++.........+.::::.....:::::. ",
" ...++++++++++++++.::::::::::.::2. ",
" ....++++++++++...::::::.. .3. ",
" ....++++.. ...... . ",
" .... ",
" . . . . ",
" . + @ # # . ",
" . . + @ # . . ",
" . $ . . . % . ",
" . & * = - % % . ",
" . ; > , ' % % . ",
" . ) ! ~ { % % . ",
" . ] ^ / ( _ : % % . ",
" . < [ } | 1 2 3 4 . ",
" . 5 6 7 8 9 0 a b . ",
" . c d e f g h i j k . ",
" . l d m n o p q q q r . ",
" . s t m m u v w w q x . ",
" . y z A n o p q q B r C . ",
" . D E F G H I J K k a L . ",
" . + + M N O P Q R S T 3 % . ",
" . + + + U @ # V W X Y % % % . ",
" . + + + Z ` ...$ +.@.% % % . ",
" . + + + #.$.%.&.& * = - % % . . . . . . . . . ",
" . *.*.=.+ + -.;.>.; > , ' % 3 . . ,.,.,.,.,.,.,.,.. . ",
" . y '.).!.*.~.{.].) ! ~ ^./.. ,.,.,.,.,.,.,.,.,.,.,.(.. ",
" . s _.:.s '.E <.[.}.|.1.2.. ,.,.,.(.,.,.,.,.,.,.,.,.,.,.. ",
" . 3.n n n d z 4.5.6.7.J . ,.,.,.,.,.. . . . . . ,.,.,.,.,.. ",
" . :.n m m m n o p q q q . ,.,.,.. . . . . ,.,.,.. ",
" . 8.9.n n n m m u v w w . ,.,.0.,.. C . . ,.. . ,.,.,.a.. ",
" . b.'.s 3.:.d n o p q q . ,.,.,.. a L . . ,.,.,.. . ,.,.,.. ",
" . =.*.c.!.).'.s d.e.f.g.. ,.,.,.. 3 % . ,.,.,.,.,.. . ,.,.,.. ",
" . + + + + =.*.c.h.i.j.k.. ,.,.,.. % . ,.,.,.,.,.. . ,.,.,.. ",
" . + + + + + + + + + l.m.] . ,.,.,.. . ,.,.,.,.,.,.,.. . ,.,.,.. ",
" . . + + + + + + + + + n.o.p.. ,.,.,.. % . ,.,.,.,.,.,.,.. ,.,.,.,.. ",
" . . + . + + + + + + + + + + U @ . ,.,.,.. % % . ,.. ,.,.,.,.,.,.,.,.,.. ",
" . + + + . + + + + + + + + + + Z ` . ,.,.,.,.. % X . . . ,.,.,.,.,.,.,.. ",
" . + + + + + + + . + + + + + + + #.$.%.. ,.,.,.. . + + + + . ,.,.,.,.,.. ",
" . . + + + + + + + . . . + + + + + -.;.. ,.,.,.,.,.. . . . ,.,.,.,.,.,.,.. ",
" . . . . + + + + + + . . . . . . . . . ,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.. ",
" . . . + + + + + + + + + + + + . ,.,.,.,.,.,.,.,.,.,.. ,.,.,.,.,.. ",
" . . . . + + + + + + + + + . . ,.,.,.,.,.,.,.. . ,.,.,.. ",
" . . . . + + + + . . . . . . . . . . ,.. ",
" . . . . . ",
" ",
" ",
" ",
......
share/vlc-icons.xcf
View file @ 3ad76f44
No preview for this file type
share/vlc.png
View replaced file @ 4a286029 View file @ 3ad76f44
share/vlc.png

2.04 KB | W: | H:

share/vlc.png

1.99 KB | W: | H:

share/vlc.png
share/vlc.png
share/vlc.png
share/vlc.png
  • 2-up
  • Swipe
  • Onion skin
share/vlc.xpm
View file @ 3ad76f44
This diff is collapsed.
src/audio_decoder/adec_layer1.c
View file @ 3ad76f44
......@@ -2,7 +2,7 @@
* adec_layer1.c: MPEG Layer I audio decoder
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: adec_layer1.c,v 1.4 2001/04/06 09:15:47 sam Exp $
* $Id: adec_layer1.c,v 1.5 2001/04/12 01:52:45 sam Exp $
*
* Authors: Michel Kaempf <maxx@via.ecp.fr>
* Michel Lespinasse <walken@via.ecp.fr>
......@@ -45,8 +45,6 @@
#include "audio_decoder.h"
#include "adec_math.h" /* DCT32(), PCM() */
#define NULL ((void *)0)
/**** wkn ****/
static float adec_scalefactor_table[64] =
......
src/audio_decoder/adec_layer2.c
View file @ 3ad76f44
......@@ -2,7 +2,7 @@
* adec_layer2.c: MPEG Layer II audio decoder
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: adec_layer2.c,v 1.4 2001/04/06 09:15:47 sam Exp $
* $Id: adec_layer2.c,v 1.5 2001/04/12 01:52:45 sam Exp $
*
* Authors: Michel Kaempf <maxx@via.ecp.fr>
* Michel Lespinasse <walken@via.ecp.fr>
......@@ -45,8 +45,6 @@
#include "audio_decoder.h"
#include "adec_math.h" /* DCT32(), PCM() */
#define NULL ((void *)0)
/**** wkn ****/
static float adec_scalefactor_table[64] =
......
src/interface/main.c
View file @ 3ad76f44
......@@ -4,7 +4,7 @@
* and spawn threads.
*****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN
* $Id: main.c,v 1.84 2001/04/11 14:10:49 ej Exp $
* $Id: main.c,v 1.85 2001/04/12 01:52:45 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -41,10 +41,10 @@
#endif
#ifdef SYS_DARWIN1_3
#include <mach/mach.h> /* Altivec detection */
#include <mach/mach_error.h> /* some day the header files||compiler *
# include <mach/mach.h> /* Altivec detection */
# include <mach/mach_error.h> /* some day the header files||compiler *
will define it for us */
#include <mach/bootstrap.h>
# include <mach/bootstrap.h>
#endif
#include <unistd.h>
......@@ -73,7 +73,11 @@
#include "video_output.h"
#ifdef SYS_BEOS
#include "beos_specific.h"
# include "beos_specific.h"
#endif
#ifdef SYS_DARWIN1_3
# include "darwin_specific.h"
#endif
#include "netutils.h" /* network_ChannelJoin */
......@@ -182,7 +186,7 @@ main_t *p_main;
/*****************************************************************************
* Local prototypes
*****************************************************************************/
static int GetConfiguration ( int *i_argc, char *ppsz_argv[],
static int GetConfiguration ( int *pi_argc, char *ppsz_argv[],
char *ppsz_env[] );
static int GetFilenames ( int i_argc, char *ppsz_argv[] );
static void Usage ( int i_fashion );
......@@ -213,8 +217,8 @@ int main( int i_argc, char *ppsz_argv[], char *ppsz_env[] )
/*
* System specific initialization code
*/
#ifdef SYS_BEOS
beos_Create();
#if defined( SYS_BEOS ) || defined( SYS_DARWIN1_3 )
system_Create( &i_argc, ppsz_argv, ppsz_env );
#endif
p_main->i_cpu_capabilities = CPUCapabilities();
......@@ -395,11 +399,11 @@ int main( int i_argc, char *ppsz_argv[], char *ppsz_env[] )
*/
intf_PlaylistDestroy( p_main->p_playlist );
#ifdef SYS_BEOS
/*
* System specific cleaning code
*/
beos_Destroy();
#if defined( SYS_BEOS ) || defined( SYS_DARWIN1_3 )
system_Destroy();
#endif
/*
......@@ -504,13 +508,13 @@ void main_PutIntVariable( char *psz_name, int i_value )
* stage, but most structures are not allocated, so only environment should
* be used.
*****************************************************************************/
static int GetConfiguration( int *i_argc, char *ppsz_argv[], char *ppsz_env[] )
static int GetConfiguration( int *pi_argc, char *ppsz_argv[], char *ppsz_env[] )
{
int i_cmd;
char *p_tmp;
/* Set default configuration and copy arguments */
p_main->i_argc = *i_argc;
p_main->i_argc = *pi_argc;
p_main->ppsz_argv = ppsz_argv;
p_main->ppsz_env = ppsz_env;
......@@ -534,22 +538,29 @@ static int GetConfiguration( int *i_argc, char *ppsz_argv[], char *ppsz_env[] )
}
}
//when vlc.app is run by double clicking in Mac OS X, the 2nd arg is the PSN - process serial number (a unique PID-ish thingie)
//still ok for real Darwin & when run from command line
#ifdef SYS_DARWIN1_3
if ( strncmp( ppsz_argv[ 1 ] , "-psn" , 4) == 0 ) //for example -psn_0_9306113
/* When vlc.app is run by double clicking in Mac OS X, the 2nd arg
* is the PSN - process serial number (a unique PID-ish thingie)
* still ok for real Darwin & when run from command line */
if ( strncmp( ppsz_argv[ 1 ] , "-psn" , 4) == 0 )
/* for example -psn_0_9306113 */
{
//ppsz_argv[ 1 ] = NULL; //GDMF!... I can't do this or else the MacOSX window server will not pick up the PSN and not register the app and we crash...hence the following kludge
//otherwise we'll get confused w/ argv[1] being an input file name
*i_argc = *i_argc - 1;
p_main->i_argc--;
/* GDMF!... I can't do this or else the MacOSX window server will
* not pick up the PSN and not register the app and we crash...
* hence the following kludge otherwise we'll get confused w/ argv[1]
* being an input file name */
#if 0
ppsz_argv[ 1 ] = NULL;
#endif
*pi_argc = *pi_argc - 1;
pi_argc--;
return( 0 );
}
#endif
/* Parse command line options */
opterr = 0;
while( ( i_cmd = getopt_long( *i_argc, ppsz_argv,
while( ( i_cmd = getopt_long( *pi_argc, ppsz_argv,
psz_shortopts, longopts, 0 ) ) != EOF )
{
switch( i_cmd )
......
src/misc/beos_specific.cpp
View file @ 3ad76f44
......@@ -2,7 +2,7 @@
* beos_init.cpp: Initialization for BeOS specific features
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: beos_specific.cpp,v 1.6 2001/03/25 17:09:14 richards Exp $
* $Id: beos_specific.cpp,v 1.7 2001/04/12 01:52:45 sam Exp $
*
* Authors: Jean-Marc Dressler <polux@via.ecp.fr>
*
......@@ -42,20 +42,20 @@ extern "C"
* Static vars
*****************************************************************************/
static vlc_thread_t beos_app_thread;
static char * psz_beos_program_path;
static char * psz_program_path;
extern "C"
{
void beos_AppThread( void * args )
void system_AppThread( void * args )
{
BApplication * BeApp = new BApplication("application/x-VLC");
BeApp->Run();
delete BeApp;
}
void beos_Create( void )
void system_Create( int *pi_argc, char *ppsz_argv[], char *ppsz_env[] )
{
int i_lenght;
BPath path;
......@@ -71,20 +71,20 @@ void beos_Create( void )
entry.GetPath(&path);
path.GetParent(&path);
i_lenght = strlen( path.Path() );
psz_beos_program_path = (char*) malloc( i_lenght+1 ); /* XXX */
strcpy( psz_beos_program_path, path.Path() );
psz_program_path = (char*) malloc( i_lenght+1 ); /* XXX */
strcpy( psz_program_path, path.Path() );
}
void beos_Destroy( void )
void system_Destroy( void )
{
free( psz_beos_program_path ); /* XXX */
free( psz_program_path ); /* XXX */
be_app->PostMessage( B_QUIT_REQUESTED );
vlc_thread_join( beos_app_thread );
}
char * beos_GetProgramPath( void )
char * system_GetProgramPath( void )
{
return( psz_beos_program_path );
return( psz_program_path );
}
} /* extern "C" */
src/misc/darwin_specific.c 0 → 100644
View file @ 3ad76f44
/*****************************************************************************
* darwin_specific.c: Darwin specific features
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: darwin_specific.c,v 1.1 2001/04/12 01:52:45 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#include "defs.h"
#include <string.h> /* strdup() */
#include <stdlib.h> /* free() */
#include "common.h"
#include "threads.h"
#include "mtime.h"
#include "darwin_specific.h"
/*****************************************************************************
* Static vars
*****************************************************************************/
static char * psz_program_path;
void system_Create( int *pi_argc, char *ppsz_argv[], char *ppsz_env[] )
{
char *p_char, *p_oldchar;
/* Get the full program path and name */
p_char = p_oldchar = psz_program_path = strdup( ppsz_argv[ 0 ] );
/* Remove trailing program name */
for( ; *p_char ; )
{
if( *p_char == '/' )
{
*p_oldchar = '/';
*p_char = '\0';
p_oldchar = p_char;
}
p_char++;
}
return;
}
void system_Destroy( void )
{
free( psz_program_path );
}
char * system_GetProgramPath( void )
{
return( psz_program_path );
}
src/misc/modules.c
View file @ 3ad76f44
......@@ -2,7 +2,7 @@
* modules.c : Built-in and dynamic modules management functions
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: modules.c,v 1.21 2001/04/11 13:30:30 ej Exp $
* $Id: modules.c,v 1.22 2001/04/12 01:52:45 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Ethan C. Baldridge <BaldridgeE@cadmus.com>
......@@ -37,29 +37,27 @@
#include <dirent.h>
#if defined(HAVE_DLFCN_H) /* Linux, BSD, Hurd */
#include <dlfcn.h> /* dlopen(), dlsym(), dlclose() */
# include <dlfcn.h> /* dlopen(), dlsym(), dlclose() */
#elif defined(HAVE_IMAGE_H) /* BeOS */
#include <image.h>
# include <image.h>
#else
/* FIXME: this isn't supposed to be an error */
#error no dynamic plugins available on your system !
/* FIXME: this isn't supposed to be an error */
# error no dynamic plugins available on your system !
#endif
#ifdef SYS_BEOS
#include "beos_specific.h"
# include "beos_specific.h"
#endif
#include "common.h"
#include "threads.h"
#ifdef SYS_DARWIN1_3
#include <sys/param.h> /* for MAXPATHLEN */
#include "main.h"
extern main_t *p_main;
# include "darwin_specific.h"
#endif
#include "common.h"
#include "threads.h"
#include "intf_msg.h"
#include "modules.h"
#include "modules_core.h"
......@@ -99,15 +97,10 @@ void module_InitBank( module_bank_t * p_bank )
char ** ppsz_path = path;
char * psz_fullpath;
char * psz_file;
#ifdef SYS_BEOS
char * psz_vlcpath = beos_GetProgramPath();
#if defined( SYS_BEOS ) || defined( SYS_DARWIN1_3 )
char * psz_vlcpath = system_GetProgramPath();
int i_vlclen = strlen( psz_vlcpath );
boolean_t b_notinroot;
#elif defined SYS_DARWIN1_3
static char once = 0;
static char app_path[ MAXPATHLEN ];
// HACK TO CUT OUT trailing 'vlc'
int i_pathlen = strlen( p_main->ppsz_argv[0] ) - 3;
#endif
DIR * dir;
struct dirent * file;
......@@ -117,22 +110,12 @@ void module_InitBank( module_bank_t * p_bank )
intf_WarnMsg( 1, "module: module bank initialized" );
#ifdef SYS_DARWIN1_3
if ( !once )
{
once = 1;
strncpy( app_path, p_main->ppsz_argv[ 0 ], i_pathlen );
strcat( app_path, "lib" );
path[ 3 ] = app_path ;
}
#endif
for( ; *ppsz_path != NULL ; ppsz_path++ )
{
/* Store strlen(*ppsz_path) for later use. */
int i_dirlen = strlen( *ppsz_path );
#ifdef SYS_BEOS
#if defined( SYS_BEOS ) || defined( SYS_DARWIN1_3 )
b_notinroot = 0;
/* Under BeOS, we need to add beos_GetProgramPath() to access
* files under the current directory */
......@@ -187,7 +170,7 @@ void module_InitBank( module_bank_t * p_bank )
closedir( dir );
}
#ifdef SYS_BEOS
#if defined( SYS_BEOS ) || defined( SYS_DARWIN1_3 )
if( b_notinroot )
{
free( psz_fullpath );
......
src/misc/netutils.c
View file @ 3ad76f44
......@@ -2,7 +2,7 @@
* netutils.c: various network functions
*****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN
* $Id: netutils.c,v 1.23 2001/04/11 02:01:24 henri Exp $
* $Id: netutils.c,v 1.24 2001/04/12 01:52:45 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Benoit Steiner <benny@via.ecp.fr>
......@@ -202,6 +202,7 @@ int network_ChannelCreate( void )
return( 0 );
#else
intf_ErrMsg( "error : channel changing only works with linux yest" );
return( 1 );
#endif /* SYS_LINUX */
#endif /* SYS_BEOS */
}
......
src/video_output/video_text.c
View file @ 3ad76f44
......@@ -2,7 +2,7 @@
* video_text.c : text manipulation functions
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: video_text.c,v 1.22 2001/04/11 13:30:30 ej Exp $
* $Id: video_text.c,v 1.23 2001/04/12 01:52:45 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -35,19 +35,17 @@
#include <unistd.h> /* read(), close() */
#ifdef SYS_BEOS
#include "beos_specific.h"
# include "beos_specific.h"
#endif
#ifdef SYS_DARWIN1_3
# include "darwin_specific.h"
#endif
#include "config.h"
#include "common.h"
#include "video_text.h"
#ifdef SYS_DARWIN1_3
#include <sys/param.h> /* for MAXPATHLEN */
#include "main.h"
extern main_t *p_main;
#endif
#include "intf_msg.h"
/*****************************************************************************
......@@ -220,33 +218,18 @@ vout_font_t *vout_LoadFont( const char *psz_name )
char ** ppsz_path = path;
char * psz_file;
#ifdef SYS_BEOS
char * psz_vlcpath = beos_GetProgramPath();
#if defined( SYS_BEOS ) || defined( SYS_DARWIN1_3 )
char * psz_vlcpath = system_GetProgramPath();
int i_vlclen = strlen( psz_vlcpath );
#elif defined SYS_DARWIN1_3
static char once = 0;
static char app_path[ MAXPATHLEN ];
/* HACK TO CUT OUT trailing 'vlc' */
int i_pathlen = strlen( p_main->ppsz_argv[ 0 ] ) - 3;
#endif
int i_char, i_line; /* character and line indexes */
int i_file = -1; /* source file */
byte_t pi_buffer[2]; /* file buffer */
vout_font_t * p_font; /* the font itself */
#ifdef SYS_DARWIN1_3
if( !once )
{
once = 1;
strncpy( app_path, p_main->ppsz_argv[ 0 ], i_pathlen );
strcat( app_path, "share" );
path[ 2 ] = app_path ;
}
#endif
for( ; *ppsz_path != NULL ; ppsz_path++ )
{
#ifdef SYS_BEOS
#if defined( SYS_BEOS ) || defined( SYS_DARWIN1_3 )
/* Under BeOS, we need to add beos_GetProgramPath() to access
* files under the current directory */
if( strncmp( *ppsz_path, "/", 1 ) )
......
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