Skip to content
This repository was archived by the owner on Aug 8, 2018. It is now read-only.

Commit 453e404

Browse files
committed
Version 3.0
1 parent 89911b7 commit 453e404

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+12181
-307
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.db

README.md

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,37 @@ License: **GPLv2**.
1111
[Demo](http://parksprojets.github.io/Music).
1212

1313

14+
15+
16+
## Features
17+
18+
- Support of MP3, FLAC, OGG Vorbis
19+
20+
- Support musics from an URL and Soundcloud (see the note below)
21+
22+
- Source from the microphone
23+
24+
- Editable Playlist
25+
26+
- 4 Visualisations
27+
28+
- Equalizer
29+
30+
- Change the tempo of the music
31+
32+
- Beat and tempo (BPM) detector
33+
34+
- Crossfade between musics
35+
36+
37+
38+
## Notes
39+
40+
The visualisation with a music from an URL or Soundcloud will probably not work due to the CORS (Cross-origin resource sharing). However, you can disable the CORS in your browser.
41+
42+
43+
44+
45+
## Compile MusicJS
46+
1447
Compile js with Gulp and css with Scss.

css/allv2.css

Lines changed: 0 additions & 1 deletion
This file was deleted.

css/allv3.css

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gulpfile.js

Lines changed: 68 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,35 +10,95 @@ gulp.task('js', function() {
1010
var base = "js/";
1111

1212
var files = [
13+
14+
// Vendors
15+
"vendors/EventDispatcher.js",
1316
"vendors/three-post.min.js",
14-
"knob.js",
17+
"vendors/knob.js",
18+
1519

1620
"Utils.js",
21+
"Sortable.js",
1722
"Translate.js",
1823
"BeatDetector.js",
1924
"main.js",
2025
"Player.js",
26+
"Playlist.js",
2127
"FFTManager.js",
2228
"Beat.js",
2329

24-
"OptionsFFT.js",
25-
"EQMenu.js",
26-
"MusicMenu.js",
27-
"HelpMenu.js",
28-
"ControlsMenu.js",
30+
31+
// Menus
32+
"Menus/Menus.js",
33+
"Menus/SourceMenu.js",
34+
"Menus/FFTMenu.js",
35+
"Menus/EQMenu.js",
36+
"Menus/MusicMenu.js",
37+
"Menus/HelpMenu.js",
38+
"Menus/ControlsMenu.js",
39+
40+
41+
// Decoders
42+
"Decoders/DecoderAccess.js",
43+
2944

3045
"DropMusic.js",
46+
"Microphone.js",
47+
//"YoutubeMusic.js",
48+
"Soundcloud.js",
49+
50+
51+
// FFTs
52+
"Visualisations/*"
3153

32-
"FFT/*"
3354
];
3455

3556

3657

58+
59+
for (var i = 0; i < files.length; i++)
60+
files[i] = base + files[i];
61+
62+
return gulp.src(files)
63+
.pipe(concat("allv3.js"))
64+
.pipe(gulp.dest('js/'));
65+
66+
});
67+
68+
69+
70+
71+
72+
73+
gulp.task('worker', function() {
74+
75+
var base = "js/";
76+
77+
var files = [
78+
79+
"vendors/EventDispatcher.js",
80+
"Decoders/Worker.js",
81+
82+
// Decoders
83+
"Decoders/Bitstream.js",
84+
"Decoders/Buffer.js",
85+
"Decoders/BufferList.js",
86+
"Decoders/Stream.js",
87+
"Decoders/Demuxer.js",
88+
"Decoders/Decoder.js",
89+
90+
// FLAC
91+
"Decoders/FLAC/demuxer.js",
92+
"Decoders/FLAC/FLACDecoder.js",
93+
94+
];
95+
96+
3797
for (var i = 0; i < files.length; i++)
3898
files[i] = base + files[i];
3999

40100
return gulp.src(files)
41-
.pipe(concat("allv2.js"))
101+
.pipe(concat("worker.js"))
42102
.pipe(gulp.dest('js/'));
43103

44104
});

0 commit comments

Comments
 (0)