m-labs · Nov 24, 2011 · Nov 24, 2011 · Nov 24, 2011
diff --git a/patches/MilkDrop/Aderassi - Making time.fnp → patches/Aderassi - Making time.fnp b/patches/MilkDrop/Aderassi - Making time.fnp → patches/Aderassi - Making time.fnp
diff --git a/patches/MilkDrop/Aderrasi - Airs.fnp → patches/Aderrasi - Airs.fnp b/patches/MilkDrop/Aderrasi - Airs.fnp → patches/Aderrasi - Airs.fnp
diff --git a/...op/Aderrasi - Antidote (Aqualung Mix).fnp → ...es/Aderrasi - Antidote (Aqualung Mix).fnp b/...op/Aderrasi - Antidote (Aqualung Mix).fnp → ...es/Aderrasi - Antidote (Aqualung Mix).fnp
diff --git a/...es/MilkDrop/Aderrasi - Bow to gravity.fnp → patches/Aderrasi - Bow to gravity.fnp b/...es/MilkDrop/Aderrasi - Bow to gravity.fnp → patches/Aderrasi - Bow to gravity.fnp
diff --git a/... - Variants Of Eternity (Shaking mix).fnp → ... - Variants Of Eternity (Shaking mix).fnp b/... - Variants Of Eternity (Shaking mix).fnp → ... - Variants Of Eternity (Shaking mix).fnp
diff --git a/... Peacock (Lonely Signal Gone Mad Mix).fnp → ... Peacock (Lonely Signal Gone Mad Mix).fnp b/... Peacock (Lonely Signal Gone Mad Mix).fnp → ... Peacock (Lonely Signal Gone Mad Mix).fnp
diff --git a/patches/MilkDrop/EvilJim - Ice Drops.fnp → patches/EvilJim - Ice Drops.fnp b/patches/MilkDrop/EvilJim - Ice Drops.fnp → patches/EvilJim - Ice Drops.fnp
diff --git a/.../Fvese - The Tunnel (Final Stage Mix).fnp → .../Fvese - The Tunnel (Final Stage Mix).fnp b/.../Fvese - The Tunnel (Final Stage Mix).fnp → .../Fvese - The Tunnel (Final Stage Mix).fnp
diff --git a/...erner - Tornado (Rain Dance MIDI RMX).fnp → ...erner - Tornado (Rain Dance MIDI RMX).fnp b/...erner - Tornado (Rain Dance MIDI RMX).fnp → ...erner - Tornado (Rain Dance MIDI RMX).fnp
diff --git a/patches/MilkDrop/Geiss - Approach.fnp → patches/Geiss - Approach.fnp b/patches/MilkDrop/Geiss - Approach.fnp → patches/Geiss - Approach.fnp
diff --git a/patches/MilkDrop/Geiss - Cruzin'.fnp → patches/Geiss - Cruzin'.fnp b/patches/MilkDrop/Geiss - Cruzin'.fnp → patches/Geiss - Cruzin'.fnp
diff --git a/patches/MilkDrop/Geiss - Eggs.fnp → patches/Geiss - Eggs.fnp b/patches/MilkDrop/Geiss - Eggs.fnp → patches/Geiss - Eggs.fnp
diff --git a/patches/MilkDrop/Geiss - Shift.fnp → patches/Geiss - Shift.fnp b/patches/MilkDrop/Geiss - Shift.fnp → patches/Geiss - Shift.fnp
diff --git a/...ss - The Fatty Lumpkin Sunkle Tweaker.fnp → ...ss - The Fatty Lumpkin Sunkle Tweaker.fnp b/...ss - The Fatty Lumpkin Sunkle Tweaker.fnp → ...ss - The Fatty Lumpkin Sunkle Tweaker.fnp
diff --git a/patches/MilkDrop/Geiss - Tornado.fnp → patches/Geiss - Tornado.fnp b/patches/MilkDrop/Geiss - Tornado.fnp → patches/Geiss - Tornado.fnp
diff --git a/...astar - Altars Of Madness 2 (X42 Mix).fnp → ...astar - Altars Of Madness 2 (X42 Mix).fnp b/...astar - Altars Of Madness 2 (X42 Mix).fnp → ...astar - Altars Of Madness 2 (X42 Mix).fnp
diff --git a/...s/MilkDrop/Illusion & Che - The Piper.fnp → patches/Illusion & Che - The Piper.fnp b/...s/MilkDrop/Illusion & Che - The Piper.fnp → patches/Illusion & Che - The Piper.fnp
diff --git a/.../Illusion & Rovastar - Clouded Bottle.fnp → .../Illusion & Rovastar - Clouded Bottle.fnp b/.../Illusion & Rovastar - Clouded Bottle.fnp → .../Illusion & Rovastar - Clouded Bottle.fnp
diff --git a/...p/Illusion & Unchained - Frozen Eye 1.fnp → ...s/Illusion & Unchained - Frozen Eye 1.fnp b/...p/Illusion & Unchained - Frozen Eye 1.fnp → ...s/Illusion & Unchained - Frozen Eye 1.fnp
diff --git a/.../VideoIn/Jeremie - conduirebourre.com.fnp → patches/Jeremie - conduirebourre.com.fnp b/.../VideoIn/Jeremie - conduirebourre.com.fnp → patches/Jeremie - conduirebourre.com.fnp
diff --git a/...n/Krash - Digital Flame (Video remix).fnp → ...s/Krash - Digital Flame (Video remix).fnp b/...n/Krash - Digital Flame (Video remix).fnp → ...s/Krash - Digital Flame (Video remix).fnp
diff --git a/patches/MilkDrop/Krash - Digital Flame.fnp → patches/Krash - Digital Flame.fnp b/patches/MilkDrop/Krash - Digital Flame.fnp → patches/Krash - Digital Flame.fnp
diff --git a/...ash - Interwoven (Nightmare Weft Mix).fnp → ...ash - Interwoven (Nightmare Weft Mix).fnp b/...ash - Interwoven (Nightmare Weft Mix).fnp → ...ash - Interwoven (Nightmare Weft Mix).fnp
diff --git a/...es/VideoIn/Lekernel & Geiss - Shaking.fnp → patches/Lekernel & Geiss - Shaking.fnp b/...es/VideoIn/Lekernel & Geiss - Shaking.fnp → patches/Lekernel & Geiss - Shaking.fnp
diff --git a/...ive/Lekernel & Krash - Boil off (DMX).fnp → ...hes/Lekernel & Krash - Boil off (DMX).fnp b/...ive/Lekernel & Krash - Boil off (DMX).fnp → ...hes/Lekernel & Krash - Boil off (DMX).fnp
diff --git a/...Lekernel & Krash - Personal Shroomery.fnp → ...Lekernel & Krash - Personal Shroomery.fnp b/...Lekernel & Krash - Personal Shroomery.fnp → ...Lekernel & Krash - Personal Shroomery.fnp
diff --git a/...vastar & Fvese - Subconscious Objects.fnp → ...vastar & Fvese - Subconscious Objects.fnp b/...vastar & Fvese - Subconscious Objects.fnp → ...vastar & Fvese - Subconscious Objects.fnp
diff --git a/...el & Rozzor & Aderassi - Video Cannon.fnp → ...el & Rozzor & Aderassi - Video Cannon.fnp b/...el & Rozzor & Aderassi - Video Cannon.fnp → ...el & Rozzor & Aderassi - Video Cannon.fnp
diff --git a/...oIn/Lekernel & fiShbRaiN - crazy face.fnp → ...hes/Lekernel & fiShbRaiN - crazy face.fnp b/...oIn/Lekernel & fiShbRaiN - crazy face.fnp → ...hes/Lekernel & fiShbRaiN - crazy face.fnp
diff --git a/...hes/VideoIn/Lekernel - Disc Explosion.fnp → patches/Lekernel - Disc Explosion.fnp b/...hes/VideoIn/Lekernel - Disc Explosion.fnp → patches/Lekernel - Disc Explosion.fnp
diff --git a/...active/Lekernel - Drawing Board (DMX).fnp → patches/Lekernel - Drawing Board (DMX).fnp b/...active/Lekernel - Drawing Board (DMX).fnp → patches/Lekernel - Drawing Board (DMX).fnp
diff --git a/patches/VideoIn/Lekernel - Eerie Beri.fnp → patches/Lekernel - Eerie Beri.fnp b/patches/VideoIn/Lekernel - Eerie Beri.fnp → patches/Lekernel - Eerie Beri.fnp
diff --git a/.../Interactive/Lekernel - Falling (DMX).fnp → patches/Lekernel - Falling (DMX).fnp b/.../Interactive/Lekernel - Falling (DMX).fnp → patches/Lekernel - Falling (DMX).fnp
diff --git a/...ekernel - FullScreen Video-in Preview.fnp → ...ekernel - FullScreen Video-in Preview.fnp b/...ekernel - FullScreen Video-in Preview.fnp → ...ekernel - FullScreen Video-in Preview.fnp
diff --git a/...imple/Lekernel - Musique de telephone.fnp → patches/Lekernel - Musique de telephone.fnp b/...imple/Lekernel - Musique de telephone.fnp → patches/Lekernel - Musique de telephone.fnp
diff --git a/...eoIn/Lekernel - Pulsating photography.fnp → patches/Lekernel - Pulsating photography.fnp b/...eoIn/Lekernel - Pulsating photography.fnp → patches/Lekernel - Pulsating photography.fnp
diff --git a/patches/VideoIn/Lekernel - Spiralling.fnp → patches/Lekernel - Spiralling.fnp b/patches/VideoIn/Lekernel - Spiralling.fnp → patches/Lekernel - Spiralling.fnp
diff --git a/patches/Lekernel - Starpainter.fnp b/patches/Lekernel - Starpainter.fnp
@@ -0,0 +1,16 @@
+imagefile1=pleiades.jpg
+imagefile2=pleiades.jpg
+decay=0.97
+image1_a=0.6
+image2_a=0.6
+per_frame=image1_zoom=0.8+0.2*sin(1.21*time)
+per_frame=image2_zoom=0.8+0.2*sin(0.98*time)
+sx=1.06
+sy=1.06
+per_frame=cx=0.5+0.1*sin(1.82*time)
+per_frame=cy=0.5+0.1*sin(0.97*time)
+per_frame=rot=0.05*sin(0.4*time)
+per_frame=image1_x=0.5+0.5*sin(4.32*time)
+per_frame=image1_y=0.5+0.5*cos(6.14*time)
+per_frame=image2_x=0.5+0.5*sin(5.17*time)
+per_frame=image2_y=0.5+0.5*cos(4.47*time)
diff --git a/...kernel - The psychedelic drunken boat.fnp → ...kernel - The psychedelic drunken boat.fnp b/...kernel - The psychedelic drunken boat.fnp → ...kernel - The psychedelic drunken boat.fnp
diff --git a/...tom/Lekernel - Vibrant Plasma Streams.fnp → ...hes/Lekernel - Vibrant Plasma Streams.fnp b/...tom/Lekernel - Vibrant Plasma Streams.fnp → ...hes/Lekernel - Vibrant Plasma Streams.fnp
diff --git a/...stom/Philpraxis - Eight bit starfield.fnp → patches/Philpraxis - Eight bit starfield.fnp b/...stom/Philpraxis - Eight bit starfield.fnp → patches/Philpraxis - Eight bit starfield.fnp
diff --git a/.../Rovastar & Fvese - Dark Subconscious.fnp → .../Rovastar & Fvese - Dark Subconscious.fnp b/.../Rovastar & Fvese - Dark Subconscious.fnp → .../Rovastar & Fvese - Dark Subconscious.fnp
diff --git a/...& Idiot24-7 - Balk Acid (DMX madness).fnp → ...& Idiot24-7 - Balk Acid (DMX madness).fnp b/...& Idiot24-7 - Balk Acid (DMX madness).fnp → ...& Idiot24-7 - Balk Acid (DMX madness).fnp
diff --git a/...Drop/Rovastar & Idiot24-7 - Balk Acid.fnp → patches/Rovastar & Idiot24-7 - Balk Acid.fnp b/...Drop/Rovastar & Idiot24-7 - Balk Acid.fnp → patches/Rovastar & Idiot24-7 - Balk Acid.fnp
diff --git a/...Rovastar - A Million Miles from Earth.fnp → ...Rovastar - A Million Miles from Earth.fnp b/...Rovastar - A Million Miles from Earth.fnp → ...Rovastar - A Million Miles from Earth.fnp
diff --git a/...s/MilkDrop/Rovastar - Cosmic Echoes 2.fnp → patches/Rovastar - Cosmic Echoes 2.fnp b/...s/MilkDrop/Rovastar - Cosmic Echoes 2.fnp → patches/Rovastar - Cosmic Echoes 2.fnp
diff --git a/...s/MilkDrop/Rovastar - Explosive Minds.fnp → patches/Rovastar - Explosive Minds.fnp b/...s/MilkDrop/Rovastar - Explosive Minds.fnp → patches/Rovastar - Explosive Minds.fnp
diff --git a/...es/MilkDrop/Rovastar - Forgotten Moon.fnp → patches/Rovastar - Forgotten Moon.fnp b/...es/MilkDrop/Rovastar - Forgotten Moon.fnp → patches/Rovastar - Forgotten Moon.fnp
diff --git a/...op/Rovastar - Hallucinogenic Pyramids.fnp → ...es/Rovastar - Hallucinogenic Pyramids.fnp b/...op/Rovastar - Hallucinogenic Pyramids.fnp → ...es/Rovastar - Hallucinogenic Pyramids.fnp
diff --git a/patches/MilkDrop/Rovastar - Torrid Tales.fnp → patches/Rovastar - Torrid Tales.fnp b/patches/MilkDrop/Rovastar - Torrid Tales.fnp → patches/Rovastar - Torrid Tales.fnp
diff --git a/...p/Rozzor & Aderrasi - Canon (DMX out).fnp → ...s/Rozzor & Aderrasi - Canon (DMX out).fnp b/...p/Rozzor & Aderrasi - Canon (DMX out).fnp → ...s/Rozzor & Aderrasi - Canon (DMX out).fnp
diff --git a/...rop/Telek - Slow Shift Matrix (bb4.5).fnp → ...hes/Telek - Slow Shift Matrix (bb4.5).fnp b/...rop/Telek - Slow Shift Matrix (bb4.5).fnp → ...hes/Telek - Slow Shift Matrix (bb4.5).fnp
diff --git a/...Unchained - A Matter Of Taste (Remix).fnp → ...Unchained - A Matter Of Taste (Remix).fnp b/...Unchained - A Matter Of Taste (Remix).fnp → ...Unchained - A Matter Of Taste (Remix).fnp
diff --git a/...The Inner Workings of my New Computer.fnp → ...The Inner Workings of my New Computer.fnp b/...The Inner Workings of my New Computer.fnp → ...The Inner Workings of my New Computer.fnp
diff --git a/...ideoIn/bmelgren - Godhead (Video mix).fnp → patches/bmelgren - Godhead (Video mix).fnp b/...ideoIn/bmelgren - Godhead (Video mix).fnp → patches/bmelgren - Godhead (Video mix).fnp
diff --git a/patches/MilkDrop/nil - Cid and Lucy.fnp → patches/nil - Cid and Lucy.fnp b/patches/MilkDrop/nil - Cid and Lucy.fnp → patches/nil - Cid and Lucy.fnp
diff --git a/patches/pleiades.jpg b/patches/pleiades.jpg
diff --git a/src/gui/flash.c b/src/gui/flash.c
@@ -341,14 +341,15 @@ static void get_versions(struct patchpool *local_patches, struct patchpool *remo
 {
 	char *b;
 	char *c;
+	static const char *extensions[] = {"fnp", "png", "jpg", "jpeg", NULL};
 
 	flash_progress = 0;
 	installed_patches = -1;
 	available_socbios = unknown_version;
 	available_application = unknown_version;
 	available_patches = -1;
 
-	patchpool_add_files(local_patches, SIMPLE_PATCHES_FOLDER, "fnp");
+	patchpool_add_files(local_patches, SIMPLE_PATCHES_FOLDER, extensions);
 	installed_patches = patchpool_count(local_patches);
 
 	flash_progress = 25;

diff --git a/src/patchpool.c b/src/patchpool.c
@@ -21,6 +21,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 
 #include "patchpool.h"
 
@@ -118,13 +119,14 @@ void patchpool_add_multi(struct patchpool *pp, const char *entry)
 	}
 }
 
