* BeOS icon and MIME resources courtesy of Wade Majors <guru@startrek.com>.
authorSam Hocevar <sam@videolan.org>
Thu, 12 Apr 2001 01:52:45 +0000 (01:52 +0000)
committerSam Hocevar <sam@videolan.org>
Thu, 12 Apr 2001 01:52:45 +0000 (01:52 +0000)
  * 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.

24 files changed:
AUTHORS
Makefile.in
include/beos_specific.h
include/darwin_specific.h [new file with mode: 0644]
share/gnome-vlc.png
share/gnome-vlc.xpm
share/gvlc.png
share/gvlc.xpm
share/kvlc.png
share/kvlc.xpm
share/qvlc.png
share/qvlc.xpm
share/vlc-icons.xcf
share/vlc.png
share/vlc.xpm
share/vlc_beos.rsrc [new file with mode: 0644]
src/audio_decoder/adec_layer1.c
src/audio_decoder/adec_layer2.c
src/interface/main.c
src/misc/beos_specific.cpp
src/misc/darwin_specific.c [new file with mode: 0644]
src/misc/modules.c
src/misc/netutils.c
src/video_output/video_text.c

diff --git a/AUTHORS b/AUTHORS
index 0e52cff..3c7b939 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -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: Stéphane 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: Régis 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: Gaël 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
 
