# HG changeset patch
# User nenolod
# Date 1160056482 25200
# Node ID 628e908d78b69918ecf0dea98b6f24ba3faf4713
# Parent  d66712838e9f9eb7e209109e951e078125a32c36
[svn] - include TinyPlayer skin with the main distribution

diff -r d66712838e9f -r 628e908d78b6 ChangeLog
--- a/ChangeLog	Thu Oct 05 04:03:19 2006 -0700
+++ b/ChangeLog	Thu Oct 05 06:54:42 2006 -0700
@@ -1,3 +1,11 @@
+2006-10-05 11:03:19 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [2609]
+  - and finally special tuples are treated as they should be
+  
+  trunk/audacious/playlist.c |    9 +++++----
+  1 file changed, 5 insertions(+), 4 deletions(-)
+
+
 2006-10-05 10:26:36 +0000  William Pitcock <nenolod@nenolod.net>
   revision [2607]
   - results from more profiling
diff -r d66712838e9f -r 628e908d78b6 Makefile
--- a/Makefile	Thu Oct 05 04:03:19 2006 -0700
+++ b/Makefile	Thu Oct 05 06:54:42 2006 -0700
@@ -3,7 +3,7 @@
 include mk/rules.mk
 include mk/init.mk
 
-SUBDIRS = libaudacious intl $(SUBDIR_GUESS) audacious audtool po icons skin
+SUBDIRS = libaudacious intl $(SUBDIR_GUESS) audacious audtool po icons skins
 
 include mk/objective.mk
 
diff -r d66712838e9f -r 628e908d78b6 configure.ac
--- a/configure.ac	Thu Oct 05 04:03:19 2006 -0700
+++ b/configure.ac	Thu Oct 05 06:54:42 2006 -0700
@@ -401,7 +401,6 @@
 	po/Makefile.in
 	intl/Makefile
 	icons/Makefile
-	skin/Makefile
 	mk/rules.mk
 ])
 