-void patchpool_add_files(struct patchpool *pp, const char *folder, const char *extension)
+void patchpool_add_files(struct patchpool *pp, const char *folder, const char **extensions)
 {
 	DIR *d;
 	struct dirent *entry;
 	struct stat s;
 	char fullname[384];
 	char *c;
+	int i;
 
 	d = opendir(folder);
 	if(!d) return;
@@ -135,8 +137,16 @@ void patchpool_add_files(struct patchpool *pp, const char *folder, const char *e
 		lstat(fullname, &s);
 		if(!S_ISDIR(s.st_mode)) {
 			c = strrchr(entry->d_name, '.');
-			if((c != NULL) && (strcmp(extension, c+1) == 0))
-				patchpool_add(pp, strdup(entry->d_name));
+			if(c != NULL) {
+				i = 0;
+				while(extensions[i] != NULL) {
+					if(strcasecmp(extensions[i], c+1) == 0) {
+						patchpool_add(pp, strdup(entry->d_name));
+						break;
+					}
+					i++;
+				}
+			}
 		}
 	}
 	closedir(d);

diff --git a/src/patchpool.h b/src/patchpool.h
@@ -32,6 +32,6 @@ int patchpool_count(struct patchpool *pp);
 void patchpool_diff(struct patchpool *pp, struct patchpool *to_delete);
 
 void patchpool_add_multi(struct patchpool *pp, const char *entry);
-void patchpool_add_files(struct patchpool *pp, const char *folder, const char *extension);
+void patchpool_add_files(struct patchpool *pp, const char *folder, const char **extensions);
 
 #endif /* __PATCHPOOL_H */