index 0e7f1c5..2a682b8 100644 (file)
@@ -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:
index 4336a2b..bb2511e 100644 (file)
@@ -1,8 +1,8 @@
 /*****************************************************************************
- * 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
 }
diff --git a/include/darwin_specific.h b/include/darwin_specific.h
new file mode 100644 (file)
index 0000000..b63421d
--- /dev/null
@@ -0,0 +1,30 @@
+/*****************************************************************************
+ * 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 );
+
index ad37591..c8c280e 100644 (file)
Binary files a/share/gnome-vlc.png and b/share/gnome-vlc.png differ
index 460c19b..6da735c 100644 (file)
 /* XPM */
 static char * gnome_vlc_xpm[] = {
-"48 48 427 2",
+"48 48 540 2",
 "      c None",
 ".     c #000000",
-"+     c #B96500",
-"@     c #D47E18",
-"#     c #CD7F24",
-"$     c #9D611C",
-"%     c #B86500",
-"&     c #BF7722",
-"*     c #9C682D",
-"=     c #A47A4F",
-"-     c #CE8838",
-";     c #DC974A",
-">     c #D69955",
-",     c #DCA366",
-"'     c #F1B474",
-")     c #C08F5C",
-"!     c #D58B36",
+"+     c #C76D00",
+"@     c #DD831A",
+"#     c #D78626",
+"$     c #B16E1F",
+"%     c #C66C00",
+"&     c #CC7F24",
+"*     c #B07633",
+"=     c #B68857",
+"-     c #D88F3B",
+";     c #E39C4C",
+">     c #DE9F58",
+",     c #E3A969",
+"'     c #F4B675",
+")     c #CD9962",
+"!     c #DD9038",
 "~     c #FFAE51",
 "{     c #FFB562",
 "]     c #FFBC72",
 "^     c #FFBF7B",
-"/     c #D59F66",
-"(     c #DC8E33",
+"/     c #DDA56A",
+"(     c #E39235",
 "_     c #FFAC4D",
 ":     c #FFB35D",
 "<     c #FFBA6D",
-"[     c #DCA46A",
-"}     c #C0751D",
-"|     c #F89E36",
+"[     c #E3AA6D",
+"}     c #CD7D1F",
+"|     c #F99F36",
 "1     c #FFAA48",
 "2     c #FFB158",
 "3     c #FFB869",
 "4     c #FFBF79",
-"5     c #F8B977",
-"6     c #030303",
-"7     c #D38A35",
-"8     c #FDAC4D",
-"9     c #FFAF54",
-"0     c #FFB664",
-"a     c #FFBD74",
-"b     c #FDBF7D",
-"c     c #D3A371",
-"d     c #020202",
-"e     c #111111",
-"f     c #D3B898",
-"g     c #FDE2C2",
-"h     c #FDBD73",
-"i     c #FDB96B",
-"j     c #FDBF78",
-"k     c #FDC587",
-"l     c #FDCF9E",
-"m     c #DAC4AE",
-"n     c #272727",
-"o     c #2A2A2A",
-"p     c #DACDBC",
-"q     c #FDF9F5",
-"r     c #FDF0E1",
-"s     c #FDEFDE",
-"t     c #FDF1E4",
-"u     c #FDF4EA",
-"v     c #F6F2ED",
-"w     c #BEB0A2",
-"x     c #171717",
-"y     c #BEA689",
-"z     c #F6F2EE",
-"A     c #FEFEFE",
-"B     c #FDFCFC",
-"C     c #D3CAC0",
-"D     c #131313",
-"E     c #D3C2AE",
-"F     c #FDFCFB",
-"G     c #DAD2C9",
-"H     c #2B2B2B",
-"I     c #D3B591",
-"J     c #FDEDD9",
-"K     c #FDFBF8",
-"L     c #F6EBDF",
-"M     c #BEAA95",
-"N     c #050505",
-"O     c #DA851D",
-"P     c #FDAC4A",
-"Q     c #FDDFBC",
-"R     c #FDECD8",
-"S     c #FDEDDB",
-"T     c #FDF1E3",
-"U     c #FDEBD7",
-"V     c #D5A675",
-"W     c #C06900",
-"X     c #F88800",
-"Y     c #FF8F08",
-"Z     c #FDA031",
-"`     c #FDA946",
-" .    c #FDAF54",
-"..    c #FDB561",
-"+.    c #FDBB6F",
-"@.    c #FDC07C",
-"#.    c #FDC485",
-"$.    c #FFC07E",
-"%.    c #D57400",
-"&.    c #FF8C00",
-"*.    c #FF910E",
-"=.    c #FF981E",
-"-.    c #FF9F2E",
-";.    c #FFA63F",
-">.    c #FFAD4F",
-",.    c #FFB45F",
-"'.    c #FFBB70",
-").    c #FF8F09",
-"!.    c #FF9619",
-"~.    c #FF9D2A",
-"{.    c #FFA43A",
-"].    c #FFAB4A",
-"^.    c #FFB25B",
-"/.    c #FFB96B",
-"(.    c #BEB7B1",
-"_.    c #DC7800",
-":.    c #FF8D04",
-"<.    c #FF9415",
-"[.    c #FF9B25",
-"}.    c #FFA235",
-"|.    c #FFA946",
-"1.    c #FFB056",
-"2.    c #FFB766",
-"3.    c #FFBE77",
-"4.    c #F1F1F0",
-"5.    c #BBB4AE",
-"6.    c #433A34",
-"7.    c #BE7318",
-"8.    c #F69520",
-"9.    c #FF8F07",
-"0.    c #FF9210",
-"a.    c #FF9920",
-"b.    c #FFA031",
-"c.    c #FFA741",
-"d.    c #F6B979",
-"e.    c #BE9366",
-"f.    c #50504F",
-"g.    c #E3DFDC",
-"h.    c #84786E",
-"i.    c #BAB7B5",
-"j.    c #E2DEDB",
-"k.    c #A59C94",
-"l.    c #39332D",
-"m.    c #FDDDB5",
-"n.    c #FDAA45",
-"o.    c #FD9E29",
-"p.    c #FD9A21",
-"q.    c #FF9311",
-"r.    c #FF971C",
-"s.    c #FF9E2C",
-"t.    c #FFA53C",
-"u.    c #FFBB71",
-"v.    c #FDC68C",
-"w.    c #D9C3AD",
-"x.    c #8B8784",
-"y.    c #C7C1BA",
-"z.    c #796E65",
-"A.    c #433B35",
-"B.    c #9F9995",
-"C.    c #B7ADA6",
-"D.    c #8D7E73",
-"E.    c #342D28",
-"F.    c #FDF9F4",
-"G.    c #FDE9D1",
-"H.    c #FDA53D",
-"I.    c #FDAB4A",
-"J.    c #FDB158",
-"K.    c #FDB765",
-"L.    c #FDCA91",
-"M.    c #F5F1EC",
-"N.    c #9D9287",
-"O.    c #7A6E65",
-"P.    c #332D29",
+"5     c #F9BA78",
+"6     c #040404",
+"7     c #D78C33",
+"8     c #F9A849",
+"9     c #FDA947",
+"0     c #FFAF54",
+"a     c #FFB664",
+"b     c #FFBD74",
+"c     c #FFC07E",
+"d     c #DDAB76",
+"e     c #050505",
+"f     c #181818",
+"g     c #C3A887",
+"h     c #E1C6A6",
+"i     c #F3B369",
+"j     c #FAB667",
+"k     c #FCBE77",
+"l     c #FFC688",
+"m     c #FFD09F",
+"n     c #E3CBB4",
+"o     c #393939",
+"p     c #343434",
+"q     c #C2B5A5",
+"r     c #D7D3CF",
+"s     c #DBCEBF",
+"t     c #E7D9C9",
+"u     c #F3E6D7",
+"v     c #FFF3E6",
+"w     c #FFF5EC",
+"x     c #F9F4F0",
+"y     c #CDBDAE",
+"z     c #232323",
+"A     c #1D1D1D",
+"B     c #B49B7B",
+"C     c #D1CECA",
+"D     c #D6D6D6",
+"E     c #D6D5D5",
+"F     c #E3E2E2",
+"G     c #F1F0F0",
+"H     c #FFFEFE",
+"I     c #DDD2C9",
+"J     c #212121",
+"K     c #1B1B1B",
+"L     c #BFAE99",
+"M     c #D6D5D4",
+"N     c #E3E3E3",
+"O     c #F1F1F1",
+"P     c #FFFFFF",
+"Q     c #E3DAD1",
+"R     c #3E3E3E",
+"S     c #E9E8E7",
+"T     c #BAB0A9",
+"U     c #5A5047",
+"V     c #C3A57F",
+"W     c #DBCBB8",
+"X     c #D7D4D0",
+"Y     c #FFFCFA",
+"Z     c #F9EDE2",
+"`     c #CCB69F",
+" .    c #40403F",
+"..    c #E0DEDD",
+"+.    c #EEECEB",
+"@.    c #ADA59E",
+"#.    c #4B423B",
+"$.    c #1D1A17",
+"%.    c #070707",
+"&.    c #DD851A",
+"*.    c #F3A240",
+"=.    c #E1C3A0",
+"-.    c #DDCBB7",
+";.    c #E7D8C6",
+">.    c #F3E5D4",
+",.    c #FFF1E2",
+"'.    c #FFF2E5",
+").    c #FFECD9",
+"!.    c #D8AC80",
+"~.    c #BFBDBC",
+"{.    c #B5ADA7",
+"].    c #6B5E54",
+"^.    c #ACA9A8",
+"/.    c #DEDBDA",
+"(.    c #DCD9D6",
+"_.    c #9E948D",
+":.    c #49413A",
+"<.    c #0E0C0B",
+"[.    c #CD7000",
+"}.    c #F98800",
+"|.    c #FD8E07",
+"1.    c #F99C2C",
+"2.    c #F8A340",
+"3.    c #FAAC50",
+"4.    c #FCB460",
+"5.    c #FFBC70",
+"6.    c #FFC27D",
+"7.    c #FFC687",
+"8.    c #FEBF7D",
+"9.    c #C7AC8D",
+"0.    c #E4E2E0",
+"a.    c #BCB2AB",
+"b.    c #5D5249",
+"c.    c #484039",
+"d.    c #9F9E9C",
+"e.    c #DBD7D4",
+"f.    c #BEB6AE",
+"g.    c #96887D",
+"h.    c #4D443C",
+"i.    c #050504",
+"j.    c #DD7900",
+"k.    c #FF8C00",
+"l.    c #FF910E",
+"m.    c #FF981E",
+"n.    c #FF9F2E",
+"o.    c #FFA63F",
+"p.    c #FFAD4F",
+"q.    c #FFB45F",
+"r.    c #FFBB70",
+"s.    c #FDBD7A",
+"t.    c #BDA287",
+"u.    c #B8B0A9",
+"v.    c #A79C93",
+"w.    c #4F463E",
+"x.    c #322C28",
+"y.    c #6D6863",
+"z.    c #ADA39A",
+"A.    c #998C81",
+"B.    c #7F7166",
+"C.    c #37312B",
+"D.    c #020101",
+"E.    c #FF8F09",
+"F.    c #FF9619",
+"G.    c #FF9D2A",
+"H.    c #FFA43A",
+"I.    c #FFAB4A",
+"J.    c #FFB25B",
+"K.    c #FFB96B",
+"L.    c #FEBE7A",
+"M.    c #C59C70",
+"N.    c #8A7D73",
+"O.    c #635950",
+"P.    c #1C1816",
 "Q.    c #070605",
-"R.    c #5E534A",
-"S.    c #463D37",
-"T.    c #0B0A08",
-"U.    c #141414",
-"V.    c #D3C2AF",
-"W.    c #FDEBD5",
-"X.    c #FDEDDA",
-"Y.    c #FDEEDD",
-"Z.    c #FDEFE0",
-"`.    c #FDF2E7",
-" +    c #FDFAF8",
-".+    c #F2F1F1",
-"++    c #E0DEDC",
-"@+    c #B6AEA5",
-"#+    c #26221F",
-"$+    c #010101",
-"%+    c #26221E",
-"&+    c #1A1715",
-"*+    c #040303",
-"=+    c #DACCBB",
-"-+    c #E4E4E4",
-";+    c #B8B1AC",
-">+    c #5F5751",
-",+    c #252525",
-"'+    c #BE9C73",
-")+    c #F6EEE6",
-"!+    c #B5ACA5",
-"~+    c #736961",
-"{+    c #090908",
-"]+    c #938473",
-"^+    c #EEECEA",
-"/+    c #DCD9D8",
-"(+    c #DFDCD9",
-"_+    c #B6AEA8",
-":+    c #A3968B",
-"<+    c #544B43",
-"[+    c #D58C34",
-"}+    c #FDE9D2",
-"|+    c #FDFAF7",
-"1+    c #FDF3E7",
-"2+    c #CAC1B6",
-"3+    c #413B35",
-"4+    c #846849",
-"5+    c #6D6D6C",
-"6+    c #EAE8E6",
-"7+    c #D6D0CC",
-"8+    c #B7ADA5",
-"9+    c #A1968C",
-"0+    c #8D847C",
-"a+    c #8B7D71",
-"b+    c #1E1B18",
-"c+    c #D57705",
-"d+    c #FD9D28",
-"e+    c #FDEAD5",
-"f+    c #FDECD7",
-"g+    c #FDEEDC",
-"h+    c #FDE6CC",
-"i+    c #F1CA9D",
-"j+    c #EAD1B6",
-"k+    c #AA8B6B",
-"l+    c #B28657",
-"m+    c #C49667",
-"n+    c #E5E4E3",
-"o+    c #DCD7D3",
-"p+    c #A3978C",
-"q+    c #98897E",
-"r+    c #A09388",
-"s+    c #918378",
-"t+    c #584E46",
-"u+    c #050404",
-"v+    c #FDA133",
-"w+    c #FDA741",
-"x+    c #FDAD4E",
-"y+    c #FDB25A",
-"z+    c #F7B364",
-"A+    c #CFC7BF",
-"B+    c #C4BCB6",
-"C+    c #5B5047",
-"D+    c #BA8E5E",
-"E+    c #D3BDA7",
-"F+    c #E6E4E2",
-"G+    c #B9B0A8",
-"H+    c #9D8E83",
-"I+    c #9B8D82",
-"J+    c #9F9287",
-"K+    c #887B70",
-"L+    c #2E2924",
-"M+    c #FF8E07",
-"N+    c #FF9517",
-"O+    c #FF9C27",
-"P+    c #FFA338",
-"Q+    c #FCA847",
-"R+    c #946D43",
-"S+    c #423932",
-"T+    c #0A0908",
-"U+    c #52402F",
-"V+    c #CFC5BB",
-"W+    c #D2CCC8",
-"X+    c #9D9188",
-"Y+    c #877B72",
-"Z+    c #998B81",
-"`+    c #6D6157",
-" @    c #231F1B",
-".@    c #FF8C02",
-"+@    c #FF9312",
-"@@    c #FF9A23",
-"#@    c #FFA133",
-"$@    c #FFA843",
-"%@    c #FAAB52",
-"&@    c #AB7A43",
-"*@    c #392A19",
-"=@    c #896743",
-"-@    c #CEC3BB",
-";@    c #C9C0BB",
-">@    c #AB9F96",
-",@    c #95887E",
-"'@    c #060504",
-")@    c #9D5600",
-"!@    c #FEB35E",
-"~@    c #F6B46C",
-"{@    c #F4B776",
-"]@    c #BBADA0",
-"^@    c #CCC5BE",
-"/@    c #A3958B",
-"(@    c #8C7E73",
-"_@    c #171411",
-":@    c #1D1000",
-"<@    c #914F00",
-"[@    c #1E1E1E",
-"}@    c #CFCDCA",
-"|@    c #DCD8D5",
-"1@    c #D2CCC9",
-"2@    c #8A7D73",
-"3@    c #FA8900",
-"4@    c #E98100",
-"5@    c #F7B876",
-"6@    c #AC9A87",
-"7@    c #C4BBB4",
-"8@    c #A6998E",
-"9@    c #786A5F",
-"0@    c #070604",
-"a@    c #844800",
-"b@    c #EE8100",
-"c@    c #A35A01",
-"d@    c #B6B1AD",
-"e@    c #D5CFCA",
-"f@    c #D0C9C4",
-"g@    c #BAB1A9",
-"h@    c #6D6259",
-"i@    c #120F0E",
-"j@    c #A45A00",
-"k@    c #F08300",
-"l@    c #FE8B00",
-"m@    c #E37C00",
-"n@    c #E88000",
-"o@    c #A05C00",
-"p@    c #CC7200",
-"q@    c #DC7B00",
-"r@    c #E37E00",
-"s@    c #F98900",
-"t@    c #F9A544",
-"u@    c #E39D4A",
-"v@    c #DC9E55",
-"w@    c #CB9759",
-"x@    c #876F51",
-"y@    c #C1B7B0",
-"z@    c #A89C91",
-"A@    c #7C6D62",
-"B@    c #110F0C",
-"C@    c #995400",
-"D@    c #C76D00",
-"E@    c #35302C",
-"F@    c #9A8D83",
-"G@    c #A2948A",
-"H@    c #998B80",
-"I@    c #37312B",
-"J@    c #D27500",
-"K@    c #885100",
-"L@    c #774800",
-"M@    c #DC800D",
-"N@    c #DC851A",
-"O@    c #DC8B28",
-"P@    c #CC8731",
-"Q@    c #885C1B",
-"R@    c #77541D",
-"S@    c #88632B",
-"T@    c #BC6901",
-"U@    c #A19285",
-"V@    c #A6988E",
-"W@    c #8B7C71",
-"X@    c #5E5249",
-"Y@    c #5B4226",
-"Z@    c #010000",
-"`@    c #95918F",
-" #    c #C8C0BA",
-".#    c #8D7F73",
-"+#    c #181413",
-"@#    c #D77600",
-"##    c #DC7A00",
-"$#    c #764800",
-"%#    c #764903",
-"&#    c #764A05",
-"*#    c #774D0B",
-"=#    c #885914",
-"-#    c #F68700",
-";#    c #8D6E4B",
-">#    c #93867C",
-",#    c #9A8B80",
-"'#    c #918276",
-")#    c #8E8074",
-"!#    c #A59A91",
-"~#    c #BDB5AF",
-"{#    c #DEDBD9",
-"]#    c #EFEDEC",
-"^#    c #C1B8B1",
-"/#    c #71655A",
-"(#    c #D07200",
-"_#    c #C46D00",
-":#    c #D67700",
-"<#    c #DD7B00",
-"[#    c #DD7900",
-"}#    c #8F5919",
-"|#    c #796B61",
-"1#    c #96897D",
-"2#    c #95867A",
-"3#    c #9C8D82",
-"4#    c #A4978D",
-"5#    c #B1A69D",
-"6#    c #C9C1BB",
-"7#    c #BCB2AA",
-"8#    c #D67500",
-"9#    c #322B27",
-"0#    c #62564D",
-"a#    c #85766B",
-"b#    c #9F9186",
-"c#    c #A5988E",
-"d#    c #9C8E82",
-"e#    c #998A80",
-"f#    c #9E9085",
-"g#    c #574D45",
-"h#    c #241F1B",
-"i#    c #443C35",
-"j#    c #62574D",
-"k#    c #817267",
-"l#    c #84766B",
-"m#    c #8B7C70",
-"n#    c #080707",
-"o#    c #060505",
-"p#    c #0A0808",
-"q#    c #0F0E0C",
-"r#    c #12100E",
-"s#    c #0C0A09",
-"t#    c #030202",
+"R.    c #171413",
+"S.    c #5B5149",
+"T.    c #5B5048",
+"U.    c #403832",
+"V.    c #0E0D0B",
+"W.    c #E37C00",
+"X.    c #FF8D04",
+"Y.    c #FF9415",
+"Z.    c #FF9B25",
+"`.    c #FFA235",
+" +    c #FFA946",
+".+    c #FEB056",
+"++    c #EFB778",
+"@+    c #EEB679",
+"#+    c #E6AC70",
+"$+    c #62503D",
+"%+    c #171411",
+"&+    c #181613",
+"*+    c #2C2622",
+"=+    c #0B0909",
+"-+    c #C87817",
+";+    c #F3921C",
+">+    c #FD8E05",
+",+    c #FF9210",
+"'+    c #FF9920",
+")+    c #FFA031",
+"!+    c #FFA741",
+"~+    c #F2AB5A",
+"{+    c #EBE6E2",
+"]+    c #BAAFA3",
+"^+    c #B4895D",
+"/+    c #BB8C5C",
+"(+    c #4A3A28",
+"_+    c #010101",
+":+    c #312C29",
+"<+    c #141210",
+"[+    c #060505",
+"}+    c #E1C199",
+"|+    c #F3A03B",
+"1+    c #F89824",
+"2+    c #F9961D",
+"3+    c #FD9110",
+"4+    c #FF971C",
+"5+    c #FF9E2C",
+"6+    c #FFA53C",
+"7+    c #DEA360",
+"8+    c #CFCBC9",
+"9+    c #948A83",
+"0+    c #42372D",
+"a+    c #B89673",
+"b+    c #D0BAA5",
+"c+    c #2D2D2D",
+"d+    c #C8C8C8",
+"e+    c #E0DFDE",
+"f+    c #D1CECC",
+"g+    c #B9B4AF",
+"h+    c #91857C",
+"i+    c #74685E",
+"j+    c #D7D3CE",
+"k+    c #DBCBB7",
+"l+    c #DDC9B1",
+"m+    c #FAA239",
+"n+    c #FCAA49",
+"o+    c #FFB259",
+"p+    c #D69E5E",
+"q+    c #A19489",
+"r+    c #5A524B",
+"s+    c #090807",
+"t+    c #635F5B",
+"u+    c #EFEAE6",
+"v+    c #CCBCAD",
+"w+    c #6F6E6E",
+"x+    c #E8E6E4",
+"y+    c #E8E5E3",
+"z+    c #DCD9D7",
+"A+    c #E0DCD9",
+"B+    c #B7B0AB",
+"C+    c #ACA097",
+"D+    c #87796D",
+"E+    c #494139",
+"F+    c #BEAE99",
+"G+    c #E7D5BF",
+"H+    c #F3E2CE",
+"I+    c #FFEFDC",
+"J+    c #EDDFCF",
+"K+    c #8A7F75",
+"L+    c #332E29",
+"M+    c #010000",
+"N+    c #494949",
+"O+    c #E5E4E4",
+"P+    c #D7D0C9",
+"Q+    c #DEDCDA",
+"R+    c #E2DEDA",
+"S+    c #D4CFCA",
+"T+    c #BDB4AD",
+"U+    c #B8AFA8",
+"V+    c #9F968F",
+"W+    c #988D84",
+"X+    c #71655A",
+"Y+    c #1B1715",
+"Z+    c #030202",
+"`+    c #C2B4A2",
+" @    c #F8F7F7",
+".@    c #C9C7C6",
+"+@    c #706E6D",
+"@@    c #454545",
+"#@    c #919191",
+"$@    c #E1E1E0",
+"%@    c #EBE8E8",
+"&@    c #E3E0DD",
+"*@    c #C7BFB8",
+"=@    c #AA9E95",
+"-@    c #9C8F84",
+";@    c #9F9288",
+">@    c #92857B",
+",@    c #70655C",
+"'@    c #453C36",
+")@    c #030303",
+"!@    c #B89368",
+"~@    c #D2CCC3",
+"{@    c #F0F0F0",
+"]@    c #EEEEEE",
+"^@    c #C9C2BE",
+"/@    c #B3B0AD",
+"(@    c #EAE9E9",
+"_@    c #EEEDED",
+":@    c #E8E6E5",
+"<@    c #F1EFEE",
+"[@    c #D6D0CB",
+"}@    c #9E9186",
+"|@    c #93857A",
+"1@    c #9B8E83",
+"2@    c #9F9187",
+"3@    c #908176",
+"4@    c #807368",
+"5@    c #1E1B18",
+"6@    c #D3882D",
+"7@    c #DCC9B1",
+"8@    c #E8E7E7",
+"9@    c #D5D1CE",
+"0@    c #D0CCC8",
+"a@    c #A1978E",
+"b@    c #4A423C",
+"c@    c #B4ABA3",
+"d@    c #E5DDD4",
+"e@    c #E5E1DE",
+"f@    c #E1DEDB",
+"g@    c #B7AEA5",
+"h@    c #9F9085",
+"i@    c #9E9084",
+"j@    c #9C8E83",
+"k@    c #A09288",
+"l@    c #908277",
+"m@    c #514841",
+"n@    c #090806",
+"o@    c #DB7B04",
+"p@    c #F89823",
+"q@    c #E7D4BC",
+"r@    c #EBD9C4",
+"s@    c #A89B8E",
+"t@    c #6E655C",
+"u@    c #4A433D",
+"v@    c #574736",
+"w@    c #D2B595",
+"x@    c #DFDAD6",
+"y@    c #CDC7C2",
+"z@    c #9F948A",
+"A@    c #91857A",
+"B@    c #93857B",
+"C@    c #998B80",
+"D@    c #7C6F65",
+"E@    c #4A413A",
+"F@    c #12100E",
+"G@    c #FA9A26",
+"H@    c #FCA031",
+"I@    c #E8983C",
+"J@    c #654724",
+"K@    c #0A0805",
+"L@    c #372919",
+"M@    c #C6A786",
+"N@    c #D6D1CC",
+"O@    c #B6ACA4",
+"P@    c #A49990",
+"Q@    c #81766E",
+"R@    c #877C73",
+"S@    c #1B1815",
+"T@    c #FF8E07",
+"U@    c #FE9416",
+"V@    c #EC9024",
+"W@    c #A86B24",
+"X@    c #6F4A1F",
+"Y@    c #AB773C",
+"Z@    c #CCA982",
+"`@    c #D8D2CD",
+" #    c #BFB6AD",
+".#    c #AA9D92",
+"+#    c #9F9287",
+"@#    c #6A5F55",
+"##    c #211D1A",
+"$#    c #FF8C02",
+"%#    c #FF9312",
+"&#    c #FF9A23",
+"*#    c #FB9E32",
+"=#    c #F4A040",
+"-#    c #F6A951",
+";#    c #CFA77A",
+">#    c #C8BFB9",
+",#    c #A2958A",
+"'#    c #96887C",
+")#    c #554B43",
+"!#    c #070604",
+"~#    c #221300",
+"{#    c #DBD8D5",
+"]#    c #DEDBD8",
+"^#    c #D8D3D0",
+"/#    c #BFB7B1",
+"(#    c #84776D",
+"_#    c #B16100",
+":#    c #FEAC4E",
+"<#    c #D2A471",
+"[#    c #C3BAB1",
+"}#    c #C4BCB4",
+"|#    c #A6998D",
+"1#    c #847569",
+"2#    c #39322D",
+"3#    c #804600",
+"4#    c #DF7A00",
+"5#    c #151414",
+"6#    c #DAD6D4",
+"7#    c #E8E5E2",
+"8#    c #E4E0DD",
+"9#    c #D1CBC6",
+"0#    c #BCB3AB",
+"a#    c #75685E",
+"b#    c #28231F",
+"c#    c #FA8900",
+"d#    c #FEAA49",
+"e#    c #D59F63",
+"f#    c #BBAEA3",
+"g#    c #A5988D",
+"h#    c #8B7C70",
+"i#    c #36302A",
+"j#    c #AA5C00",
+"k#    c #F38500",
+"l#    c #A96008",
+"m#    c #989088",
+"n#    c #B2A79E",
+"o#    c #BAB0A7",
+"p#    c #A79A90",
+"q#    c #94877D",
+"r#    c #040303",
+"s#    c #B66300",
+"t#    c #FE8B00",
+"u#    c #E97F00",
+"v#    c #E88000",
+"w#    c #A05C00",
+"x#    c #F9A544",
+"y#    c #E19F55",
+"z#    c #B8A694",
+"A#    c #BFB6AF",
+"B#    c #A99D92",
+"C#    c #8A7B6F",
+"D#    c #4E453D",
+"E#    c #1B130B",
+"F#    c #B76400",
+"G#    c #F88700",
+"H#    c #D27300",
+"I#    c #38332F",
+"J#    c #8E837A",
+"K#    c #AFA49B",
+"L#    c #9F9186",
+"M#    c #26221E",
+"N#    c #F98900",
+"O#    c #D27500",
+"P#    c #885100",
+"Q#    c #774800",
+"R#    c #81581A",
+"S#    c #857460",
+"T#    c #A6998F",
+"U#    c #7C6F63",
+"V#    c #4F463D",
+"W#    c #6D4921",
+"X#    c #C16A00",
+"Y#    c #8D8B88",
+"Z#    c #D1CCC7",
+"`#    c #A7998F",
+" $    c #74675D",
+".$    c #0F0D0C",
+"+$    c #DE7B00",
+"@$    c #DC7B00",
+"#$    c #CC7200",
+"$$    c #764800",
+"%$    c #764903",
+"&$    c #764A05",
+"*$    c #774D0B",
+"=$    c #885914",
+"-$    c #C97000",
+";$    c #9C641E",
+">$    c #85786C",
+",$    c #9A8C81",
+"'$    c #9D8E83",
+")$    c #948578",
+"!$    c #84766A",
+"~$    c #897F76",
+"{$    c #87807C",
+"]$    c #A09B97",
+"^$    c #CFCDCC",
+"/$    c #EBEAE9",
+"($    c #D5CFCA",
+"_$    c #A0948A",
+":$    c #534942",
+"<$    c #D97700",
+"[$    c #CB7000",
+"}$    c #D87800",
+"|$    c #DD7B00",
+"1$    c #E37E00",
+"2$    c #DC7A04",
+"3$    c #79644F",
+"4$    c #8C7F75",
+"5$    c #9B8D82",
+"6$    c #988A7E",
+"7$    c #95867A",
+"8$    c #A09287",
+"9$    c #ACA096",
+"0$    c #CFC8C2",
+"a$    c #DCD7D3",
+"b$    c #887B71",
+"c$    c #292420",
+"d$    c #DE7900",
+"e$    c #E47D00",
+"f$    c #C96E00",
+"g$    c #201C19",
+"h$    c #6D6056",
+"i$    c #8A7D72",
+"j$    c #98897D",
+"k$    c #938479",
+"l$    c #A4978D",
+"m$    c #B9AFA6",
+"n$    c #040403",
+"o$    c #39332D",
+"p$    c #5D5149",
+"q$    c #75675C",
+"r$    c #908175",
+"s$    c #A09388",
+"t$    c #AA9E94",
+"u$    c #9A8C80",
+"v$    c #A4968C",
+"w$    c #998A80",
+"x$    c #9E9086",
+"y$    c #73675D",
+"z$    c #1E1A18",
+"A$    c #0B0908",
+"B$    c #2F2924",
+"C$    c #64584F",
+"D$    c #7C6F64",
+"E$    c #918277",
+"F$    c #8F8175",
+"G$    c #94867A",
+"H$    c #2C2723",
+"I$    c #171412",
+"J$    c #25211D",
+"K$    c #302A25",
+"L$    c #514840",
+"M$    c #554B42",
+"N$    c #191614",
+"O$    c #060504",
 "                                                                                                ",
 "                                                                                                ",
 "                                                                                                ",
@@ -440,39 +553,39 @@ static char * gnome_vlc_xpm[] = {
 "                                . ! ~ { ] ^ / .                                                 ",
 "                                . ( _ : < ^ [ .                                                 ",
 "                              . } | 1 2 3 4 5 ) .                                               ",
-"                              6 7 8 1 9 0 a b c d                                               ",
-"                              e f g h i j k l m n                                               ",
-"                              o p q r s r t u v w x                                             ",
-"                            x y z A B B B B B B C D                                             ",
-"                            D E F A A A A A A B G H                                             ",
-"                            e I J q B B B B B K L M D                                           ",
-"                            N O P Q R S s r T U l V 6                                           ",
-"                          . W X Y Z `  ...+.@.#.$.[ .                                           ",
-"                          . %.&.&.*.=.-.;.>.,.'.^ 5 ) .                                         ",
-"                          . %.&.&.).!.~.{.].^./.^ ^ / .             (.                          ",
-"                          . _.&.&.:.<.[.}.|.1.2.3.^ [ .           4.5.6.                        ",
-"                        N 7.8.9.&.&.0.a.b.c.~ { ] ^ d.e.f.g.h.  i.j.k.l..                       ",
-"                        e I m.n.o.p.q.r.s.t._ : u.v.l w.x.y.z.A.B.C.D.E..                       ",
-"                        D E F.J G.m.P H.I.J.K.h L.U u M.N.O.P.Q.  R.S.T..                       ",
-"                        U.V.B B B q J W.R X.Y.Z.`. +.+++@+#+$+.   %+&+*+.                       ",
-"                        H =+B A A A B B B B B B B A -+;+>+,+                                    ",
-"                      D '+)+B B B A A A A A A A A B !+~+{+]+D   ^+/+(+_+:+<+                    ",
-"                      6 [+m.G.}+J q B B B B B B |+1+2+3+$+4+5+6+7+8+9+0+a+b+                    ",
-"                      . c+p.d+o.n.m.G.}+e+f+X.g+h+i+j+k+l+m+n+o+p+q+r+s+t+u+.                   ",
-"                      . _.&.&.&.9.p.d+o.v+w+x+y+z+A+B+C+D+E+F+G+H+I+J+K+L+.                     ",
-"                    . W X &.&.&.&.&.&.&.M+N+O+P+Q+R+S+T+U+V+W+X+Y+Z+`+ @. .                     ",
-"                  . . %.&.&.&.&.&.&.&.&..@+@@@#@$@%@&@*@=@-@;@>@,@<+'@. .                       ",
-"              . . )@. %.&.&.&.&.&.&.&.&.&.*.=.-.;.>.!@~@{@]@^@/@(@_@:@<@. [@}@|@1@2@            ",
-"              W _.%.. _.3@4@3@&.&.&.&.&.&.).!.~.{.].^./.5@6@7@8@9@0@a@b@c@d@e@f@g@h@i@          ",
-"          . j@k@l@X m@X n@o@p@q@r@s@&.&.&.:.<.[.}.t@u@v@w@x@y@z@A@B@C@D@. E@F@G@H@I@.           ",
-"          . . W %.%._.X s@J@K@L@K@p@q@q@q@q@M@N@O@P@Q@R@S@T@U@V@W@X@Y@Z@    `@ #.#+#.           ",
-"              . . . . W %.@###q@p@K@L@$#$#$#%#&#*#=#p@q@r@-#;#>#,#'#)#!#~#{#]#^#/#'@.           ",
-"                    . . . . W %.(#_#:#q@q@q@q@q@<#r@s@X [#%.}#|#1#2#3#4#5#6#7#,@%+.             ",
-"                . . . . . . . . . . W %.8#[#X &.&.X _.W . . . 9#0#a#b#c#d#e#f#g#. .             ",
-"                . . . . . . . . . . . . . . W %.%.W . . . . . . h#i#j#k#l#m#g#n#.               ",
-"                . . . . . . . . . . . . . . . . . . . . . . . . . o#p#q#r#s#t#.                 ",
-"                        . . . . . . . . . . . . . . . . . . . . . .   . . . .                   ",
-"                              . . . . . . . . . . . . . . . . .                                 ",
-"                                      . . . . . . . . . .                                       ",
-"                                              . . . .                                           ",
+"                              6 7 8 9 0 a b c d e                                               ",
+"                              f g h i j k l m n o                                               ",
+"                              p q r s t u v w x y z                                             ",
+"                            A B C D E F G H H H I J                                             ",
+"                            K L M D D N O P P H Q R             S T U                           ",
+"                            f V W X E F G H H Y Z `  .        ..+.@.#.$.                        ",
+"                            %.&.*.=.-.;.>.,.'.).m !.~.{.].  ^./.(._.:.<.                        ",
+"                          . [.}.|.1.2.3.4.5.6.7.8.9.0.a.b.c.d.e.f.g.h.i.                        ",
+"                          . j.k.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z.A.B.C.D..                       ",
+"                          . j.k.k.E.F.G.H.I.J.K.L.M.N.O.P.Q.R.S.T.U.V.. .                       ",
+"                          . W.k.k.X.Y.Z.`. +.+++@+#+$+%+. .   &+*+=+. .                         ",
+"                        %.-+;+>+k.k.,+'+)+!+~+{+]+^+/+(+_+.       :+<+[+                        ",
+"                        f V }+|+1+2+3+4+5+6+7+8+9+0+a+b+c+    d+e+f+g+h+i+                      ",
+"                        K L j+k+l+}+*.m+n+o+p+q+r+s+t+u+v+w+x+y+z+A+B+C+D+E+                    ",
+"                        K F+E E E r W G+H+I+J+K+L+M+N+O+P+Q+R+S+T+U+V+W+X+Y+Z+                  ",
+"                        p `+E D D D E F G H  @.@+@@@#@$@%@&@*@=@-@;@>@,@'@)@.                   ",
+"                      f !@~@E E E D D N {@]@G ^@/@(@_@:@<@[@}@|@1@2@3@4@5@. .                   ",
+"                      6 6@}+l+7@k+r E F 8@9@0@a@b@c@d@e@f@g@h@i@j@k@l@m@n@. .                   ",
+"                      . o@2+p@1+|+}+l+q@r@s@t@u@<+v@w@x@y@z@A@B@C@D@E@F@_+.                     ",
+"                      . W.k.k.k.>+2+p@G@H@I@J@K@. L@M@N@O@P@Q@R@T.S@. . .                       ",
+"                    . [.}.k.k.k.k.k.k.k.T@U@V@W@X@Y@Z@`@ #.#+#@###. . .                         ",
+"                  . . j.k.k.k.k.k.k.k.k.$#%#&#*#=#-#;#>#*@,#'#)#!#~#. .     {#]#^#/#(#          ",
+"              . . _#. j.k.k.k.k.k.k.k.k.k.l.m.n.o.:#<#[#}#|#1#2#. 3#4#[.5#6#7#8#9#0#a#b#        ",
+"            . [.W.j.. W.c#k.c#k.k.k.k.k.k.E.F.G.H.d#e#f# #g#h#i#. j#k.k#l#m#n#o#p#q##.r#.       ",
+"          . s#k#t#}.u#}.v#w#k.k.k.k.k.k.k.X.Y.Z.`.x#y#z#A#B#C#D#E#F#G#H#. I#J#K#L#B.M#. .       ",
+"          . . [.j.j.W.}.N#O#P#Q#P#k.k.k.k.k.,+'+)+!+R#S#T#g#3@U#V#W#X#.     Y#Z#`# $.$.         ",
+"              . . . . [.j.4#+$@$#$P#Q#$$$$$$%$&$*$=$-$;$>$,$'$)$!$>$~${$]$^$/$($_$:$r#.         ",
+"                . . . . . . [.j.<$[$}$@$@$@$@$@$|$1$N#2$3$4$5$6$7$8$9$T+0$&@a$0#b$c$_+.         ",
+"                . . . . . . . . . . [.j.d$e$}.k.k.}.W.f$g$h$i$5$j$k$8$5$l$m$9$,$)#s+.           ",
+"                  . . . . . . . . . . . . . [.j.j.[.. . n$o$p$q$r$s$t$u$v$w$x$y$z$. .           ",
+"                        . . . . . . . . . . . . . . . . . A$B$E@C$D$E$F$7$G$y$H$D..             ",
+"                              . . . . . . . . . . . . . . . . I$J$K$E@L$M$:.N$_+. .             ",
+"                                      . . . . . . . . . .       [+r#O$[+O$D.. . .               ",
+"                                              . . . .               . . . . .                   ",
+"                                                                                                ",
 "                                                                                                "};
index b577354..c081a46 100644 (file)
Binary files a/share/gvlc.png and b/share/gvlc.png differ
index 219bc5d..b8d89fe 100644 (file)
 /* XPM */
 static char * gvlc_xpm[] = {
-"48 48 514 2",
+"48 48 527 2",
 "      c None",
 ".     c #000000",
-"+     c #B96500",
-"@     c #D47E18",
-"#     c #CD7F24",
-"$     c #9D611C",
-"%     c #B86500",
-"&     c #BF7722",
-"*     c #9C682D",
-"=     c #A47A4F",
-"-     c #CE8838",
-";     c #DC974A",
-">     c #D69955",
-",     c #DCA366",
-"'     c #F1B474",
-")     c #C08F5C",
-"!     c #D58B36",
+"+     c #C76D00",
+"@     c #DD831A",
+"#     c #D78626",
+"$     c #B16E1F",
+"%     c #C66C00",
+"&     c #CC7F24",
+"*     c #B07633",
+"=     c #B68857",
+"-     c #D88F3B",
+";     c #E39C4C",
+">     c #DE9F58",
+",     c #E3A969",
+"'     c #F4B675",
+")     c #CD9962",
+"!     c #DD9038",
 "~     c #FFAE51",
 "{     c #FFB562",
 "]     c #FFBC72",
 "^     c #FFBF7B",
-"/     c #D59F66",
-"(     c #DC8E33",
+"/     c #DDA56A",
+"(     c #E39235",
 "_     c #FFAC4D",
 ":     c #FFB35D",
 "<     c #FFBA6D",
-"[     c #DCA46A",
-"}     c #C0751D",
-"|     c #F89E36",
+"[     c #E3AA6D",
+"}     c #CD7D1F",
+"|     c #F99F36",
 "1     c #FFAA48",
 "2     c #FFB158",
 "3     c #FFB869",
 "4     c #FFBF79",
-"5     c #F8B977",
-"6     c #030303",
-"7     c #D38A35",
-"8     c #FDAC4D",
-"9     c #FFAF54",
-"0     c #FFB664",
-"a     c #FFBD74",
-"b     c #FDBF7D",
-"c     c #D3A371",
-"d     c #020202",
-"e     c #111111",
-"f     c #D3B898",
-"g     c #FDE2C2",
-"h     c #FDBD73",
-"i     c #FDB96B",
-"j     c #FDBF78",
-"k     c #FDC587",
-"l     c #FDCF9E",
-"m     c #DAC4AE",
-"n     c #272727",
-"o     c #2A2A2A",
-"p     c #DACDBC",
-"q     c #FDF9F5",
-"r     c #FDF0E1",
-"s     c #FDEFDE",
-"t     c #FDF1E4",
-"u     c #FDF4EA",
-"v     c #F6F2ED",
-"w     c #BEB0A2",
-"x     c #171717",
-"y     c #BEA689",
-"z     c #F6F2EE",
-"A     c #FEFEFE",
-"B     c #FDFCFC",
-"C     c #D3CAC0",
-"D     c #131313",
-"E     c #D3C2AE",
-"F     c #FDFCFB",
-"G     c #DAD2C9",
-"H     c #2B2B2B",
-"I     c #D3B591",
-"J     c #FDEDD9",
-"K     c #FDFBF8",
-"L     c #F6EBDF",
-"M     c #BEAA95",
-"N     c #050505",
-"O     c #DA851D",
-"P     c #FDAC4A",
-"Q     c #FDDFBC",
-"R     c #FDECD8",
-"S     c #FDEDDB",
-"T     c #FDF1E3",
-"U     c #FDEBD7",
-"V     c #D5A675",
-"W     c #C06900",
-"X     c #F88800",
-"Y     c #FF8F08",
-"Z     c #FDA031",
-"`     c #FDA946",
-" .    c #FDAF54",
-"..    c #FDB561",
-"+.    c #FDBB6F",
-"@.    c #FDC07C",
-"#.    c #FDC485",
-"$.    c #FFC07E",
-"%.    c #D57400",
-"&.    c #FF8C00",
-"*.    c #FF910E",
-"=.    c #FF981E",
-"-.    c #FF9F2E",
-";.    c #FFA63F",
-">.    c #FFAD4F",
-",.    c #FFB45F",
-"'.    c #FFBB70",
-").    c #101439",
-"!.    c #11245A",
-"~.    c #FF8F09",
-"{.    c #FF9619",
-"].    c #FF9D2A",
-"^.    c #FFA43A",
-"/.    c #FFAB4A",
-"(.    c #FFB25B",
-"_.    c #FFB96B",
-":.    c #0C1A1D",
-"<.    c #080F1A",
-"[.    c #030911",
-"}.    c #121944",
-"|.    c #4071E5",
-"1.    c #1E3B62",
-"2.    c #030208",
-"3.    c #DC7800",
-"4.    c #FF8D04",
-"5.    c #FF9415",
-"6.    c #FF9B25",
-"7.    c #FFA235",
-"8.    c #FFA946",
-"9.    c #FFB056",
-"0.    c #FFB766",
-"a.    c #FFBE77",
-"b.    c #010408",
-"c.    c #080C20",
-"d.    c #24408D",
-"e.    c #4171E1",
-"f.    c #3A71DF",
-"g.    c #3E71DE",
-"h.    c #3976DE",
-"i.    c #070108",
-"j.    c #BE7318",
-"k.    c #F69520",
-"l.    c #FF8F07",
-"m.    c #FF9210",
-"n.    c #FF9920",
-"o.    c #FFA031",
-"p.    c #FFA741",
-"q.    c #F6B979",
-"r.    c #BE9366",
-"s.    c #040404",
-"t.    c #040608",
-"u.    c #08051D",
-"v.    c #0C223E",
-"w.    c #080720",
-"x.    c #050408",
-"y.    c #070407",
-"z.    c #070007",
-"A.    c #030308",
-"B.    c #315FB0",
-"C.    c #3972DE",
-"D.    c #193067",
-"E.    c #050108",
-"F.    c #FDDDB5",
-"G.    c #FDAA45",
-"H.    c #FD9E29",
-"I.    c #FD9A21",
-"J.    c #FF9311",
-"K.    c #FF971C",
-"L.    c #FF9E2C",
-"M.    c #FFA53C",
-"N.    c #FFBB71",
-"O.    c #FDC68C",
-"P.    c #000408",
-"Q.    c #060408",
-"R.    c #2E5CB9",
-"S.    c #070B07",
-"T.    c #010308",
-"U.    c #15164D",
-"V.    c #3C72DE",
-"W.    c #4075DE",
-"X.    c #0D0930",
-"Y.    c #000405",
-"Z.    c #0F123A",
-"`.    c #4175E6",
-" +    c #3975DE",
-".+    c #040808",
-"++    c #290C4A",
-"@+    c #FDF9F4",
-"#+    c #FDE9D1",
-"$+    c #FDA53D",
-"%+    c #FDAB4A",
-"&+    c #FDB158",
-"*+    c #FDB765",
-"=+    c #FDCA91",
-"-+    c #02040F",
-";+    c #3165C6",
-">+    c #3971DE",
-",+    c #3D73E2",
-"'+    c #1E4B85",
-")+    c #08010A",
-"!+    c #0D114D",
-"~+    c #3E73E3",
-"{+    c #3C72E1",
-"]+    c #3A75DF",
-"^+    c #3C76E1",
-"/+    c #080A1D",
-"(+    c #080729",
-"_+    c #3D73DE",
-":+    c #346BC7",
-"<+    c #080408",
-"[+    c #141414",
-"}+    c #D3C2AF",
-"|+    c #FDEBD5",
-"1+    c #FDEDDA",
-"2+    c #FDEEDD",
-"3+    c #FDEFE0",
-"4+    c #FDF2E7",
-"5+    c #0C1010",
-"6+    c #A43936",
-"7+    c #40456E",
-"8+    c #3D71DE",
-"9+    c #3C71E1",
-"0+    c #1C2684",
-"a+    c #3E74E3",
-"b+    c #001208",
-"c+    c #07041F",
-"d+    c #366ED8",
-"e+    c #3E75E3",
-"f+    c #4075E5",
-"g+    c #4175E5",
-"h+    c #3C76DE",
-"i+    c #3766D2",
-"j+    c #383C49",
-"k+    c #7B2F7E",
-"l+    c #DACCBB",
-"m+    c #1C1620",
-"n+    c #F65E5C",
-"o+    c #AE3E37",
-"p+    c #13040E",
-"q+    c #3D71E2",
-"r+    c #3C6ACD",
-"s+    c #080D2A",
-"t+    c #2C4BA4",
-"u+    c #3E74DE",
-"v+    c #2F61BD",
-"w+    c #030403",
-"x+    c #3A71DE",
-"y+    c #112022",
-"z+    c #33C139",
-"A+    c #41E641",
-"B+    c #BE9C73",
-"C+    c #F6EEE6",
-"D+    c #140C14",
-"E+    c #F65D5C",
-"F+    c #F66368",
-"G+    c #EA5555",
-"H+    c #1C0610",
-"I+    c #3E66C1",
-"J+    c #04110C",
-"K+    c #030408",
-"L+    c #070008",
-"M+    c #366FD5",
-"N+    c #4072DE",
-"O+    c #0C201C",
-"P+    c #294529",
-"Q+    c #39E639",
-"R+    c #39E739",
-"S+    c #39EA39",
-"T+    c #D58C34",
-"U+    c #FDE9D2",
-"V+    c #FDFAF7",
-"W+    c #08080C",
-"X+    c #F1605C",
-"Y+    c #EF615B",
-"Z+    c #F65A55",
-"`+    c #E14F4A",
-" @    c #BB3739",
-".@    c #120A0E",
-"+@    c #3974DE",
-"@@    c #3C73E1",
-"#@    c #3C71DE",
-"$@    c #346BC3",
-"%@    c #1F232C",
-"&@    c #1B1417",
-"*@    c #3AE63A",
-"=@    c #3DE83D",
-"-@    c #39E939",
-";@    c #39DE39",
-">@    c #D57705",
-",@    c #FD9D28",
-"'@    c #FDEAD5",
-")@    c #FDECD7",
-"!@    c #FDEEDC",
-"~@    c #FDE6CC",
-"{@    c #080808",
-"]@    c #F65B57",
-"^@    c #F65850",
-"/@    c #5A1224",
-"(@    c #F25650",
-"_@    c #DD4547",
-":@    c #E0414A",
-"<@    c #300E15",
-"[@    c #3457C5",
-"}@    c #3E72E3",
-"|@    c #336EC5",
-"1@    c #273DA2",
-"2@    c #050105",
-"3@    c #39E439",
-"4@    c #3CE63C",
-"5@    c #0C4214",
-"6@    c #3BE03B",
-"7@    c #092A19",
-"8@    c #FDA133",
-"9@    c #FDA741",
-"0@    c #FDAD4E",
-"a@    c #FDB25A",
-"b@    c #FDB664",
-"c@    c #F15A4F",
-"d@    c #F5574E",
-"e@    c #08040B",
-"f@    c #040408",
-"g@    c #A53836",
-"h@    c #E54746",
-"i@    c #49131C",
-"j@    c #A73A36",
-"k@    c #08120F",
-"l@    c #349535",
-"m@    c #3EE63E",
-"n@    c #39DF39",
-"o@    c #051108",
-"p@    c #2B8A30",
-"q@    c #3FE73F",
-"r@    c #010608",
-"s@    c #FF8E07",
-"t@    c #FF9517",
-"u@    c #FF9C27",
-"v@    c #FFA338",
-"w@    c #000808",
-"x@    c #F15151",
-"y@    c #F35A55",
-"z@    c #050405",
-"A@    c #080008",
-"B@    c #8E352E",
-"C@    c #1F0C0E",
-"D@    c #24191D",
-"E@    c #39E539",
-"F@    c #40E640",
-"G@    c #27A12A",
-"H@    c #070208",
-"I@    c #39E839",
-"J@    c #3BE93B",
-"K@    c #FF8C02",
-"L@    c #FF9312",
-"M@    c #FF9A23",
-"N@    c #FFA133",
-"O@    c #FFA843",
-"P@    c #080208",
-"Q@    c #A32A3A",
-"R@    c #F75B56",
-"S@    c #F75A55",
-"T@    c #331417",
-"U@    c #000401",
-"V@    c #EF4E42",
-"W@    c #202828",
-"X@    c #3AEA3A",
-"Y@    c #030703",
-"Z@    c #102F18",
-"`@    c #083408",
-" #    c #010401",
-".#    c #9D5600",
-"+#    c #080404",
-"@#    c #AF2B38",
-"##    c #EF5A4D",
-"$#    c #25120F",
-"%#    c #16040F",
-"&#    c #070408",
-"*#    c #F25042",
-"=#    c #121A12",
-"-#    c #3AE93A",
-";#    c #39E239",
-">#    c #030808",
-",#    c #082F0D",
-"'#    c #258C26",
-")#    c #3DE63D",
-"!#    c #3EE23F",
-"~#    c #100408",
-"{#    c #FA8900",
-"]#    c #E98100",
-"^#    c #F7584E",
-"/#    c #F4584E",
-"(#    c #120B0B",
-"_#    c #050308",
-":#    c #F25246",
-"<#    c #E54845",
-"[#    c #F35144",
-"}#    c #051305",
-"|#    c #32CA32",
-"1#    c #3AE23A",
-"2#    c #030708",
-"3#    c #000407",
-"4#    c #2FB431",
-"5#    c #47135E",
-"6#    c #A45A00",
-"7#    c #F08300",
-"8#    c #FE8B00",
-"9#    c #E37C00",
-"0#    c #E88000",
-"a#    c #A05C00",
-"b#    c #CC7200",
-"c#    c #DC7B00",
-"d#    c #E37E00",
-"e#    c #F98900",
-"f#    c #10040C",
-"g#    c #C6383F",
-"h#    c #F25652",
-"i#    c #EC574D",
-"j#    c #10080C",
-"k#    c #080108",
-"l#    c #F65243",
-"m#    c #F35246",
-"n#    c #F35342",
-"o#    c #051308",
-"p#    c #18521C",
-"q#    c #25A126",
-"r#    c #011208",
-"s#    c #135424",
-"t#    c #155815",
-"u#    c #D27500",
-"v#    c #885100",
-"w#    c #774800",
-"x#    c #DC800D",
-"y#    c #DC851A",
-"z#    c #DC8B28",
-"A#    c #290814",
-"B#    c #DB4048",
-"C#    c #E15045",
-"D#    c #EA4E46",
-"E#    c #0B060C",
-"F#    c #08050B",
-"G#    c #F65446",
-"H#    c #F65346",
-"I#    c #EE5244",
-"J#    c #030E08",
-"K#    c #2BAA2B",
-"L#    c #39E339",
-"M#    c #080F08",
-"N#    c #3DDB3D",
-"O#    c #249C24",
-"P#    c #3B4B43",
-"Q#    c #D77600",
-"R#    c #DC7A00",
-"S#    c #764800",
-"T#    c #764903",
-"U#    c #764A05",
-"V#    c #774D0B",
-"W#    c #424331",
-"X#    c #5B1721",
-"Y#    c #EC5442",
-"Z#    c #EE5342",
-"`#    c #F65242",
-" $    c #10050B",
-".$    c #F35042",
-"+$    c #EA5142",
-"@$    c #D84545",
-"#$    c #081208",
-"$$    c #081C18",
-"%$    c #D07200",
-"&$    c #C46D00",
-"*$    c #D67700",
-"=$    c #DD7B00",
-"-$    c #2D232E",
-";$    c #F15245",
-">$    c #EC5142",
-",$    c #D64742",
-"'$    c #D64246",
-")$    c #DA4344",
-"!$    c #40E540",
-"~$    c #15781C",
-"{$    c #05180D",
-"]$    c #3CD83C",
-"^$    c #201A24",
-"/$    c #020406",
-"($    c #D67500",
-"_$    c #DD7900",
-":$    c #BA6702",
-"<$    c #12090B",
-"[$    c #D94045",
-"}$    c #DA4343",
-"|$    c #DB4343",
-"1$    c #DC4442",
-"2$    c #D54445",
-"3$    c #000403",
-"4$    c #3EE33E",
-"5$    c #3CE33C",
-"6$    c #010F08",
-"7$    c #08100C",
-"8$    c #6D1D26",
-"9$    c #D64544",
-"0$    c #39E53A",
-"a$    c #33D336",
-"b$    c #292731",
-"c$    c #170312",
-"d$    c #DC4443",
-"e$    c #DC4643",
-"f$    c #060C0B",
-"g$    c #1C0A0E",
-"h$    c #080B0F",
-"i$    c #C5413F",
-"j$    c #000708",
-"k$    c #0F4316",
-"l$    c #0A0E12",
-"m$    c #251140",
-"n$    c #180F3E",
-"o$    c #573666",
+"5     c #F9BA78",
+"6     c #040404",
+"7     c #D78C33",
+"8     c #F9A849",
+"9     c #FDA947",
+"0     c #FFAF54",
+"a     c #FFB664",
+"b     c #FFBD74",
+"c     c #FFC07E",
+"d     c #DDAB76",
+"e     c #050505",
+"f     c #181818",
+"g     c #C3A887",
+"h     c #E1C6A6",
+"i     c #F3B369",
+"j     c #FAB667",
+"k     c #FCBE77",
+"l     c #FFC688",
+"m     c #FFD09F",
+"n     c #E3CBB4",
+"o     c #393939",
+"p     c #343434",
+"q     c #C2B5A5",
+"r     c #D7D3CF",
+"s     c #DBCEBF",
+"t     c #E7D9C9",
+"u     c #F3E6D7",
+"v     c #FFF3E6",
+"w     c #FFF5EC",
+"x     c #F9F4F0",
+"y     c #CDBDAE",
+"z     c #232323",
+"A     c #1D1D1D",
+"B     c #B49B7B",
+"C     c #D1CECA",
+"D     c #D6D6D6",
+"E     c #D6D5D5",
+"F     c #E3E2E2",
+"G     c #F1F0F0",
+"H     c #FFFEFE",
+"I     c #DDD2C9",
+"J     c #212121",
+"K     c #1B1B1B",
+"L     c #BFAE99",
+"M     c #D6D5D4",
+"N     c #E3E3E3",
+"O     c #F1F1F1",
+"P     c #FFFFFF",
+"Q     c #E3DAD1",
+"R     c #3E3E3E",
+"S     c #C3A57F",
+"T     c #DBCBB8",
+"U     c #D7D4D0",
+"V     c #FFFCFA",
+"W     c #F9EDE2",
+"X     c #CDB79F",
+"Y     c #1C1C1C",
+"Z     c #070707",
+"`     c #DD851A",
+" .    c #F3A240",
+"..    c #E1C3A0",
+"+.    c #DDCBB7",
+"@.    c #E7D8C6",
+"#.    c #F3E5D4",
+"$.    c #FFF1E2",
+"%.    c #FFF2E5",
+"&.    c #FFECD9",
+"*.    c #DDAC7A",
+"=.    c #CD7000",
+"-.    c #F98800",
+";.    c #FD8E07",
+">.    c #F99C2C",
+",.    c #F8A340",
+"'.    c #FAAC50",
+").    c #FCB460",
+"!.    c #FFBC70",
+"~.    c #FFC27D",
+"{.    c #FFC687",
+"].    c #DD7900",
+"^.    c #FF8C00",
+"/.    c #FF910E",
+"(.    c #FF981E",
+"_.    c #FF9F2E",
+":.    c #FFA63F",
+"<.    c #FFAD4F",
+"[.    c #FFB45F",
+"}.    c #FFBB70",
+"|.    c #101439",
+"1.    c #11245A",
+"2.    c #FF8F09",
+"3.    c #FF9619",
+"4.    c #FF9D2A",
+"5.    c #FFA43A",
+"6.    c #FFAB4A",
+"7.    c #FFB25B",
+"8.    c #FFB96B",
+"9.    c #0C1A1D",
+"0.    c #080F1A",
+"a.    c #030911",
+"b.    c #121944",
+"c.    c #4071E5",
+"d.    c #1E3B62",
+"e.    c #030208",
+"f.    c #E37C00",
+"g.    c #FF8D04",
+"h.    c #FF9415",
+"i.    c #FF9B25",
+"j.    c #FFA235",
+"k.    c #FFA946",
+"l.    c #FFB056",
+"m.    c #FFB766",
+"n.    c #FFBE77",
+"o.    c #010408",
+"p.    c #080C20",
+"q.    c #24408D",
+"r.    c #4171E1",
+"s.    c #3A71DF",
+"t.    c #3E71DE",
+"u.    c #3976DE",
+"v.    c #070108",
+"w.    c #C87817",
+"x.    c #F3921C",
+"y.    c #FD8E05",
+"z.    c #FF9210",
+"A.    c #FF9920",
+"B.    c #FFA031",
+"C.    c #FFA741",
+"D.    c #F9BB7B",
+"E.    c #CD9F6E",
+"F.    c #080808",
+"G.    c #040608",
+"H.    c #08051D",
+"I.    c #0C223E",
+"J.    c #080720",
+"K.    c #050408",
+"L.    c #070407",
+"M.    c #070007",
+"N.    c #030308",
+"O.    c #315FB0",
+"P.    c #3972DE",
+"Q.    c #193067",
+"R.    c #050108",
+"S.    c #E1C199",
+"T.    c #F3A03B",
+"U.    c #F89824",
+"V.    c #F9961D",
+"W.    c #FD9110",
+"X.    c #FF971C",
+"Y.    c #FF9E2C",
+"Z.    c #FFA53C",
+"`.    c #FFBB71",
+" +    c #FFC88D",
+".+    c #000408",
+"++    c #060408",
+"@+    c #2E5CB9",
+"#+    c #070B07",
+"$+    c #010308",
+"%+    c #15164D",
+"&+    c #3C72DE",
+"*+    c #4075DE",
+"=+    c #0D0930",
+"-+    c #000405",
+";+    c #0F123A",
+">+    c #4175E6",
+",+    c #3975DE",
+"'+    c #040808",
+")+    c #290C4A",
+"!+    c #D7D3CE",
+"~+    c #DBCBB7",
+"{+    c #DDC9B1",
+"]+    c #FAA239",
+"^+    c #FCAA49",
+"/+    c #FFB259",
+"(+    c #FFB866",
+"_+    c #FFBE74",
+":+    c #FFCB92",
+"<+    c #02040F",
+"[+    c #3165C6",
+"}+    c #3971DE",
+"|+    c #3D73E2",
+"1+    c #1E4B85",
+"2+    c #08010A",
+"3+    c #0D114D",
+"4+    c #3E73E3",
+"5+    c #3C72E1",
+"6+    c #3A75DF",
+"7+    c #3C76E1",
+"8+    c #080A1D",
+"9+    c #080729",
+"0+    c #3D73DE",
+"a+    c #346BC7",
+"b+    c #080408",
+"c+    c #BEAE99",
+"d+    c #E7D5BF",
+"e+    c #F3E2CE",
+"f+    c #FFEFDC",
+"g+    c #FFF0DF",
+"h+    c #FFF4E9",
+"i+    c #0C1010",
+"j+    c #A43936",
+"k+    c #40456E",
+"l+    c #3D71DE",
+"m+    c #3C71E1",
+"n+    c #1C2684",
+"o+    c #3E74E3",
+"p+    c #001208",
+"q+    c #07041F",
+"r+    c #366ED8",
+"s+    c #3E75E3",
+"t+    c #4075E5",
+"u+    c #4175E5",
+"v+    c #3C76DE",
+"w+    c #3766D2",
+"x+    c #383C49",
+"y+    c #7B2F7E",
+"z+    c #C2B4A2",
+"A+    c #1C1620",
+"B+    c #F65E5C",
+"C+    c #AE3E37",
+"D+    c #13040E",
+"E+    c #3D71E2",
+"F+    c #3C6ACD",
+"G+    c #080D2A",
+"H+    c #2C4BA4",
+"I+    c #3E74DE",
+"J+    c #2F61BD",
+"K+    c #030403",
+"L+    c #3A71DE",
+"M+    c #112022",
+"N+    c #33C139",
+"O+    c #41E641",
+"P+    c #B89368",
+"Q+    c #D2CCC3",
+"R+    c #140C14",
+"S+    c #F76368",
+"T+    c #EA5555",
+"U+    c #1C0610",
+"V+    c #3F67C3",
+"W+    c #04110C",
+"X+    c #030408",
+"Y+    c #070008",
+"Z+    c #366FD5",
+"`+    c #4072DE",
+" @    c #0C201C",
+".@    c #294529",
+"+@    c #39E639",
+"@@    c #39E739",
+"#@    c #39EA39",
+"$@    c #D3882D",
+"%@    c #DCC9B1",
+"&@    c #FFFCF9",
+"*@    c #08080C",
+"=@    c #F1615D",
+"-@    c #EF615B",
+";@    c #F65A55",
+">@    c #E14F4A",
+",@    c #BB3739",
+"'@    c #120A0E",
+")@    c #3974DE",
+"!@    c #3C73E1",
+"~@    c #3C71DE",
+"{@    c #346BC3",
+"]@    c #1F232C",
+"^@    c #1B1417",
+"/@    c #3AE63A",
+"(@    c #3DE83D",
+"_@    c #39E939",
+":@    c #39DE39",
+"<@    c #DB7B04",
+"[@    c #F89823",
+"}@    c #E7D4BC",
+"|@    c #F3E0CB",
+"1@    c #FFEDD9",
+"2@    c #FFEEDC",
+"3@    c #FFEFDE",
+"4@    c #FFE8CD",
+"5@    c #F75B57",
+"6@    c #F65850",
+"7@    c #5A1224",
+"8@    c #F35750",
+"9@    c #DF4548",
+"0@    c #E0414A",
+"a@    c #300E15",
+"b@    c #3457C5",
+"c@    c #3E72E3",
+"d@    c #336EC5",
+"e@    c #273DA2",
+"f@    c #050105",
+"g@    c #39E439",
+"h@    c #3CE63C",
+"i@    c #0C4214",
+"j@    c #3BE03B",
+"k@    c #092A19",
+"l@    c #FA9A26",
+"m@    c #FCA031",
+"n@    c #FFA842",
+"o@    c #FFAE4F",
+"p@    c #FFB35C",
+"q@    c #FFB765",
+"r@    c #F15A4F",
+"s@    c #F5574E",
+"t@    c #08040B",
+"u@    c #040408",
+"v@    c #A53936",
+"w@    c #E84746",
+"x@    c #49131C",
+"y@    c #A73A36",
+"z@    c #08120F",
+"A@    c #349535",
+"B@    c #3EE63E",
+"C@    c #39DF39",
+"D@    c #051108",
+"E@    c #2B8A30",
+"F@    c #3FE73F",
+"G@    c #010608",
+"H@    c #FF8E07",
+"I@    c #FF9517",
+"J@    c #FF9C27",
+"K@    c #FFA338",
+"L@    c #000808",
+"M@    c #F15151",
+"N@    c #F35A55",
+"O@    c #050405",
+"P@    c #080008",
+"Q@    c #8E352E",
+"R@    c #1F0C0E",
+"S@    c #24191D",
+"T@    c #39E539",
+"U@    c #40E640",
+"V@    c #27A12A",
+"W@    c #070208",
+"X@    c #39E839",
+"Y@    c #3BE93B",
+"Z@    c #FF8C02",
+"`@    c #FF9312",
+" #    c #FF9A23",
+".#    c #FFA133",
+"+#    c #FFA843",
+"@#    c #080208",
+"##    c #A32A3A",
+"$#    c #F75B56",
+"%#    c #F75A55",
+"&#    c #331417",
+"*#    c #000401",
+"=#    c #F14F42",
+"-#    c #202828",
+";#    c #3AEA3A",
+">#    c #030703",
+",#    c #102F18",
+"'#    c #083408",
+")#    c #010401",
+"!#    c #B16100",
+"~#    c #080404",
+"{#    c #AF2B38",
+"]#    c #EF5A4D",
+"^#    c #25120F",
+"/#    c #16040F",
+"(#    c #070408",
+"_#    c #F35042",
+":#    c #121A12",
+"<#    c #3AE93A",
+"[#    c #39E239",
+"}#    c #030808",
+"|#    c #082F0D",
+"1#    c #258C26",
+"2#    c #3DE63D",
+"3#    c #3EE23F",
+"4#    c #100408",
+"5#    c #FA8900",
+"6#    c #F7584E",
+"7#    c #F4584E",
+"8#    c #120B0B",
+"9#    c #050308",
+"0#    c #F35246",
+"a#    c #E64845",
+"b#    c #F35144",
+"c#    c #051305",
+"d#    c #32CA32",
+"e#    c #3AE23A",
+"f#    c #030708",
+"g#    c #000407",
+"h#    c #2FB431",
+"i#    c #47135E",
+"j#    c #B66300",
+"k#    c #F38500",
+"l#    c #FE8B00",
+"m#    c #E97F00",
+"n#    c #E88000",
+"o#    c #A05C00",
+"p#    c #10040C",
+"q#    c #C7383F",
+"r#    c #F75A54",
+"s#    c #F15B50",
+"t#    c #10080C",
+"u#    c #080108",
+"v#    c #F65243",
+"w#    c #F45246",
+"x#    c #F35342",
+"y#    c #051308",
+"z#    c #18521C",
+"A#    c #25A126",
+"B#    c #011208",
+"C#    c #135424",
+"D#    c #155815",
+"E#    c #F98900",
+"F#    c #D27500",
+"G#    c #885100",
+"H#    c #774800",
+"I#    c #290814",
+"J#    c #DB4048",
+"K#    c #E15045",
+"L#    c #EA4E46",
+"M#    c #0B060C",
+"N#    c #08050B",
+"O#    c #F65446",
+"P#    c #F65346",
+"Q#    c #EF5344",
+"R#    c #030E08",
+"S#    c #2BAA2B",
+"T#    c #030303",
+"U#    c #39E339",
+"V#    c #080F08",
+"W#    c #3DDB3D",
+"X#    c #249C24",
+"Y#    c #3B4B43",
+"Z#    c #DF7A00",
+"`#    c #DE7B00",
+" $    c #DC7B00",
+".$    c #CC7200",
+"+$    c #764800",
+"@$    c #764903",
+"#$    c #764A05",
+"$$    c #774D0B",
+"%$    c #424331",
+"&$    c #5B1721",
+"*$    c #EC5442",
+"=$    c #EE5342",
+"-$    c #F65242",
+";$    c #10050B",
+">$    c #F45042",
+",$    c #EB5242",
+"'$    c #DA4645",
+")$    c #081208",
+"!$    c #081C18",
+"~$    c #D97700",
+"{$    c #CB7000",
+"]$    c #D87800",
+"^$    c #DD7B00",
+"/$    c #E37E00",
+"($    c #2D232E",
+"_$    c #F15345",
+":$    c #ED5242",
+"<$    c #DB4944",
+"[$    c #DC4448",
+"}$    c #E24546",
+"|$    c #40E540",
+"1$    c #15781C",
+"2$    c #05180D",
+"3$    c #3CD83C",
+"4$    c #201A24",
+"5$    c #020406",
+"6$    c #DE7900",
+"7$    c #E47D00",
+"8$    c #C76E02",
+"9$    c #12090B",
+"0$    c #DC4146",
+"a$    c #DF4444",
+"b$    c #E34645",
+"c$    c #E54644",
+"d$    c #E04748",
+"e$    c #000403",
+"f$    c #3EE33E",
+"g$    c #3CE33C",
+"h$    c #010F08",
+"i$    c #08100C",
+"j$    c #6E1D26",
+"k$    c #E54746",
+"l$    c #E64745",
+"m$    c #E14847",
+"n$    c #39E53A",
+"o$    c #33D336",
+"p$    c #292731",
+"q$    c #170312",
+"r$    c #E84A46",
+"s$    c #060C0B",
+"t$    c #1C0A0E",
+"u$    c #080B0F",
+"v$    c #CA4341",
+"w$    c #000708",
+"x$    c #0F4316",
+"y$    c #0A0E12",
+"z$    c #251140",
+"A$    c #180F3E",
+"B$    c #593769",
 "                                                                                                ",
 "                                                                                                ",
 "                                                                                                ",
@@ -527,39 +540,39 @@ static char * gvlc_xpm[] = {
 "                                . ! ~ { ] ^ / .                                                 ",
 "                                . ( _ : < ^ [ .                                                 ",
 "                              . } | 1 2 3 4 5 ) .                                               ",
-"                              6 7 8 1 9 0 a b c d                                               ",
-"                              e f g h i j k l m n                                               ",
-"                              o p q r s r t u v w x                                             ",
-"                            x y z A B B B B B B C D                                             ",
-"                            D E F A A A A A A B G H                                             ",
-"                            e I J q B B B B B K L M D                                           ",
-"                            N O P Q R S s r T U l V 6                                           ",
-"                          . W X Y Z `  ...+.@.#.$.[ .                                           ",
-"                          . %.&.&.*.=.-.;.>.,.'.^ 5 ) .             ).  !.                      ",
-"                          . %.&.&.~.{.].^./.(._.^ ^ / .         :.<.[.}.|.1.2.                  ",
-"                          . 3.&.&.4.5.6.7.8.9.0.a.^ [ .       b.c.d.e.|.f.g.h.i.                ",
-"                        N j.k.l.&.&.m.n.o.p.~ { ] ^ q.r.s.t.u.|.v.w.x.y.z.A.B.C.D.E.            ",
-"                        e I F.G.H.I.J.K.L.M._ : N.O.l P.Q.R.C.S.T.U.V.W.|.X.Y.Z.`. +.+++        ",
-"                        D E @+J #+F.P $+%+&+*+h =+U -+;+>+,+'+)+!+~+{+f.]+^+/+(+|.^+_+:+<+      ",
-"                        [+}+B B B q J |+R 1+2+3+4+5+6+7+C.8+9+z.0+h.a+b+c+d+e+f+g+h+_+i+j+k+    ",
-"                        H l+B A A A B B B B B B B m+n+o+p+q+^+r+s+t+u+v+b.w+9+C.x+{+y+z+A+      ",
-"                      D B+C+B B B A A A A A A A A D+E+F+G+H+I+f.J+K+E.L+y.M+u+N+O+P+Q+R+S+      ",
-"                      6 T+F.#+U+J q B B B B B B V+W+X+Y+Z+`+ @.@+@@@#@]+`.$@%@&@*@R+=@-@;@      ",
-"                      . >@I.,@H.G.F.#+U+'@)@1+!@~@{@]@^@/@(@_@:@<@[@}@|@1@2@3@Q+Q+4@5@6@7@      ",
-"                      . 3.&.&.&.l.I.,@H.8@9@0@a@b@W+c@d@e@f@g@h@i@j@<+k@l@R+m@n@S+o@p@q@r@      ",
-"                    . W X &.&.&.&.&.&.&.s@t@u@v@1 w@x@y@K+P.z@A@B@C@D@E@F@P.G@Q+H@E.I@J@<+      ",
-"                  . . %.&.&.&.&.&.&.&.&.K@L@M@N@O@P@Q@R@S@T@2@U@i.V@W@X@Q+Y@Z@`@ #R+=@-@P.      ",
-"              . . .#. %.&.&.&.&.&.&.&.&.&.*.=.-.;.+#@###S@$#2@%#&#*#=#-#;#>#,# #'#R+)#!#~#      ",
-"              W 3.%.. 3.{#]#{#&.&.&.&.&.&.~.{.].^.~#Q@^#/#(#_#:#<#[#}#|#1#Y@2#3#b.Q+3@4#5#      ",
-"          . 6#7#8#X 9#X 0#a#b#c#d#e#&.&.&.4.5.6.7.f#g#h#i#j#k#l#m#n#o#*@Q+w+p#q#r#2#s#t#        ",
-"          . . W %.%.3.X e#u#v#w#v#b#c#c#c#c#x#y#z#A#B#C#D#E#F#G#H#I#J#*@K#6 L#n@Q+M#N#O#P#      ",
-"              . . . . W %.Q#R#c#b#v#w#S#S#S#T#U#V#W#X#Y#Z#`# $.$+$@$E.Q+K#E.4@R+*@-@I@#$$$      ",
-"                    . . . . W %.%$&$*$c#c#c#c#c#=$d#-$<+;$*#>$,$'$)$E.!$~${$4@*@S+]$^$/$        ",
-"                . . . . . . . . . . W %.($_$X &.&.X 3.:$<$[$}$|$1$2$3$F@X@4$5$Q+6$E.            ",
-"                . . . . . . . . . . . . . . W %.%.W . . . 7$8$|$1$9$Y.Q+0$Q+a$T.                ",
-"                . . . . . . . . . . . . . . . . . . . . . . b$c$d$e$k#!$Q+f$g$                  ",
-"                        . . . . . . . . . . . . . . . . . . . . h$i$j$k$<+                      ",
-"                              . . . . . . . . . . . . . . . . .   l$m$n$                        ",
-"                                      . . . . . . . . . .           o$                          ",
-"                                              . . . .                                           ",
+"                              6 7 8 9 0 a b c d e                                               ",
+"                              f g h i j k l m n o                                               ",
+"                              p q r s t u v w x y z                                             ",
+"                            A B C D E F G H H H I J                                             ",
+"                            K L M D D N O P P H Q R                                             ",
+"                            f S T U E F G H H V W X Y                                           ",
+"                            Z `  ...+.@.#.$.%.&.m *.e                                           ",
+"                          . =.-.;.>.,.'.).!.~.{.c [ .                                           ",
+"                          . ].^.^./.(._.:.<.[.}.^ 5 ) .             |.  1.                      ",
+"                          . ].^.^.2.3.4.5.6.7.8.^ ^ / .         9.0.a.b.c.d.e.                  ",
+"                          . f.^.^.g.h.i.j.k.l.m.n.^ [ .       o.p.q.r.c.s.t.u.v.                ",
+"                        Z w.x.y.^.^.z.A.B.C.~ { ] ^ D.E.F.G.H.c.I.J.K.L.M.N.O.P.Q.R.            ",
+"                        f S S.T.U.V.W.X.Y.Z._ : `. +m .+++@+P.#+$+%+&+*+c.=+-+;+>+,+'+)+        ",
+"                        K L !+~+{+S. .]+^+/+(+_+:+&.<+[+}+|+1+2+3+4+5+s.6+7+8+9+c.7+0+a+b+      ",
+"                        K c+E E E r T d+e+f+g+$.h+i+j+k+P.l+m+M.n+u.o+p+q+r+s+t+u+v+0+w+x+y+    ",
+"                        p z+E D D D E F G H H H H A+B+C+D+E+7+F+G+H+I+J+o.K+m+P.L+5+M+N+O+      ",
+"                      f P+Q+E E E D D N O P P P P R+B+S+T+U+V+s.W+X+R.Y+L.Z+I+`+ @.@+@@@#@      ",
+"                      6 $@S.{+%@~+r E F G H H H &@*@=@-@;@>@,@'@)@!@~@6+>+{@]@^@/@@@(@_@:@      ",
+"                      . <@V.[@U.T.S.{+}@|@1@2@3@4@F.5@6@7@8@9@0@a@b@c@d@e@f@g@+@+@h@i@j@k@      ",
+"                      . f.^.^.^.y.V.[@l@m@n@o@p@q@*@r@s@t@u@v@w@x@y@b+z@A@@@B@C@#@D@E@F@G@      ",
+"                    . =.-.^.^.^.^.^.^.^.H@I@J@K@1 L@M@N@X+.+O@P@Q@R@S@T@U@.+V@+@W@R.X@Y@b+      ",
+"                  . . ].^.^.^.^.^.^.^.^.Z@`@ #.#+#@###$#%#&#f@*#v.=#-#;#+@>#,#'#)#@@(@_@.+      ",
+"              . . !#. ].^.^.^.^.^.^.^.^.^./.(._.:.~#{#]#%#^#f@/#(#_#:#<#[#}#|#)#1#@@2#3#4#      ",
+"            . =.f.].. f.5#^.5#^.^.^.^.^.^.2.3.4.5.4###6#7#8#9#0#a#b#c#d#e#>#f#g#o.+@g@h#i#      ",
+"          . j#k#l#-.m#-.n#o#^.^.^.^.^.^.^.g.h.i.j.p#q#r#s#t#u#v#w#x#y#/@+@K+z#A#B#f#C#D#        ",
+"          . . =.].].f.-.E#F#G#H#G#^.^.^.^.^.z.A.B.I#J#K#L#M#N#O#P#Q#R#/@S#T#U#C@+@V#W#X#Y#      ",
+"              . . . . =.].Z#`# $.$G#H#+$+$+$@$#$$$%$&$*$=$-$;$>$,$'$R.+@S#R.h@@@/@_@X@)$!$      ",
+"                . . . . . . =.].~${$]$ $ $ $ $ $^$/$($b+_$_#:$<$[$}$R.|$1$2$h@/@#@3$4$5$        ",
+"                . . . . . . . . . . =.].6$7$-.^.^.-.f.8$9$0$a$b$c$d$e$U@;#f$g$+@h$R.            ",
+"                  . . . . . . . . . . . . . =.].].=.. . . i$j$k$l$m$-++@n$+@o$$+                ",
+"                        . . . . . . . . . . . . . . . . . . p$q$w@r$u#|$+@s$t$                  ",
+"                              . . . . . . . . . . . . . . . . . u$v$w$x$b+                      ",
+"                                      . . . . . . . . . .         y$z$A$                        ",
+"                                              . . . .               B$                          ",
+"                                                                                                ",
 "                                                                                                "};
index f03792b..9f64c0d 100644 (file)
Binary files a/share/kvlc.png and b/share/kvlc.png differ
index 940a8d7..123f592 100644 (file)
 /* XPM */
 static char * kvlc_xpm[] = {
-"48 48 125 2",
+"48 48 295 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 #030303",
-"<     c #FDFDFD",
-"[     c #D0D0D0",
-"}     c #F8F8F8",
-"|     c #B9B9B9",
-"1     c #F4F3F3",
-"2     c #9F9F9F",
-"3     c #8C8C8C",
-"4     c #F4F4F4",
-"5     c #EEEEEE",
-"6     c #EBEBEB",
-"7     c #585858",
-"8     c #878787",
-"9     c #F7F7F7",
-"0     c #C4C4C4",
-"a     c #EFEEEE",
-"b     c #FBFBFB",
-"c     c #A2A2A2",
-"d     c #D2D2D2",
-"e     c #E5E5E5",
-"f     c #E6E6E6",
-"g     c #FEA840",
-"h     c #FDECD9",
-"i     c #C2B2A0",
-"j     c #AAAAAA",
-"k     c #DBDBDB",
-"l     c #E0E0E0",
-"m     c #F3F3F3",
-"n     c #FD9E2B",
-"o     c #C1771E",
-"p     c #A0A0A0",
-"q     c #BDBDBD",
-"r     c #F5F5F5",
-"s     c #323232",
-"t     c #C7C7C7",
-"u     c #FDFDFB",
-"v     c #DEDEDE",
-"w     c #DF8315",
-"x     c #919191",
-"y     c #FEFEF7",
-"z     c #7B7B7B",
-"A     c #F2F2F2",
-"B     c #FEFEEB",
-"C     c #FEFED9",
-"D     c #FCFCFC",
-"E     c #EAEAEA",
-"F     c #EFEFEF",
-"G     c #C2C2C2",
-"H     c #FEF9C3",
-"I     c #FEE3A6",
-"J     c #ABABAB",
-"K     c #8F5E23",
-"L     c #9C9C9C",
-"M     c #FBDE94",
-"N     c #FBC87A",
-"O     c #A9763C",
-"P     c #F68701",
-"Q     c #C96E01",
-"R     c #693A02",
-"S     c #E8B465",
-"T     c #CC9350",
-"U     c #64503B",
-"V     c #0B0B0B",
-"W     c #BBBBBB",
-"X     c #D7A365",
-"Y     c #C8904B",
-"Z     c #C3AD91",
-"`     c #F0F0F0",
-" .    c #68461E",
-"..    c #CECECE",
-"+.    c #AF8357",
-"@.    c #DFD9D4",
-"#.    c #818181",
-"$.    c #D8D8D8",
-"%.    c #FB8A02",
-"&.    c #E2E2E2",
-"*.    c #D1D1D1",
-"=.    c #DDD6CF",
-"-.    c #B98B5E",
-";.    c #C39E78",
-">.    c #E6DBD0",
-",.    c #D4D4D4",
-"'.    c #777777",
-").    c #111111",
-"!.    c #ED8407",
-"~.    c #DFDFDF",
-"{.    c #CDCDCD",
-"].    c #787878",
-"^.    c #989898",
-"/.    c #CBCBCB",
-"(.    c #BFBFBF",
-"_.    c #8E8E8E",
-":.    c #FE8B01",
-"<.    c #1C1C1C",
-"[.    c #7D7D7D",
-"}.    c #747474",
-"|.    c #A3A3A3",
-"1.    c #939393",
-"2.    c #686868",
-"3.    c #D6D6D6",
-"4.    c #A7A7A7",
+"+     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 #050505",
+"`     c #FF8F09",
+" .    c #FF9619",
+"..    c #FF9D2A",
+"+.    c #FFA43A",
+"@.    c #FFB25B",
+"#.    c #FFB96B",
+"$.    c #FDFDFD",
+"%.    c #FEFEFE",
+"&.    c #FCFCFC",
+"*.    c #E4E4E4",
+"=.    c #FF8D04",
+"-.    c #FF9415",
+";.    c #FF9B25",
+">.    c #FFA235",
+",.    c #747474",
+"'.    c #DADADA",
+").    c #0B0B0B",
+"!.    c #F9961D",
+"~.    c #FD8E05",
+"{.    c #FF9210",
+"].    c #FF9920",
+"^.    c #FFA031",
+"/.    c #A5A5A5",
+"(.    c #AFAFAE",
+"_.    c #6B6156",
+":.    c #7E7E7E",
+"<.    c #C6C6C6",
+"[.    c #F7F7F7",
+"}.    c #868686",
+"|.    c #E1C199",
+"1.    c #F3A03B",
+"2.    c #F89824",
+"3.    c #FD9110",
+"4.    c #FF971C",
+"5.    c #FF9E2C",
+"6.    c #B6B5B3",
+"7.    c #F4F4F4",
+"8.    c #FAFAFA",
+"9.    c #CACACA",
+"0.    c #505050",
+"a.    c #FBFBFB",
+"b.    c #AAAAAA",
+"c.    c #D7D3CE",
+"d.    c #DBCBB7",
+"e.    c #FAA239",
+"f.    c #FCAA49",
+"g.    c #FFB259",
+"h.    c #FFB866",
+"i.    c #ADADAC",
+"j.    c #EAEAEA",
+"k.    c #4B4B4B",
+"l.    c #919191",
+"m.    c #D7D7D7",
+"n.    c #DCC9B1",
+"o.    c #E7D5BF",
+"p.    c #F3E2CE",
+"q.    c #FFEFDC",
+"r.    c #FFF0DF",
+"s.    c #F7E9DA",
+"t.    c #989898",
+"u.    c #E5E5E5",
+"v.    c #B8B8B8",
+"w.    c #BABABA",
+"x.    c #FEFDFD",
+"y.    c #CCCCCC",
+"z.    c #A6A6A6",
+"A.    c #D0D0D0",
+"B.    c #DEDEDE",
+"C.    c #222222",
+"D.    c #E6B882",
+"E.    c #D8D1C8",
+"F.    c #E6E5E5",
+"G.    c #BBBBBB",
+"H.    c #EEEEEC",
+"I.    c #F5F5F5",
+"J.    c #3E3E3E",
+"K.    c #F49E34",
+"L.    c #FFFCF9",
+"M.    c #E1E1E1",
+"N.    c #A4A09A",
+"O.    c #FEFEFC",
+"P.    c #060606",
+"Q.    c #F89823",
+"R.    c #E7D4BC",
+"S.    c #F3E0CB",
+"T.    c #FAE8D5",
+"U.    c #E8DACA",
+"V.    c #F8F8F6",
+"W.    c #FEFEFA",
+"X.    c #E9E9E9",
+"Y.    c #676767",
+"Z.    c #FA9A26",
+"`.    c #FCA031",
+" +    c #BD915D",
+".+    c #F6F6F6",
+"++    c #A9A9A9",
+"@+    c #C4C4C4",
+"#+    c #FEFEF4",
+"$+    c #FEFEE5",
+"%+    c #E0E0E0",
+"&+    c #E6E6E6",
+"*+    c #8F8F8F",
+"=+    c #FF8E07",
+"-+    c #F2F2F2",
+";+    c #E2E2E2",
+">+    c #BEBEBE",
+",+    c #C8C8C8",
+"'+    c #FEFED9",
+")+    c #FEF3BF",
+"!+    c #C1C1C1",
+"~+    c #B6B6B6",
+"{+    c #7B7B7B",
+"]+    c #FF8C02",
+"^+    c #0F0F0F",
+"/+    c #F0F0F0",
+"(+    c #B7B7B7",
+"_+    c #FEF1B5",
+":+    c #FED99B",
+"<+    c #ACA399",
+"[+    c #F8F8F8",
+"}+    c #F9F9F9",
+"|+    c #7A7A7A",
+"1+    c #C97817",
+"2+    c #8B8B8B",
+"3+    c #8C8C8C",
+"4+    c #CFCFCF",
+"5+    c #FDD794",
+"6+    c #FAC776",
+"7+    c #B47A3F",
+"8+    c #D1D1D1",
+"9+    c #6F6F6F",
+"0+    c #F88B08",
+"a+    c #D47C14",
+"b+    c #5F5F5F",
+"c+    c #DBDBDB",
+"d+    c #E1B776",
+"e+    c #E7B365",
+"f+    c #BE8446",
+"g+    c #AB753C",
+"h+    c #EDEDED",
+"i+    c #595959",
+"j+    c #FA9114",
+"k+    c #EF9122",
+"l+    c #CE822A",
+"m+    c #ACACAC",
+"n+    c #C2C2C2",
+"o+    c #E4AC61",
+"p+    c #BA8346",
+"q+    c #C38B4A",
+"r+    c #7F7F7F",
+"s+    c #FE981F",
+"t+    c #FA9C30",
+"u+    c #E1943A",
+"v+    c #C7A376",
+"w+    c #B87F41",
+"x+    c #B7864C",
+"y+    c #A4A4A4",
+"z+    c #F3F3F3",
+"A+    c #C0C0C0",
+"B+    c #A1A1A1",
+"C+    c #996D42",
+"D+    c #D9D8D7",
+"E+    c #929292",
+"F+    c #D5D5D5",
+"G+    c #9D9D9D",
+"H+    c #F58802",
+"I+    c #BDA38B",
+"J+    c #AF8055",
+"K+    c #B58251",
+"L+    c #BF966B",
+"M+    c #DAC5AF",
+"N+    c #CDCDCD",
+"O+    c #636363",
+"P+    c #777777",
+"Q+    c #D4D4D4",
+"R+    c #CECECE",
+"S+    c #707070",
+"T+    c #AFAFAF",
+"U+    c #A3A3A3",
+"V+    c #C5C5C5",
+"W+    c #ADADAD",
+"X+    c #6D655C",
+"Y+    c #B9B9B9",
+"Z+    c #C3C3C3",
+"`+    c #313131",
+" @    c #656565",
+".@    c #8D8D8D",
+"+@    c #8E8E8E",
+"@@    c #797979",
+"#@    c #080808",
+"$@    c #C7C7C7",
+"%@    c #717171",
+"&@    c #0E0E0E",
+"*@    c #515151",
+"=@    c #343434",
+"-@    c #A8A8A8",
+";@    c #727272",
+">@    c #010101",
+",@    c #070707",
+"'@    c #040404",
+")@    c #8A8A8A",
+"!@    c #B2B2B2",
+"~@    c #2E2E2E",
+"{@    c #333333",
 "                                                                                                ",
 "                                                                                                ",
 "                                                                                                ",
 "                                                                                                ",
 "                                    . . . .                                                     ",
-"                                  . + + + + .                                                   ",
-"                                . . + + + . .                                                   ",
-"                                . + . . . + .                                                   ",
-"                                . + + + + + + .                                                 ",
-"                                . + + + + + + .                                                 ",
-"                                . + + + + + + .                                                 ",
-"                              . + + + + + + + + .                                               ",
-"                              . @ @ # + + + # $ .                                               ",
-"                              . % & * = = = * - .                                               ",
-"                              . ; > , ' ' ' , ) & .                                             ",
-"                            . & ! ~ { { { { { { ] .                                             ",
-"                            . ] ^ ~ ~ ~ ~ ~ ~ { ; .                                             ",
-"                            . % ; ! { { { { { ! ] / .                                           ",
-"                            . ( * & ] ' ' ' ] & * @ .                                           ",
-"                          . + + # @ _ = = = _ @ # + .                                           ",
-"                          . + + + + + + + + + + + + + .                                         ",
-"                          . + + + + + + + + + + + + + .                                         ",
-"                          . + + + + + + + + + + + + + .                                         ",
-"                        . @ @ # + + + + + + + + + + # $ .                                       ",
-"                        . % & * = @ # + + + + + # ( * - .     . . : . .       . . .             ",
-"                        . ] > , ] & * = = = = = * & ; ) & .   . ~ < ~ .     . [ } | .           ",
-"                        . ' { { { ! , ' ' ' ' ' , ! 1 . . .   . ~ ~ ~ .   . 2 < ~ < 3 .         ",
-"                        . , { ~ ~ ~ { { { { { { { 4 . 5 6 7 . . ~ ~ ~ . . 8 9 ~ < 0 .           ",
-"                      . - ) { { { ~ ~ ~ ~ ~ ~ ~ ~ a . 9 b c d . ~ ~ ~ . . e ~ ~ f .             ",
-"                      . g & ] ' , ! { { { { { { ! h i . j k . . ~ ~ ~ . l ~ ~ m .   .           ",
-"                      . # @ _ = * & ] ' ' ' ' ] & * n o . p . . ~ ~ ~ q ~ ~ r . s .             ",
-"                      . + + + + # @ _ = = = = _ @ # + . t . u . ~ ~ ~ < ~ ~ v . .               ",
-"                    . + + + + + + + + + + + + + w . . . x . y . ~ ~ ~ l ~ ~ 9 . z . .           ",
-"                  . . + + + + + + + + + + + + + . A 5 q . B C . ~ ~ ~ . D ~ ~ E . q q .         ",
-"              . . + . + + + + + + + + + + + + + . F f G . H I . ~ ~ ~ . . r ~ ~ q . J .         ",
-"            . + + + . + + + + + + + + + + + + + K . 0 . L M N . ~ ~ ~ . O . ~ ~ b . .           ",
-"          . + + + + + + + . + + + + + + + + + + P Q R . d . S . ~ ~ ~ . T U v ~ ~ 4 .           ",
-"          . . + + + + + + + . . . + + + + + + + + + . V W . X . ~ ~ ~ . Y Z . ` ~ < 2 .         ",
-"              . . . . + + + + + + . . . . . . . . . +  .. ... . . . . . +.@.#.. $.. .           ",
-"                      . . . + + + + + + + + + + + %.. } &.. *.=.. -.;.>.,.p '.. . ).            ",
-"                            . . . . + + + + + + + !.. ~.{.#.. ].^./.(._.. . W 0 J .             ",
-"                                    . . . . + + + :.<.[.}.. . . |.. . .     . 1.2..             ",
-"                                            . . . .   . .       . 3.W .       . .               ",
-"                                                                . ..4..                         ",
-"                                                                  . .                           ",
-"                                                                                                ",
-"                                                                                                ",
+"                                  . + @ # # .                                                   ",
+"                                . . + @ # . .                                                   ",
+"                                . $ . . . % .                                                   ",
+"                                . & * = - % % .                                                 ",
+"                                . ; > , ' % % .                                                 ",
+"                                . ) ! ~ { % % .                                                 ",
+"                              . ] ^ / ( _ : % % .                                               ",
+"                              . < [ } | 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 .           ",
+"                          . + + + `  ...+.$ @.#.% % % .     . $.%.&.%..         . v *.. .       ",
+"                          . + + + =.-.;.>.& * = - . . .     . %.%.%.%..     ,.. '.%.%.%.'.. ).  ",
+"                        . !.!.~.+ + {.].^.; > , . /.(._..   . %.%.%.%.. . :.. <.$.%.%.[.}..     ",
+"                        . y |.1.2.!.3.4.5.) ! . 6.7.8.9.. . . %.%.%.%.. 0.. . a.%.%.&.b..       ",
+"                        . s c.d.s |.E e.f.g.h.. i.a.%.j.k.j.. %.%.%.%.. l.. v %.%.$.m.. .       ",
+"                        . n.n n n d z o.p.q.r.s.. t.u.v.'.w.. %.%.%.%.. . u %.%.&.m.. .         ",
+"                        . d.n m m m n o p q q x.p . . y.z.. . %.%.%.%.. A.$.%.%.B.. C.          ",
+"                      . D.E.n n n m m u v w w w %.F.. G.. H.. %.%.%.%.A.$.%.%.I.. J..           ",
+"                      . K.|.s n.d.d n o p q q q L.. M.N.. O.. %.%.%.%.%.%.%.%.v . . P.          ",
+"                      . ~.!.Q.2.1.|.s R.S.T.U.. . . y.. V.W.. %.%.%.%.X.%.%.%.a.. Y.. .         ",
+"                      . + + + + ~.!.Q.Z.`. +. '..+++@+. #+$+. %.%.%.%.. %+%.%.%.&+. *+A.. .     ",
+"                    . + + + + + + + + + =+. -+I.;+>+,+. '+)+. %.%.%.%.. . &+%.%.&.!+. z.~+{+.   ",
+"                  . . + + + + + + + + + ]+^+%+/+&+(+<.. _+:+. %.%.%.%.. . <+[+%.%.}+/.. ++|+.   ",
+"              . . + . + + + + + + + + + + 1+. 2+>+3+4+. 5+6+. %.%.%.%.. 7+. 8+%.%.%.I.9+. . .   ",
+"            . + + + . + + + + + + + + + + 0+a+. . b+c+. d+e+. %.%.%.%.. f+g+. h+%.%.%.j.i+.     ",
+"          . + + + + + + + . + + + + + + + =.j+k+l+. m+n+. o+. %.%.%.%.. p+q+. r+v %.%.%.>+.     ",
+"          . . + + + + + + + . . . + + + + + {.s+t+u+. 8+. v+. %.%.%.%.. w+x+. . y+%.%.z+. ^+    ",
+"              . . . . + + + + + + . . . . . . . . . A+B+c+. . . . . . . C+. D+E+. F+G+. .       ",
+"                      . . . + + + + + + + + + H+. &.X.b.t.*.. I+J+K+L+M+. N+z.O+P+. . P.        ",
+"                            . . . . + + + + + . ,+&+Q+R+S+. T+. . . . . U+. . <.V+W+B+.         ",
+"                                    . . . . + . X+Y+Z+|+. `+.  @.@+@.@@@. . #@. $@Y+%@.         ",
+"                                            . . &@*@=@. .     . G.y+-@;@.     #@. . . .         ",
+"                                                . . . .       . T+A.w.. >@        ,@'@          ",
+"                                                              . )@,+!@.                         ",
+"                                                                . . . ~@                        ",
+"                                                                  '@{@                          ",
 "                                                                                                "};
index cecc24e..fa063ee 100644 (file)
Binary files a/share/qvlc.png and b/share/qvlc.png differ
index 6efd342..cac0de2 100644 (file)
 /* XPM */
 static char * qvlc_xpm[] = {
-"48 48 32 1",
-"      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",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                  ....                          ",
-"                 .++++.                         ",
-"                ..+++..                         ",
-"                .+...+.                         ",
-"                .++++++.                        ",
-"                .++++++.                        ",
-"                .++++++.                        ",
-"               .++++++++.                       ",
-"               .@@#+++#$.                       ",
-"               .%&*===*-.                       ",
-"               .;>,''',)&.                      ",
-"              .&!~{{{{{{].                      ",
-"              .]^~~~~~~{;.                      ",
-"              .%;!{{{{{!]/.                     ",
-"              .(*&]''']&*@.                     ",
-"             .++#@_===_@#+.                     ",
-"             .+++++++++++++.                    ",
-"             .+++++++++++++.                    ",
-"             .+++++++++++++.                    ",
-"            .@@#++++++++++#$.  .......          ",
-"            .%&*=@#+++++#(*-...:::::::..        ",
-"            .]>,]&*=====*&;).::::::::::<.       ",
-"            .'{{{!,''''',!{.:::<.....::::.      ",
-"            .,{~~~{{{{{{{~.:::..     ..:::.     ",
-"           .-){{{~~~~~~~~{.::..     .  .::.     ",
-"           .[&]',!{{{{{{!.::}..    .:. .::|.    ",
-"           .#@_=*&]'''']&.::.+.   .:::. .::.    ",
-"           .++++#@_====_@.::.++. .:::.  .::.    ",
-"          .++++++++++++++.::.++..:::.   .::.    ",
-"         ..++++++++++++++.::.++.:::::.  .::.    ",
-"       ..+.++++++++++++++.::.+.:::.:::. .::.    ",
-"      .+++.++++++++++++++.:::.+.:.+.:::.::.     ",
-"     .+++++++.++++++++++++.::.+1.+++.:::::.     ",
-"     ..+++++++...+++++++++.:::..+++. .:::.      ",
-"       ....++++++.........+.::::.....:::::.     ",
-"           ...++++++++++++++.::::::::::.::2.    ",
-"              ....++++++++++...::::::.. .3.     ",
-"                  ....++++..   ......    .      ",
-"                      ....                      ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                ",
-"                                                "};
+"48 48 147 2",
+"      c None",
+".     c #000000",
+"+     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 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 . . . ,.,.,.,.,.,.,..             ",
+"          . + + + + + + + . + + + + + + + #.$.%.. ,.,.,.. . + + + + . ,.,.,.,.,..               ",
+"          . . + + + + + + + . . . + + + + + -.;.. ,.,.,.,.,.. . . . ,.,.,.,.,.,.,..             ",
+"              . . . . + + + + + + . . . . . . . . . ,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,..           ",
+"                      . . . + + + + + + + + + + + + . ,.,.,.,.,.,.,.,.,.,.. ,.,.,.,.,..         ",
+"                            . . . . + + + + + + + + + . . ,.,.,.,.,.,.,..   . ,.,.,..           ",
+"                                    . . . . + + + + . .   . . . . . . .       . ,..             ",
+"                                            . . . .                             .               ",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                "};
index fc1caa2..af4ba1a 100644 (file)
Binary files a/share/vlc-icons.xcf and b/share/vlc-icons.xcf differ
index 87d071e..be7a44a 100644 (file)
Binary files a/share/vlc.png and b/share/vlc.png differ
index 849ae41..86187b1 100644 (file)
 /* XPM */
 static char * vlc_xpm[] = {
-"48 48 237 2",
+"48 48 243 2",
 "      c None",
 ".     c #000000",
-"+     c #B96500",
-"@     c #D47E18",
-"#     c #CD7F24",
-"$     c #9D611C",
-"%     c #B86500",
-"&     c #BF7722",
-"*     c #9C682D",
-"=     c #A47A4F",
-"-     c #CE8838",
-";     c #DC974A",
-">     c #D69955",
-",     c #DCA366",
-"'     c #F1B474",
-")     c #C08F5C",
-"!     c #D58B36",
+"+     c #C76D00",
+"@     c #DD831A",
+"#     c #D78626",
+"$     c #B16E1F",
+"%     c #C66C00",
+"&     c #CC7F24",
+"*     c #B07633",
+"=     c #B68857",
+"-     c #D88F3B",
+";     c #E39C4C",
+">     c #DE9F58",
+",     c #E3A969",
+"'     c #F4B675",
+")     c #CD9962",
+"!     c #DD9038",
 "~     c #FFAE51",
 "{     c #FFB562",
 "]     c #FFBC72",
 "^     c #FFBF7B",
-"/     c #D59F66",
-"(     c #DC8E33",
+"/     c #DDA56A",
+"(     c #E39235",
 "_     c #FFAC4D",
 ":     c #FFB35D",
 "<     c #FFBA6D",
-"[     c #DCA46A",
-"}     c #C0751D",
-"|     c #F89E36",
+"[     c #E3AA6D",
+"}     c #CD7D1F",
+"|     c #F99F36",
 "1     c #FFAA48",
 "2     c #FFB158",
 "3     c #FFB869",
 "4     c #FFBF79",
-"5     c #F8B977",
-"6     c #030303",
-"7     c #D38A35",
-"8     c #FDAC4D",
-"9     c #FFAF54",
-"0     c #FFB664",
-"a     c #FFBD74",
-"b     c #FDBF7D",
-"c     c #D3A371",
-"d     c #020202",
-"e     c #111111",
-"f     c #D3B898",
-"g     c #FDE2C2",
-"h     c #FDBD73",
-"i     c #FDB96B",
-"j     c #FDBF78",
-"k     c #FDC587",
-"l     c #FDCF9E",
-"m     c #DAC4AE",
-"n     c #272727",
-"o     c #2A2A2A",
-"p     c #DACDBC",
-"q     c #FDF9F5",
-"r     c #FDF0E1",
-"s     c #FDEFDE",
-"t     c #FDF1E4",
-"u     c #FDF4EA",
-"v     c #F6F2ED",
-"w     c #BEB0A2",
-"x     c #171717",
-"y     c #BEA689",
-"z     c #F6F2EE",
-"A     c #FEFEFE",
-"B     c #FDFCFC",
-"C     c #D3CAC0",
-"D     c #131313",
-"E     c #D3C2AE",
-"F     c #FDFCFB",
-"G     c #DAD2C9",
-"H     c #2B2B2B",
-"I     c #D3B591",
-"J     c #FDEDD9",
-"K     c #FDFBF8",
-"L     c #F6EBDF",
-"M     c #BEAA95",
-"N     c #050505",
-"O     c #DA851D",
-"P     c #FDAC4A",
-"Q     c #FDDFBC",
-"R     c #FDECD8",
-"S     c #FDEDDB",
-"T     c #FDF1E3",
-"U     c #FDEBD7",
-"V     c #D5A675",
-"W     c #C06900",
-"X     c #F88800",
-"Y     c #FF8F08",
-"Z     c #FDA031",
-"`     c #FDA946",
-" .    c #FDAF54",
-"..    c #FDB561",
-"+.    c #FDBB6F",
-"@.    c #FDC07C",
-"#.    c #FDC485",
-"$.    c #FFC07E",
-"%.    c #D57400",
-"&.    c #FF8C00",
-"*.    c #FF910E",
-"=.    c #FF981E",
-"-.    c #FF9F2E",
-";.    c #FFA63F",
-">.    c #FFAD4F",
-",.    c #FFB45F",
-"'.    c #FFBB70",
-").    c #FF8F09",
-"!.    c #FF9619",
-"~.    c #FF9D2A",
-"{.    c #FFA43A",
-"].    c #FFAB4A",
-"^.    c #FFB25B",
-"/.    c #FFB96B",
-"(.    c #DC7800",
-"_.    c #FF8D04",
-":.    c #FF9415",
-"<.    c #FF9B25",
-"[.    c #FFA235",
-"}.    c #FFA946",
-"|.    c #FFB056",
-"1.    c #FFB766",
-"2.    c #FFBE77",
-"3.    c #BE7318",
-"4.    c #F69520",
-"5.    c #FF8F07",
-"6.    c #FF9210",
-"7.    c #FF9920",
-"8.    c #FFA031",
-"9.    c #FFA741",
-"0.    c #F6B979",
-"a.    c #BE9366",
-"b.    c #040404",
-"c.    c #FDDDB5",
-"d.    c #FDAA45",
-"e.    c #FD9E29",
-"f.    c #FD9A21",
-"g.    c #FF9311",
-"h.    c #FF971C",
-"i.    c #FF9E2C",
-"j.    c #FFA53C",
-"k.    c #FFBB71",
-"l.    c #FDC68C",
-"m.    c #FDF9F4",
-"n.    c #FDE9D1",
-"o.    c #FDA53D",
-"p.    c #FDAB4A",
-"q.    c #FDB158",
-"r.    c #FDB765",
-"s.    c #FDCA91",
-"t.    c #141414",
-"u.    c #D3C2AF",
-"v.    c #FDEBD5",
-"w.    c #FDEDDA",
-"x.    c #FDEEDD",
-"y.    c #FDEFE0",
-"z.    c #FDF2E7",
-"A.    c #FDFAF8",
-"B.    c #DACCBB",
-"C.    c #BE9C73",
-"D.    c #F6EEE6",
-"E.    c #D58C34",
-"F.    c #FDE9D2",
-"G.    c #FDFAF7",
-"H.    c #FDF3E7",
-"I.    c #FDF2E5",
-"J.    c #FDEBD8",
-"K.    c #D57705",
-"L.    c #FD9D28",
-"M.    c #FDEAD5",
-"N.    c #FDECD7",
-"O.    c #FDEEDC",
-"P.    c #FDE6CC",
-"Q.    c #FDC88C",
-"R.    c #FDC688",
-"S.    c #FDA133",
-"T.    c #FDA741",
-"U.    c #FDAD4E",
-"V.    c #FDB25A",
-"W.    c #FDB664",
-"X.    c #FFB561",
-"Y.    c #FF8E07",
-"Z.    c #FF9517",
-"`.    c #FF9C27",
-" +    c #FFA338",
-".+    c #FF8C02",
-"++    c #FF9312",
-"@+    c #FF9A23",
-"#+    c #FFA133",
-"$+    c #FFA843",
-"%+    c #9C5500",
-"&+    c #9D5600",
-"*+    c #FA8900",
-"=+    c #E98100",
-"-+    c #FABB78",
-";+    c #E9AE6D",
-">+    c #FAB05C",
-",+    c #DC8724",
-"'+    c #F08300",
-")+    c #A45A00",
-"!+    c #FE8B00",
-"~+    c #E37C00",
-"{+    c #E88000",
-"]+    c #A05C00",
-"^+    c #CC7200",
-"/+    c #DC7B00",
-"(+    c #E37E00",
-"_+    c #F98900",
-":+    c #F9A544",
-"<+    c #E39D4A",
-"[+    c #DC9E55",
-"}+    c #CC985A",
-"|+    c #A07842",
-"1+    c #C76D00",
-"2+    c #D27500",
-"3+    c #885100",
-"4+    c #774800",
-"5+    c #DC800D",
-"6+    c #DC851A",
-"7+    c #DC8B28",
-"8+    c #CC8731",
-"9+    c #885C1B",
-"0+    c #77541D",
-"a+    c #88632B",
-"b+    c #D77600",
-"c+    c #DC7A00",
-"d+    c #764800",
-"e+    c #764903",
-"f+    c #764A05",
-"g+    c #774D0B",
-"h+    c #885914",
-"i+    c #D07200",
-"j+    c #C46D00",
-"k+    c #D67700",
-"l+    c #DD7B00",
-"m+    c #DD7900",
-"n+    c #D67500",
+"5     c #F9BA78",
+"6     c #040404",
+"7     c #D78C33",
+"8     c #F9A849",
+"9     c #FDA947",
+"0     c #FFAF54",
+"a     c #FFB664",
+"b     c #FFBD74",
+"c     c #FFC07E",
+"d     c #DDAB76",
+"e     c #050505",
+"f     c #181818",
+"g     c #C3A887",
+"h     c #E1C6A6",
+"i     c #F3B369",
+"j     c #FAB667",
+"k     c #FCBE77",
+"l     c #FFC688",
+"m     c #FFD09F",
+"n     c #E3CBB4",
+"o     c #393939",
+"p     c #343434",
+"q     c #C2B5A5",
+"r     c #D7D3CF",
+"s     c #DBCEBF",
+"t     c #E7D9C9",
+"u     c #F3E6D7",
+"v     c #FFF3E6",
+"w     c #FFF5EC",
+"x     c #F9F4F0",
+"y     c #CDBDAE",
+"z     c #232323",
+"A     c #1D1D1D",
+"B     c #B49B7B",
+"C     c #D1CECA",
+"D     c #D6D6D6",
+"E     c #D6D5D5",
+"F     c #E3E2E2",
+"G     c #F1F0F0",
+"H     c #FFFEFE",
+"I     c #DDD2C9",
+"J     c #212121",
+"K     c #1B1B1B",
+"L     c #BFAE99",
+"M     c #D6D5D4",
+"N     c #E3E3E3",
+"O     c #F1F1F1",
+"P     c #FFFFFF",
+"Q     c #E3DAD1",
+"R     c #3E3E3E",
+"S     c #C3A57F",
+"T     c #DBCBB8",
+"U     c #D7D4D0",
+"V     c #FFFCFA",
+"W     c #F9EDE2",
+"X     c #CDB79F",
+"Y     c #1C1C1C",
+"Z     c #070707",
+"`     c #DD851A",
+" .    c #F3A240",
+"..    c #E1C3A0",
+"+.    c #DDCBB7",
+"@.    c #E7D8C6",
+"#.    c #F3E5D4",
+"$.    c #FFF1E2",
+"%.    c #FFF2E5",
+"&.    c #FFECD9",
+"*.    c #DDAC7A",
+"=.    c #CD7000",
+"-.    c #F98800",
+";.    c #FD8E07",
+">.    c #F99C2C",
+",.    c #F8A340",
+"'.    c #FAAC50",
+").    c #FCB460",
+"!.    c #FFBC70",
+"~.    c #FFC27D",
+"{.    c #FFC687",
+"].    c #DD7900",
+"^.    c #FF8C00",
+"/.    c #FF910E",
+"(.    c #FF981E",
+"_.    c #FF9F2E",
+":.    c #FFA63F",
+"<.    c #FFAD4F",
+"[.    c #FFB45F",
+"}.    c #FFBB70",
+"|.    c #FF8F09",
+"1.    c #FF9619",
+"2.    c #FF9D2A",
+"3.    c #FFA43A",
+"4.    c #FFAB4A",
+"5.    c #FFB25B",
+"6.    c #FFB96B",
+"7.    c #E37C00",
+"8.    c #FF8D04",
+"9.    c #FF9415",
+"0.    c #FF9B25",
+"a.    c #FFA235",
+"b.    c #FFA946",
+"c.    c #FFB056",
+"d.    c #FFB766",
+"e.    c #FFBE77",
+"f.    c #C87817",
+"g.    c #F3921C",
+"h.    c #FD8E05",
+"i.    c #FF9210",
+"j.    c #FF9920",
+"k.    c #FFA031",
+"l.    c #FFA741",
+"m.    c #F9BB7B",
+"n.    c #CD9F6E",
+"o.    c #080808",
+"p.    c #E1C199",
+"q.    c #F3A03B",
+"r.    c #F89824",
+"s.    c #F9961D",
+"t.    c #FD9110",
+"u.    c #FF971C",
+"v.    c #FF9E2C",
+"w.    c #FFA53C",
+"x.    c #FFBB71",
+"y.    c #FFC88D",
+"z.    c #D7D3CE",
+"A.    c #DBCBB7",
+"B.    c #DDC9B1",
+"C.    c #FAA239",
+"D.    c #FCAA49",
+"E.    c #FFB259",
+"F.    c #FFB866",
+"G.    c #FFBE74",
+"H.    c #FFCB92",
+"I.    c #FFF5EB",
+"J.    c #BEAE99",
+"K.    c #E7D5BF",
+"L.    c #F3E2CE",
+"M.    c #FFEFDC",
+"N.    c #FFF0DF",
+"O.    c #FFF4E9",
+"P.    c #C2B4A2",
+"Q.    c #B89368",
+"R.    c #D2CCC3",
+"S.    c #D3882D",
+"T.    c #DCC9B1",
+"U.    c #FFFCF9",
+"V.    c #FFF3E7",
+"W.    c #DB7B04",
+"X.    c #F89823",
+"Y.    c #E7D4BC",
+"Z.    c #F3E0CB",
+"`.    c #FFEDD9",
+" +    c #FFEEDC",
+".+    c #FFEFDE",
+"++    c #FFE8CD",
+"@+    c #FFC98D",
+"#+    c #FFC789",
+"$+    c #FFC78D",
+"%+    c #FA9A26",
+"&+    c #FCA031",
+"*+    c #FFA842",
+"=+    c #FFAE4F",
+"-+    c #FFB35C",
+";+    c #FFB765",
+">+    c #FFB561",
+",+    c #FF8E07",
+"'+    c #FF9517",
+")+    c #FF9C27",
+"!+    c #FFA338",
+"~+    c #FF8C02",
+"{+    c #FF9312",
+"]+    c #FF9A23",
+"^+    c #FFA133",
+"/+    c #FFA843",
+"(+    c #B06000",
+"_+    c #B16100",
+":+    c #FA8900",
+"<+    c #FABB78",
+"[+    c #E38B25",
+"}+    c #F38500",
+"|+    c #B66300",
+"1+    c #FE8B00",
+"2+    c #E97F00",
+"3+    c #E88000",
+"4+    c #A05C00",
+"5+    c #F9A544",
+"6+    c #A07842",
+"7+    c #D27300",
+"8+    c #F98900",
+"9+    c #D27500",
+"0+    c #885100",
+"a+    c #774800",
+"b+    c #885C1B",
+"c+    c #77541D",
+"d+    c #88632B",
+"e+    c #DF7A00",
+"f+    c #DE7B00",
+"g+    c #DC7B00",
+"h+    c #CC7200",
+"i+    c #764800",
+"j+    c #764903",
+"k+    c #764A05",
+"l+    c #774D0B",
+"m+    c #885914",
+"n+    c #E37E00",
+"o+    c #D97700",
+"p+    c #CB7000",
+"q+    c #D87800",
+"r+    c #DD7B00",
+"s+    c #E47D00",
+"t+    c #DE7900",
 "                                                                                                ",
 "                                                                                                ",
 "                                                                                                ",
@@ -250,39 +256,39 @@ static char * vlc_xpm[] = {
 "                                . ! ~ { ] ^ / .                                                 ",
 "                                . ( _ : < ^ [ .                                                 ",
 "                              . } | 1 2 3 4 5 ) .                                               ",
-"                              6 7 8 1 9 0 a b c d                                               ",
-"                              e f g h i j k l m n                                               ",
-"                              o p q r s r t u v w x                                             ",
-"                            x y z A B B B B B B C D                                             ",
-"                            D E F A A A A A A B G H                                             ",
-"                            e I J q B B B B B K L M D                                           ",
-"                            N O P Q R S s r T U l V 6                                           ",
-"                          . W X Y Z `  ...+.@.#.$.[ .                                           ",
-"                          . %.&.&.*.=.-.;.>.,.'.^ 5 ) .                                         ",
-"                          . %.&.&.).!.~.{.].^./.^ ^ / .                                         ",
-"                          . (.&.&._.:.<.[.}.|.1.2.^ [ .                                         ",
-"                        N 3.4.5.&.&.6.7.8.9.~ { ] ^ 0.a.b.                                      ",
-"                        e I c.d.e.f.g.h.i.j._ : k.l.l m n                                       ",
-"                        D E m.J n.c.P o.p.q.r.h s.U u v w x                                     ",
-"                        t.u.B B B q J v.R w.x.y.z.A.B B C D                                     ",
-"                        H B.B A A A B B B B B B B A A B G H                                     ",
-"                      D C.D.B B B A A A A A A A A B B K L M D                                   ",
-"                      6 E.c.n.F.J q B B B B B B G.H.I.J.l V 6                                   ",
-"                      . K.f.L.e.d.c.n.F.M.N.w.O.P.Q.R.l.$.[ .                                   ",
-"                      . (.&.&.&.5.f.L.e.S.T.U.V.W.X.< ^ ^ 5 ) .                                 ",
-"                    . W X &.&.&.&.&.&.&.Y.Z.`. +1 2 3 4 ^ ^ / . . .                             ",
-"                  . . %.&.&.&.&.&.&.&.&..+++@+#+$+9 0 a ^ ^ [ . %+% . .                         ",
-"              . . &+. %.&.&.&.&.&.&.&.&.&.*.=.-.;.>.,.'.^ ^ 5 ) . %.(.W . .                     ",
-"              W (.%.. (.*+=+*+&.&.&.&.&.&.).!.~.{.].^./.-+;+>+,+. (.&.'+)+.                     ",
-"          . )+'+!+X ~+X {+]+^+/+(+_+&.&.&._.:.<.[.:+<+[+}+|+{+X ~+X X 1+.                       ",
-"          . . W %.%.(.X _+2+3+4+3+^+/+/+/+/+5+6+7+8+9+0+a+2+_+&.X (.W .                         ",
-"              . . . . W %.b+c+/+^+3+4+d+d+d+e+f+g+h+^+/+(+_+X (.W . . .                         ",
-"                    . . . . W %.i+j+k+/+/+/+/+/+l+(+_+X m+%.W . . . . . .                       ",
-"                . . . . . . . . . . W %.n+m+X &.&.X (.W . . . . . . . . .                       ",
-"                . . . . . . . . . . . . . . W %.%.W . . . . . . . . . . .                       ",
-"                . . . . . . . . . . . . . . . . . . . . . . . . . . . .                         ",
+"                              6 7 8 9 0 a b c d e                                               ",
+"                              f g h i j k l m n o                                               ",
+"                              p q r s t u v w x y z                                             ",
+"                            A B C D E F G H H H I J                                             ",
+"                            K L M D D N O P P H Q R                                             ",
+"                            f S T U E F G H H V W X Y                                           ",
+"                            Z `  ...+.@.#.$.%.&.m *.e                                           ",
+"                          . =.-.;.>.,.'.).!.~.{.c [ .                                           ",
+"                          . ].^.^./.(._.:.<.[.}.^ 5 ) .                                         ",
+"                          . ].^.^.|.1.2.3.4.5.6.^ ^ / .                                         ",
+"                          . 7.^.^.8.9.0.a.b.c.d.e.^ [ .                                         ",
+"                        Z f.g.h.^.^.i.j.k.l.~ { ] ^ m.n.o.                                      ",
+"                        f S p.q.r.s.t.u.v.w._ : x.y.m n o                                       ",
+"                        K L z.A.B.p. .C.D.E.F.G.H.&.I.x y z                                     ",
+"                        K J.E E E r T K.L.M.N.$.O.V H H I J                                     ",
+"                        p P.E D D D E F G H H H H P P H Q R                                     ",
+"                      f Q.R.E E E D D N O P P P P H H V W X Y                                   ",
+"                      6 S.p.B.T.A.r E F G H H H U.O.V.&.m *.e                                   ",
+"                      . W.s.X.r.q.p.B.Y.Z.`. +.+++@+#+$+c [ .                                   ",
+"                      . 7.^.^.^.h.s.X.%+&+*+=+-+;+>+< ^ ^ 5 ) .                                 ",
+"                    . =.-.^.^.^.^.^.^.^.,+'+)+!+1 2 3 4 ^ ^ / . . .                             ",
+"                  . . ].^.^.^.^.^.^.^.^.~+{+]+^+/+0 a b ^ ^ [ . (+% . .                         ",
+"              . . _+. ].^.^.^.^.^.^.^.^.^./.(._.:.<.[.}.^ ^ 5 ) . ].7.=.. .                     ",
+"            . =.7.].. 7.:+^.:+^.^.^.^.^.^.|.1.2.3.4.5.6.<+^ [.[+. 7.^.}+|+.                     ",
+"          . |+}+1+-.2+-.3+4+^.^.^.^.^.^.^.8.9.0.a.5+c.d.e.6+3+-.2+-.-.7+.                       ",
+"          . . =.].].7.-.8+9+0+a+0+^.^.^.^.^.i.j.k.l.b+c+d+9+8+^.-.7.=..                         ",
+"              . . . . =.].e+f+g+h+0+a+i+i+i+j+k+l+m+h+g+n+8+-.7.=.. . . .                       ",
+"                . . . . . . =.].o+p+q+g+g+g+g+g+r+n+8+-.s+].=.. . . . . .                       ",
+"                . . . . . . . . . . =.].t+s+-.^.^.-.7.=.. . . . . . . .                         ",
+"                  . . . . . . . . . . . . . =.].].=.. . . . . . . . .                           ",
 "                        . . . . . . . . . . . . . . . . . . . . . .                             ",
 "                              . . . . . . . . . . . . . . . . .                                 ",
 "                                      . . . . . . . . . .                                       ",
 "                                              . . . .                                           ",
+"                                                                                                ",
 "                                                                                                "};
diff --git a/share/vlc_beos.rsrc b/share/vlc_beos.rsrc
new file mode 100644 (file)
index 0000000..5c73045
Binary files /dev/null and b/share/vlc_beos.rsrc differ
index 187fce2..0cae8a4 100644 (file)
@@ -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] =
index 5486935..70aa0eb 100644 (file)
@@ -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] =
index 8bde632..726df6c 100644 (file)
@@ -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>
 #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>
 #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,23 +538,30 @@ 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,
-                                  psz_shortopts, longopts, 0 ) ) != EOF )
+    while( ( i_cmd = getopt_long( *pi_argc, ppsz_argv,
+                                   psz_shortopts, longopts, 0 ) ) != EOF )
     {
         switch( i_cmd )
         {
index ea9444b..f0064ef 100644 (file)
@@ -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" */
diff --git a/src/misc/darwin_specific.c b/src/misc/darwin_specific.c
new file mode 100644 (file)
index 0000000..c8c2131
--- /dev/null
@@ -0,0 +1,71 @@
+/*****************************************************************************
+ * 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 );
+}
+
index 25af107..13d7925 100644 (file)
@@ -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>
 #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 );
index 350d5ba..9c4b317 100644 (file)
@@ -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 */
 }
index b575d5a..7bf9c6d 100644 (file)
@@ -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>
 #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 ) )