Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: m-labs/flickernoise
base: 7884985
...
head fork: m-labs/flickernoise
compare: de3210b
  • 3 commits
  • 60 files changed
  • 0 commit comments
  • 1 contributor
Showing with 32 additions and 5 deletions.
  1. 0  patches/{MilkDrop → }/Aderassi - Making time.fnp
  2. 0  patches/{MilkDrop → }/Aderrasi - Airs.fnp
  3. 0  patches/{MilkDrop → }/Aderrasi - Antidote (Aqualung Mix).fnp
  4. 0  patches/{MilkDrop → }/Aderrasi - Bow to gravity.fnp
  5. 0  patches/{MilkDrop → }/Aderrasi - Variants Of Eternity (Shaking mix).fnp
  6. 0  patches/{MilkDrop → }/Bmelgren & Krash - Rainbow Orb Peacock (Lonely Signal Gone Mad Mix).fnp
  7. 0  patches/{MilkDrop → }/EvilJim - Ice Drops.fnp
  8. 0  patches/{MilkDrop → }/Fvese - The Tunnel (Final Stage Mix).fnp
  9. 0  patches/{Interactive → }/Geiss & Werner - Tornado (Rain Dance MIDI RMX).fnp
  10. 0  patches/{MilkDrop → }/Geiss - Approach.fnp
  11. 0  patches/{MilkDrop → }/Geiss - Cruzin'.fnp
  12. 0  patches/{MilkDrop → }/Geiss - Eggs.fnp
  13. 0  patches/{MilkDrop → }/Geiss - Shift.fnp
  14. 0  patches/{MilkDrop → }/Geiss - The Fatty Lumpkin Sunkle Tweaker.fnp
  15. 0  patches/{MilkDrop → }/Geiss - Tornado.fnp
  16. 0  patches/{MilkDrop → }/Idiot & Rovastar - Altars Of Madness 2 (X42 Mix).fnp
  17. 0  patches/{MilkDrop → }/Illusion & Che - The Piper.fnp
  18. 0  patches/{MilkDrop → }/Illusion & Rovastar - Clouded Bottle.fnp
  19. 0  patches/{MilkDrop → }/Illusion & Unchained - Frozen Eye 1.fnp
  20. 0  patches/{VideoIn → }/Jeremie - conduirebourre.com.fnp
  21. 0  patches/{VideoIn → }/Krash - Digital Flame (Video remix).fnp
  22. 0  patches/{MilkDrop → }/Krash - Digital Flame.fnp
  23. 0  patches/{MilkDrop → }/Krash - Interwoven (Nightmare Weft Mix).fnp
  24. 0  patches/{VideoIn → }/Lekernel & Geiss - Shaking.fnp
  25. 0  patches/{Interactive → }/Lekernel & Krash - Boil off (DMX).fnp
  26. 0  patches/{VideoIn → }/Lekernel & Krash - Personal Shroomery.fnp
  27. 0  patches/{VideoIn → }/Lekernel & Rovastar & Fvese - Subconscious Objects.fnp
  28. 0  patches/{VideoIn → }/Lekernel & Rozzor & Aderassi - Video Cannon.fnp
  29. 0  patches/{VideoIn → }/Lekernel & fiShbRaiN - crazy face.fnp
  30. 0  patches/{VideoIn → }/Lekernel - Disc Explosion.fnp
  31. 0  patches/{Interactive → }/Lekernel - Drawing Board (DMX).fnp
  32. 0  patches/{VideoIn → }/Lekernel - Eerie Beri.fnp
  33. 0  patches/{Interactive → }/Lekernel - Falling (DMX).fnp
  34. 0  patches/{Simple → }/Lekernel - FullScreen Video-in Preview.fnp
  35. 0  patches/{Simple → }/Lekernel - Musique de telephone.fnp
  36. 0  patches/{VideoIn → }/Lekernel - Pulsating photography.fnp
  37. 0  patches/{VideoIn → }/Lekernel - Spiralling.fnp
  38. +16 −0 patches/Lekernel - Starpainter.fnp
  39. 0  patches/{Simple → }/Lekernel - The psychedelic drunken boat.fnp
  40. 0  patches/{Custom → }/Lekernel - Vibrant Plasma Streams.fnp
  41. 0  patches/{Custom → }/Philpraxis - Eight bit starfield.fnp
  42. 0  patches/{MilkDrop → }/Rovastar & Fvese - Dark Subconscious.fnp
  43. 0  patches/{Interactive → }/Rovastar & Idiot24-7 - Balk Acid (DMX madness).fnp
  44. 0  patches/{MilkDrop → }/Rovastar & Idiot24-7 - Balk Acid.fnp
  45. 0  patches/{MilkDrop → }/Rovastar - A Million Miles from Earth.fnp
  46. 0  patches/{MilkDrop → }/Rovastar - Cosmic Echoes 2.fnp
  47. 0  patches/{MilkDrop → }/Rovastar - Explosive Minds.fnp
  48. 0  patches/{MilkDrop → }/Rovastar - Forgotten Moon.fnp
  49. 0  patches/{MilkDrop → }/Rovastar - Hallucinogenic Pyramids.fnp
  50. 0  patches/{MilkDrop → }/Rovastar - Torrid Tales.fnp
  51. 0  patches/{MilkDrop → }/Rozzor & Aderrasi - Canon (DMX out).fnp
  52. 0  patches/{MilkDrop → }/Telek - Slow Shift Matrix (bb4.5).fnp
  53. 0  patches/{MilkDrop → }/Unchained - A Matter Of Taste (Remix).fnp
  54. 0  patches/{MilkDrop → }/Zylot - The Inner Workings of my New Computer.fnp
  55. 0  patches/{VideoIn → }/bmelgren - Godhead (Video mix).fnp
  56. 0  patches/{MilkDrop → }/nil - Cid and Lucy.fnp
  57. BIN  patches/pleiades.jpg
  58. +2 −1  src/gui/flash.c
  59. +13 −3 src/patchpool.c
  60. +1 −1  src/patchpool.h