diff -r d66712838e9f -r 628e908d78b6 skin/Makefile.in
--- a/skin/Makefile.in	Thu Oct 05 04:03:19 2006 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-include ../mk/rules.mk
-include ../mk/init.mk
-
-skindir = $(pkgdatadir)/Skins/Default
-OBJECTIVE_DATA = \
-	balance.png:$(skindir)		\
-	cbuttons.png:$(skindir)		\
-	eq_ex.png:$(skindir)		\
-	eqmain.png:$(skindir)		\
-	main.png:$(skindir)		\
-	monoster.png:$(skindir)		\
-	nums_ex.png:$(skindir)		\
-	playpaus.png:$(skindir)		\
-	pledit.png:$(skindir)		\
-	posbar.png:$(skindir)		\
-	shufrep.png:$(skindir)		\
-	text.png:$(skindir)		\
-	titlebar.png:$(skindir)		\
-	volume.png:$(skindir)		\
-	pledit.txt:$(skindir)		\
-	viscolor.txt:$(skindir)		\
-	skin.hints:$(skindir)
-
-include ../mk/objective.mk
diff -r d66712838e9f -r 628e908d78b6 skin/balance.png
Binary file skin/balance.png has changed
diff -r d66712838e9f -r 628e908d78b6 skin/cbuttons.png
Binary file skin/cbuttons.png has changed
diff -r d66712838e9f -r 628e908d78b6 skin/eq_ex.png
Binary file skin/eq_ex.png has changed
diff -r d66712838e9f -r 628e908d78b6 skin/eqmain.png
Binary file skin/eqmain.png has changed
diff -r d66712838e9f -r 628e908d78b6 skin/main.png
Binary file skin/main.png has changed
diff -r d66712838e9f -r 628e908d78b6 skin/monoster.png
Binary file skin/monoster.png has changed
diff -r d66712838e9f -r 628e908d78b6 skin/nums_ex.png
Binary file skin/nums_ex.png has changed
diff -r d66712838e9f -r 628e908d78b6 skin/playpaus.png
Binary file skin/playpaus.png has changed
diff -r d66712838e9f -r 628e908d78b6 skin/pledit.png
Binary file skin/pledit.png has changed
diff -r d66712838e9f -r 628e908d78b6 skin/pledit.txt
--- a/skin/pledit.txt	Thu Oct 05 04:03:19 2006 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-[Text]
-Normal=#a6c1df
-Current=#eeeeee
-NormalBG=#000000
-SelectedBG=#666666
-Font=Helvetica
diff -r d66712838e9f -r 628e908d78b6 skin/posbar.png
Binary file skin/posbar.png has changed
diff -r d66712838e9f -r 628e908d78b6 skin/shufrep.png
Binary file skin/shufrep.png has changed
diff -r d66712838e9f -r 628e908d78b6 skin/skin.hints
--- a/skin/skin.hints	Thu Oct 05 04:03:19 2006 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-[skin]
-skinDescription=The default skin for Audacious.
-mainwinOthertext=1
-mainwinVisX=19
-mainwinVisY=53
-mainwinTextX=19
-mainwinTextY=26
-mainwinTextWidth=246
-mainwinInfobarX=111
-mainwinInfobarY=42
-mainwinNumber0X=30
-mainwinNumber0Y=36
-mainwinNumber1X=42
-mainwinNumber1Y=36
-mainwinNumber2X=54
-mainwinNumber2Y=36
-mainwinNumber3X=72
-mainwinNumber3Y=36
-mainwinNumber4X=84
-mainwinNumber4Y=36
-mainwinPlayStatusX=19
-mainwinPlayStatusY=38
-mainwinMenurowVisible=1
-mainwinOthertextIsStatus=1
diff -r d66712838e9f -r 628e908d78b6 skin/text.png
Binary file skin/text.png has changed
diff -r d66712838e9f -r 628e908d78b6 skin/titlebar.png
Binary file skin/titlebar.png has changed
diff -r d66712838e9f -r 628e908d78b6 skin/viscolor.txt
--- a/skin/viscolor.txt	Thu Oct 05 04:03:19 2006 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-0,0,0		// [background color 1]
-0,0,0		// [background color 2]
-128,170,206
-128,170,206
-128,170,206
-128,170,206
-128,170,206
-128,170,206
-128,170,206
-128,170,206
-128,170,206
-128,170,206
-128,170,206
-128,170,206
-128,170,206
-128,170,206
-128,170,206
-128,170,206
-126,126,126		// [osc 1]
-126,126,126		// [osc 2]
-126,126,126		// [osc 3]
-126,126,126		// [osc 4]
-126,126,126		// [osc 5]
-130,130,131		// [peak color]
diff -r d66712838e9f -r 628e908d78b6 skin/volume.png
Binary file skin/volume.png has changed
diff -r d66712838e9f -r 628e908d78b6 skins/Default/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/skins/Default/Makefile	Thu Oct 05 06:54:42 2006 -0700
@@ -0,0 +1,24 @@
+include ../mk/rules.mk
+include ../mk/init.mk
+
+skindir = $(pkgdatadir)/Skins/Default
+OBJECTIVE_DATA = \
+	balance.png:$(skindir)		\
+	cbuttons.png:$(skindir)		\
+	eq_ex.png:$(skindir)		\
+	eqmain.png:$(skindir)		\
+	main.png:$(skindir)		\
+	monoster.png:$(skindir)		\
+	nums_ex.png:$(skindir)		\
+	playpaus.png:$(skindir)		\
+	pledit.png:$(skindir)		\
+	posbar.png:$(skindir)		\
+	shufrep.png:$(skindir)		\
+	text.png:$(skindir)		\
+	titlebar.png:$(skindir)		\
+	volume.png:$(skindir)		\
+	pledit.txt:$(skindir)		\
+	viscolor.txt:$(skindir)		\
+	skin.hints:$(skindir)
+
+include ../mk/objective.mk
diff -r d66712838e9f -r 628e908d78b6 skins/Default/balance.png
Binary file skins/Default/balance.png has changed
diff -r d66712838e9f -r 628e908d78b6 skins/Default/cbuttons.png
Binary file skins/Default/cbuttons.png has changed
diff -r d66712838e9f -r 628e908d78b6 skins/Default/eq_ex.png
Binary file skins/Default/eq_ex.png has changed
diff -r d66712838e9f -r 628e908d78b6 skins/Default/eqmain.png
Binary file skins/Default/eqmain.png has changed
diff -r d66712838e9f -r 628e908d78b6 skins/Default/main.png
Binary file skins/Default/main.png has changed
diff -r d66712838e9f -r 628e908d78b6 skins/Default/monoster.png
Binary file skins/Default/monoster.png has changed
diff -r d66712838e9f -r 628e908d78b6 skins/Default/nums_ex.png
Binary file skins/Default/nums_ex.png has changed
diff -r d66712838e9f -r 628e908d78b6 skins/Default/playpaus.png
Binary file skins/Default/playpaus.png has changed
diff -r d66712838e9f -r 628e908d78b6 skins/Default/pledit.png
Binary file skins/Default/pledit.png has changed
diff -r d66712838e9f -r 628e908d78b6 skins/Default/pledit.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/skins/Default/pledit.txt	Thu Oct 05 06:54:42 2006 -0700
@@ -0,0 +1,6 @@
+[Text]
+Normal=#a6c1df
+Current=#eeeeee
+NormalBG=#000000
+SelectedBG=#666666
+Font=Helvetica
diff -r d66712838e9f -r 628e908d78b6 skins/Default/posbar.png
Binary file skins/Default/posbar.png has changed
diff -r d66712838e9f -r 628e908d78b6 skins/Default/shufrep.png
Binary file skins/Default/shufrep.png has changed
diff -r d66712838e9f -r 628e908d78b6 skins/Default/skin.hints
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/skins/Default/skin.hints	Thu Oct 05 06:54:42 2006 -0700
@@ -0,0 +1,24 @@
+[skin]
+skinDescription=The default skin for Audacious.
+mainwinOthertext=1
+mainwinVisX=19
+mainwinVisY=53
+mainwinTextX=19
+mainwinTextY=26
+mainwinTextWidth=246
+mainwinInfobarX=111
+mainwinInfobarY=42
+mainwinNumber0X=30
+mainwinNumber0Y=36
+mainwinNumber1X=42
+mainwinNumber1Y=36
+mainwinNumber2X=54
+mainwinNumber2Y=36
+mainwinNumber3X=72
+mainwinNumber3Y=36
+mainwinNumber4X=84
+mainwinNumber4Y=36
+mainwinPlayStatusX=19
+mainwinPlayStatusY=38
+mainwinMenurowVisible=1
+mainwinOthertextIsStatus=1
diff -r d66712838e9f -r 628e908d78b6 skins/Default/text.png
Binary file skins/Default/text.png has changed
diff -r d66712838e9f -r 628e908d78b6 skins/Default/titlebar.png
Binary file skins/Default/titlebar.png has changed
diff -r d66712838e9f -r 628e908d78b6 skins/Default/viscolor.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/skins/Default/viscolor.txt	Thu Oct 05 06:54:42 2006 -0700
@@ -0,0 +1,24 @@
+0,0,0		// [background color 1]
+0,0,0		// [background color 2]
+128,170,206
+128,170,206
+128,170,206
+128,170,206
+128,170,206
+128,170,206
+128,170,206
+128,170,206
+128,170,206
+128,170,206
+128,170,206
+128,170,206
+128,170,206
+128,170,206
+128,170,206
+128,170,206
+126,126,126		// [osc 1]
+126,126,126		// [osc 2]
+126,126,126		// [osc 3]
+126,126,126		// [osc 4]
+126,126,126		// [osc 5]
+130,130,131		// [peak color]
diff -r d66712838e9f -r 628e908d78b6 skins/Default/volume.png
Binary file skins/Default/volume.png has changed
diff -r d66712838e9f -r 628e908d78b6 skins/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/skins/Makefile	Thu Oct 05 06:54:42 2006 -0700
@@ -0,0 +1,9 @@
+.SILENT:
+
+include ../mk/rules.mk
+include ../mk/init.mk
+
+SUBDIRS = Default TinyPlayer
+
+include mk/objective.mk
+
diff -r d66712838e9f -r 628e908d78b6 skins/TinyPlayer/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/skins/TinyPlayer/Makefile	Thu Oct 05 06:54:42 2006 -0700
@@ -0,0 +1,24 @@
+include ../mk/rules.mk
+include ../mk/init.mk
+
+skindir = $(pkgdatadir)/Skins/TinyPlayer
+OBJECTIVE_DATA = \
+	balance.png:$(skindir)		\
+	cbuttons.png:$(skindir)		\
+	eq_ex.png:$(skindir)		\
+	eqmain.png:$(skindir)		\
+	main.png:$(skindir)		\
+	monoster.png:$(skindir)		\
+	nums_ex.png:$(skindir)		\
+	playpaus.png:$(skindir)		\
+	pledit.png:$(skindir)		\
+	posbar.png:$(skindir)		\
+	shufrep.png:$(skindir)		\
+	text.png:$(skindir)		\
+	titlebar.png:$(skindir)		\
+	volume.png:$(skindir)		\
+	pledit.txt:$(skindir)		\
+	viscolor.txt:$(skindir)		\
+	skin.hints:$(skindir)
+
+include ../mk/objective.mk
diff -r d66712838e9f -r 628e908d78b6 skins/TinyPlayer/balance.png
Binary file skins/TinyPlayer/balance.png has changed
diff -r d66712838e9f -r 628e908d78b6 skins/TinyPlayer/cbuttons.png
Binary file skins/TinyPlayer/cbuttons.png has changed
diff -r d66712838e9f -r 628e908d78b6 skins/TinyPlayer/eq_ex.png
Binary file skins/TinyPlayer/eq_ex.png has changed
diff -r d66712838e9f -r 628e908d78b6 skins/TinyPlayer/eqmain.png
Binary file skins/TinyPlayer/eqmain.png has changed
diff -r d66712838e9f -r 628e908d78b6 skins/TinyPlayer/main.png
Binary file skins/TinyPlayer/main.png has changed
diff -r d66712838e9f -r 628e908d78b6 skins/TinyPlayer/monoster.png
Binary file skins/TinyPlayer/monoster.png has changed
diff -r d66712838e9f -r 628e908d78b6 skins/TinyPlayer/nums_ex.png
Binary file skins/TinyPlayer/nums_ex.png has changed
diff -r d66712838e9f -r 628e908d78b6 skins/TinyPlayer/playpaus.png
Binary file skins/TinyPlayer/playpaus.png has changed
diff -r d66712838e9f -r 628e908d78b6 skins/TinyPlayer/pledit.png
Binary file skins/TinyPlayer/pledit.png has changed
diff -r d66712838e9f -r 628e908d78b6 skins/TinyPlayer/pledit.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/skins/TinyPlayer/pledit.txt	Thu Oct 05 06:54:42 2006 -0700
@@ -0,0 +1,6 @@
+[Text]
+Normal=#a6c1df
+Current=#eeeeee
+NormalBG=#000000
+SelectedBG=#666666
+Font=Helvetica
diff -r d66712838e9f -r 628e908d78b6 skins/TinyPlayer/posbar.png
Binary file skins/TinyPlayer/posbar.png has changed
diff -r d66712838e9f -r 628e908d78b6 skins/TinyPlayer/shufrep.png
Binary file skins/TinyPlayer/shufrep.png has changed
diff -r d66712838e9f -r 628e908d78b6 skins/TinyPlayer/skin.hints
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/skins/TinyPlayer/skin.hints	Thu Oct 05 06:54:42 2006 -0700
@@ -0,0 +1,57 @@
+[skin]
+skinDescription=TinyPlayer skin
+mainwinOthertext=1
+mainwinVisX=189
+mainwinVisY=36
+mainwinTextX=1
+mainwinTextY=79
+mainwinTextWidth=273
+mainwinInfobarX=0
+mainwinInfobarY=0
+mainwinNumber0X=30
+mainwinNumber0Y=19
+mainwinNumber1X=42
+mainwinNumber1Y=19
+mainwinNumber2X=54
+mainwinNumber2Y=19
+mainwinNumber3X=72
+mainwinNumber3Y=19
+mainwinNumber4X=84
+mainwinNumber4Y=19
+mainwinPlayStatusX=11
+mainwinPlayStatusY=22
+mainwinOthertextIsStatus=0
+mainwinVolumeX=106
+mainwinVolumeY=22
+mainwinBalanceX=180
+mainwinBalanceY=22
+mainwinPositionX=16
+mainwinPositionY=36
+mainwinTextVisible=1
+mainwinOthertextVisible=0
+mainwinVisVisible=0
+mainwinMenurowVisible=0
+mainwinWidth=275
+mainwinHeight=86
+mainwinPreviousX=16
+mainwinPreviousY=53
+mainwinPlayX=39
+mainwinPlayY=53
+mainwinPauseX=62
+mainwinPauseY=53
+mainwinStopX=85
+mainwinStopY=53
+mainwinNextX=108
+mainwinNextY=53
+mainwinEjectX=136
+mainwinEjectY=53
+mainwinEQButtonX=219
+mainwinEQButtonY=22
+mainwinPLButtonX=242
+mainwinPLButtonY=22
+mainwinShuffleX=164
+mainwinShuffleY=56
+mainwinRepeatX=210
+mainwinRepeatY=56
+mainwinAboutX=247
+mainwinAboutY=53
diff -r d66712838e9f -r 628e908d78b6 skins/TinyPlayer/text.png
Binary file skins/TinyPlayer/text.png has changed
diff -r d66712838e9f -r 628e908d78b6 skins/TinyPlayer/titlebar.png
Binary file skins/TinyPlayer/titlebar.png has changed
diff -r d66712838e9f -r 628e908d78b6 skins/TinyPlayer/viscolor.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/skins/TinyPlayer/viscolor.txt	Thu Oct 05 06:54:42 2006 -0700
@@ -0,0 +1,24 @@
+0,0,0		// [background color 1]
+0,0,0		// [background color 2]
+128,170,206
+128,170,206
+128,170,206
+128,170,206
+128,170,206
+128,170,206
+128,170,206
+128,170,206
+128,170,206
+128,170,206
+128,170,206
+128,170,206
+128,170,206
+128,170,206
+128,170,206
+128,170,206
+126,126,126		// [osc 1]
+126,126,126		// [osc 2]
+126,126,126		// [osc 3]
+126,126,126		// [osc 4]
+126,126,126		// [osc 5]
+130,130,131		// [peak color]
diff -r d66712838e9f -r 628e908d78b6 skins/TinyPlayer/volume.png
Binary file skins/TinyPlayer/volume.png has changed