View
0  patches/MilkDrop/Aderassi - Making time.fnp → patches/Aderassi - Making time.fnp
File renamed without changes
View
0  patches/MilkDrop/Aderrasi - Airs.fnp → patches/Aderrasi - Airs.fnp
File renamed without changes
View
0  ...op/Aderrasi - Antidote (Aqualung Mix).fnp → ...es/Aderrasi - Antidote (Aqualung Mix).fnp
File renamed without changes
View
0  ...es/MilkDrop/Aderrasi - Bow to gravity.fnp → patches/Aderrasi - Bow to gravity.fnp
File renamed without changes
View
0  ... - Variants Of Eternity (Shaking mix).fnp → ... - Variants Of Eternity (Shaking mix).fnp
File renamed without changes
View
0  ... Peacock (Lonely Signal Gone Mad Mix).fnp → ... Peacock (Lonely Signal Gone Mad Mix).fnp
File renamed without changes
View
0  patches/MilkDrop/EvilJim - Ice Drops.fnp → patches/EvilJim - Ice Drops.fnp
File renamed without changes
View
0  .../Fvese - The Tunnel (Final Stage Mix).fnp → .../Fvese - The Tunnel (Final Stage Mix).fnp
File renamed without changes
View
0  ...erner - Tornado (Rain Dance MIDI RMX).fnp → ...erner - Tornado (Rain Dance MIDI RMX).fnp
File renamed without changes
View
0  patches/MilkDrop/Geiss - Approach.fnp → patches/Geiss - Approach.fnp
File renamed without changes
View
0  patches/MilkDrop/Geiss - Cruzin'.fnp → patches/Geiss - Cruzin'.fnp
File renamed without changes
View
0  patches/MilkDrop/Geiss - Eggs.fnp → patches/Geiss - Eggs.fnp
File renamed without changes
View
0  patches/MilkDrop/Geiss - Shift.fnp → patches/Geiss - Shift.fnp
File renamed without changes
View
0  ...ss - The Fatty Lumpkin Sunkle Tweaker.fnp → ...ss - The Fatty Lumpkin Sunkle Tweaker.fnp
File renamed without changes
View
0  patches/MilkDrop/Geiss - Tornado.fnp → patches/Geiss - Tornado.fnp
File renamed without changes
View
0  ...astar - Altars Of Madness 2 (X42 Mix).fnp → ...astar - Altars Of Madness 2 (X42 Mix).fnp
File renamed without changes
View
0  ...s/MilkDrop/Illusion & Che - The Piper.fnp → patches/Illusion & Che - The Piper.fnp
File renamed without changes
View
0  .../Illusion & Rovastar - Clouded Bottle.fnp → .../Illusion & Rovastar - Clouded Bottle.fnp
File renamed without changes
View
0  ...p/Illusion & Unchained - Frozen Eye 1.fnp → ...s/Illusion & Unchained - Frozen Eye 1.fnp
File renamed without changes
View
0  .../VideoIn/Jeremie - conduirebourre.com.fnp → patches/Jeremie - conduirebourre.com.fnp
File renamed without changes
View
0  ...n/Krash - Digital Flame (Video remix).fnp → ...s/Krash - Digital Flame (Video remix).fnp
File renamed without changes
View
0  patches/MilkDrop/Krash - Digital Flame.fnp → patches/Krash - Digital Flame.fnp
File renamed without changes
View
0  ...ash - Interwoven (Nightmare Weft Mix).fnp → ...ash - Interwoven (Nightmare Weft Mix).fnp
File renamed without changes
View
0  ...es/VideoIn/Lekernel & Geiss - Shaking.fnp → patches/Lekernel & Geiss - Shaking.fnp
File renamed without changes
View
0  ...ive/Lekernel & Krash - Boil off (DMX).fnp → ...hes/Lekernel & Krash - Boil off (DMX).fnp
File renamed without changes
View
0  ...Lekernel & Krash - Personal Shroomery.fnp → ...Lekernel & Krash - Personal Shroomery.fnp
File renamed without changes
View
0  ...vastar & Fvese - Subconscious Objects.fnp → ...vastar & Fvese - Subconscious Objects.fnp
File renamed without changes
View
0  ...el & Rozzor & Aderassi - Video Cannon.fnp → ...el & Rozzor & Aderassi - Video Cannon.fnp
File renamed without changes
View
0  ...oIn/Lekernel & fiShbRaiN - crazy face.fnp → ...hes/Lekernel & fiShbRaiN - crazy face.fnp
File renamed without changes
View
0  ...hes/VideoIn/Lekernel - Disc Explosion.fnp → patches/Lekernel - Disc Explosion.fnp
File renamed without changes
View
0  ...active/Lekernel - Drawing Board (DMX).fnp → patches/Lekernel - Drawing Board (DMX).fnp
File renamed without changes
View
0  patches/VideoIn/Lekernel - Eerie Beri.fnp → patches/Lekernel - Eerie Beri.fnp
File renamed without changes
View
0  .../Interactive/Lekernel - Falling (DMX).fnp → patches/Lekernel - Falling (DMX).fnp
File renamed without changes
View
0  ...ekernel - FullScreen Video-in Preview.fnp → ...ekernel - FullScreen Video-in Preview.fnp
File renamed without changes
View
0  ...imple/Lekernel - Musique de telephone.fnp → patches/Lekernel - Musique de telephone.fnp
File renamed without changes
View
0  ...eoIn/Lekernel - Pulsating photography.fnp → patches/Lekernel - Pulsating photography.fnp
File renamed without changes
View
0  patches/VideoIn/Lekernel - Spiralling.fnp → patches/Lekernel - Spiralling.fnp
File renamed without changes
View
16 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)
View
0  ...kernel - The psychedelic drunken boat.fnp → ...kernel - The psychedelic drunken boat.fnp
File renamed without changes
View
0  ...tom/Lekernel - Vibrant Plasma Streams.fnp → ...hes/Lekernel - Vibrant Plasma Streams.fnp
File renamed without changes
View
0  ...stom/Philpraxis - Eight bit starfield.fnp → patches/Philpraxis - Eight bit starfield.fnp
File renamed without changes
View
0  .../Rovastar & Fvese - Dark Subconscious.fnp → .../Rovastar & Fvese - Dark Subconscious.fnp
File renamed without changes
View
0  ...& Idiot24-7 - Balk Acid (DMX madness).fnp → ...& Idiot24-7 - Balk Acid (DMX madness).fnp
File renamed without changes
View
0  ...Drop/Rovastar & Idiot24-7 - Balk Acid.fnp → patches/Rovastar & Idiot24-7 - Balk Acid.fnp
File renamed without changes
View
0  ...Rovastar - A Million Miles from Earth.fnp → ...Rovastar - A Million Miles from Earth.fnp
File renamed without changes
View
0  ...s/MilkDrop/Rovastar - Cosmic Echoes 2.fnp → patches/Rovastar - Cosmic Echoes 2.fnp
File renamed without changes
View
0  ...s/MilkDrop/Rovastar - Explosive Minds.fnp → patches/Rovastar - Explosive Minds.fnp
File renamed without changes
View
0  ...es/MilkDrop/Rovastar - Forgotten Moon.fnp → patches/Rovastar - Forgotten Moon.fnp
File renamed without changes
View
0  ...op/Rovastar - Hallucinogenic Pyramids.fnp → ...es/Rovastar - Hallucinogenic Pyramids.fnp
File renamed without changes
View
0  patches/MilkDrop/Rovastar - Torrid Tales.fnp → patches/Rovastar - Torrid Tales.fnp
File renamed without changes
View
0  ...p/Rozzor & Aderrasi - Canon (DMX out).fnp → ...s/Rozzor & Aderrasi - Canon (DMX out).fnp
File renamed without changes
View
0  ...rop/Telek - Slow Shift Matrix (bb4.5).fnp → ...hes/Telek - Slow Shift Matrix (bb4.5).fnp
File renamed without changes
View
0  ...Unchained - A Matter Of Taste (Remix).fnp → ...Unchained - A Matter Of Taste (Remix).fnp
File renamed without changes
View
0  ...The Inner Workings of my New Computer.fnp → ...The Inner Workings of my New Computer.fnp
File renamed without changes
View
0  ...ideoIn/bmelgren - Godhead (Video mix).fnp → patches/bmelgren - Godhead (Video mix).fnp
File renamed without changes
View
0  patches/MilkDrop/nil - Cid and Lucy.fnp → patches/nil - Cid and Lucy.fnp
File renamed without changes
View
BIN  patches/pleiades.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
3  src/gui/flash.c
@@ -341,6 +341,7 @@ 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;
@@ -348,7 +349,7 @@ static void get_versions(struct patchpool *local_patches, struct patchpool *remo
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;
View
16 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);
View
2  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 */

No commit comments for this range

Something went wrong with that request. Please try again.