diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/vidgame/Daytona_USA_-_The_King_of_Speed.mid b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/vidgame/Daytona_USA_-_The_King_of_Speed.mid new file mode 100644 index 00000000..54970b70 Binary files /dev/null and b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/vidgame/Daytona_USA_-_The_King_of_Speed.mid differ diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/vidgame/DearlyBeloved.mid b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/vidgame/DearlyBeloved.mid new file mode 100644 index 00000000..d230607a Binary files /dev/null and b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/vidgame/DearlyBeloved.mid differ diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/vidgame/Gagazat_Mt.mid b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/vidgame/Gagazat_Mt.mid new file mode 100644 index 00000000..2ac0b753 Binary files /dev/null and b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/vidgame/Gagazat_Mt.mid differ diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/vidgame/Lets_Go_Away-Intermediate_Track.mid b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/vidgame/Lets_Go_Away-Intermediate_Track.mid new file mode 100644 index 00000000..153df827 Binary files /dev/null and b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/vidgame/Lets_Go_Away-Intermediate_Track.mid differ diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/vidgame/NightofFate.mid b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/vidgame/NightofFate.mid new file mode 100644 index 00000000..95b09725 Binary files /dev/null and b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/vidgame/NightofFate.mid differ diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/vidgame/Terranigma_Remix.mid b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/vidgame/Terranigma_Remix.mid new file mode 100644 index 00000000..e4178ad3 Binary files /dev/null and b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/vidgame/Terranigma_Remix.mid differ diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/vidgame/Whatever_FF8_Balamb_GARDEN.mid b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/vidgame/Whatever_FF8_Balamb_GARDEN.mid new file mode 100644 index 00000000..9f9b2cfd Binary files /dev/null and b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/vidgame/Whatever_FF8_Balamb_GARDEN.mid differ diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/vidgame/Whatever_FF8_SeeD.mid b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/vidgame/Whatever_FF8_SeeD.mid new file mode 100644 index 00000000..02aa22be Binary files /dev/null and b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/vidgame/Whatever_FF8_SeeD.mid differ diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/vidgame/Zelda_I_-_Underworld_Theme.mid b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/vidgame/Zelda_I_-_Underworld_Theme.mid new file mode 100644 index 00000000..d9695a3c Binary files /dev/null and b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/vidgame/Zelda_I_-_Underworld_Theme.mid differ diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/vidgame/bramble.mid b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/vidgame/bramble.mid new file mode 100644 index 00000000..179801d6 Binary files /dev/null and b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/vidgame/bramble.mid differ diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/vidgame/city.mid b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/vidgame/city.mid new file mode 100644 index 00000000..df52644c Binary files /dev/null and b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/vidgame/city.mid differ diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/vidgame/competit.mid b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/vidgame/competit.mid new file mode 100644 index 00000000..542f6c51 Binary files /dev/null and b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/vidgame/competit.mid differ diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/vidgame/dkc.mid b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/vidgame/dkc.mid new file mode 100644 index 00000000..d8f24678 Binary files /dev/null and b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/vidgame/dkc.mid differ diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/vidgame/luf1fortress.mid b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/vidgame/luf1fortress.mid new file mode 100644 index 00000000..b8082289 Binary files /dev/null and b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/vidgame/luf1fortress.mid differ diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/vidgame/luf1map.mid b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/vidgame/luf1map.mid new file mode 100644 index 00000000..4b898829 Binary files /dev/null and b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/vidgame/luf1map.mid differ diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/vidgame/tetris.mid b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/vidgame/tetris.mid new file mode 100644 index 00000000..9c56f983 Binary files /dev/null and b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/vidgame/tetris.mid differ diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/zefie/Halloween.mid b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/zefie/Halloween.mid new file mode 100644 index 00000000..e02c9264 Binary files /dev/null and b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/zefie/Halloween.mid differ diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/zefie/I_Love_You_Always_Forever.mid b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/zefie/I_Love_You_Always_Forever.mid new file mode 100644 index 00000000..e3f907df Binary files /dev/null and b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/zefie/I_Love_You_Always_Forever.mid differ diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/zefie/RunawayTrain.mid b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/zefie/RunawayTrain.mid new file mode 100644 index 00000000..fc0a891a Binary files /dev/null and b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/zefie/RunawayTrain.mid differ diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/zefie/StabbingWestward_SaveYourself.mid b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/zefie/StabbingWestward_SaveYourself.mid new file mode 100644 index 00000000..e7a3ed58 Binary files /dev/null and b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/zefie/StabbingWestward_SaveYourself.mid differ diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/zefie/anotherdayinparadise.mid b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/zefie/anotherdayinparadise.mid new file mode 100644 index 00000000..f4131e8a Binary files /dev/null and b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/zefie/anotherdayinparadise.mid differ diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/zefie/betteroffalone.mid b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/zefie/betteroffalone.mid new file mode 100644 index 00000000..dd5f0f9a Binary files /dev/null and b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/zefie/betteroffalone.mid differ diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/zefie/bluemonday.mid b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/zefie/bluemonday.mid new file mode 100644 index 00000000..f5fff861 Binary files /dev/null and b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/zefie/bluemonday.mid differ diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/zefie/cool.mid b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/zefie/cool.mid new file mode 100644 index 00000000..215d3cfb Binary files /dev/null and b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/zefie/cool.mid differ diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/zefie/gothmusic1.mid b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/zefie/gothmusic1.mid new file mode 100644 index 00000000..93ed34cd Binary files /dev/null and b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/zefie/gothmusic1.mid differ diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/zefie/new.mid b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/zefie/new.mid new file mode 100644 index 00000000..1cd4af9e Binary files /dev/null and b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/zefie/new.mid differ diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/zefie/only_happy_when_it_rains.mid b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/zefie/only_happy_when_it_rains.mid new file mode 100644 index 00000000..d4cdbce8 Binary files /dev/null and b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/zefie/only_happy_when_it_rains.mid differ diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/zefie/scatman.mid b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/zefie/scatman.mid new file mode 100644 index 00000000..55b2b978 Binary files /dev/null and b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/zefie/scatman.mid differ diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/zefie/shout.mid b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/zefie/shout.mid new file mode 100644 index 00000000..23b93130 Binary files /dev/null and b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/zefie/shout.mid differ diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/zefie/starnite.mid b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/zefie/starnite.mid new file mode 100644 index 00000000..334bdc57 Binary files /dev/null and b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/zefie/starnite.mid differ diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/zefie/takeonme.mid b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/zefie/takeonme.mid new file mode 100644 index 00000000..e7b29fbd Binary files /dev/null and b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/zefie/takeonme.mid differ diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/zefie/weird.mid b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/zefie/weird.mid new file mode 100644 index 00000000..a141fbd4 Binary files /dev/null and b/zefie_wtvp_minisrv/ServiceVault/wtv-music/music/zefie/weird.mid differ diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-setup/choose-bg-songs.js b/zefie_wtvp_minisrv/ServiceVault/wtv-setup/choose-bg-songs.js index 91077f01..d3f04a7b 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-setup/choose-bg-songs.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-setup/choose-bg-songs.js @@ -3,6 +3,9 @@ var minisrv_service_file = true; var WTVBGMusic = require("./WTVBGMusic.js"); var wtvbgm = new WTVBGMusic(minisrv_config, ssid_sessions[socket.ssid]) +var catsListed = 0; +var categories = wtvbgm.getCategoryList(); +var divide = Math.round(categories.length / 2, 0); headers = `200 OK Connection: Keep-Alive @@ -51,7 +54,7 @@ Background music styles -
+${(categories.length > 14) ? '' : ''} Background music styles
@@ -67,14 +70,10 @@ Choose a style name to see the songs for that style.
`; -var catsListed = 0; -var categories = wtvbgm.getCategoryList(); -var numCats = categories.length; -var divide = Math.round(numCats / 2, 0); Object.keys(categories).forEach(function (k) { - var pubcat = parseInt(k) + 1; - var songsInCat = wtvbgm.getCategorySongList(pubcat); + var catID = categories[k].id; + var songsInCat = wtvbgm.getCategorySongList(catID); if (songsInCat.length > 0) { if (catsListed == divide) { data += `
 @@ -83,9 +82,9 @@ Object.keys(categories).forEach(function (k) { data += `
- + -${categories[k]}
+${categories[k].name}
`; catsListed++; } @@ -114,16 +113,10 @@ data += `
-
- - - -
-
`; \ No newline at end of file diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-setup/reset-musicobj.js b/zefie_wtvp_minisrv/ServiceVault/wtv-setup/reset-musicobj.js index 0e5fba0a..e1e81467 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-setup/reset-musicobj.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-setup/reset-musicobj.js @@ -1,6 +1,6 @@ var music_obj = {}; -ssid_sessions[socket.ssid].setSessionData("wtv-bgmusic", Object.assign({}, music_obj)); +ssid_sessions[socket.ssid].setSessionData("wtv-bgmusic", music_obj); ssid_sessions[socket.ssid].saveSessionData(); headers = `300 OK -Location: wtv-setup:/choose-bg-songs`; - +Location: wtv-setup:/choose-bg-songs +wtv-backgroundmusic-load-playlist: wtv-setup:/get-playlist`; diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-setup/set-bg.js b/zefie_wtvp_minisrv/ServiceVault/wtv-setup/set-bg.js index ee3a9978..cd49aa62 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-setup/set-bg.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-setup/set-bg.js @@ -53,7 +53,7 @@ ${categoryName} -
+${(musicList.length > 14) ? '' : ''} ${categoryName}
@@ -71,8 +71,7 @@ Choose the songs that you'd like to include. `; var songsListed = 0; - var numSongs = musicList.length; - var divide = Math.round(numSongs / 2, 0); + var divide = Math.round(musicList.length / 2, 0); Object.keys(musicList).forEach(function (k) { if (songsListed == divide) { data += ` @@ -82,9 +81,12 @@ Choose the songs that you'd like to include.
- -${musicList[k]['title']} +`; + if (musicList[k]['title'].length > 12 && musicList[k]['title'].length < 18) data += ``; + if (musicList[k]['title'].length > 18) data += ``; + data += `${musicList[k]['title']}
`; + if (musicList[k]['title'].length > 12) data += ``; songsListed++; }); diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-setup/setup.js b/zefie_wtvp_minisrv/ServiceVault/wtv-setup/setup.js index a49a9429..bcea7650 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-setup/setup.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-setup/setup.js @@ -81,7 +81,7 @@ for ${ssid_sessions[socket.ssid].getSessionData("subscriber_username") || "You"} - +
Mail/Discuss
diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-setup/sound.js b/zefie_wtvp_minisrv/ServiceVault/wtv-setup/sound.js index ae910deb..7314ae84 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-setup/sound.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-setup/sound.js @@ -111,7 +111,11 @@ action="client:SetSetupValue" selected &wtv-muzac-on;${canDoMuzac ? '' : 'disabl - + + = 0) { var category = (request_headers.query.category) ? request_headers.query.category : null; var WTVBGMusic = require("./WTVBGMusic.js"); var wtvbgm = new WTVBGMusic(minisrv_config, ssid_sessions[socket.ssid]) var music_obj = wtvbgm.getMusicObj(); + var old_music_obj = Object.assign({}, music_obj); if (category == null) music_obj.enableCategories = []; else { @@ -15,13 +16,13 @@ if (request_headers.query && ssid_sessions[socket.ssid]) { if (wtvbgm.getSongCategory(parseInt(music_obj.enableSongs[k])) == parseInt(category)) toRemove.push(k); }); toRemove.forEach(function (v) { - music_obj.enableSongs.splice(v,1,""); + music_obj.enableSongs.splice(v, 1, ""); }); var newEnableSongs = music_obj.enableSongs.filter(value => Object.keys(value).length !== 0); music_obj.enableSongs = newEnableSongs; } } - var qraw = request_headers.request_url.split('?')[1]; + var qraw = request_headers.request_url.split('?')[1]; if (qraw.length > 0) { qraw = qraw.split("&"); for (let i = 0; i < qraw.length; i++) { @@ -29,18 +30,26 @@ if (request_headers.query && ssid_sessions[socket.ssid]) { if (qraw_split.length == 2) { var k = qraw_split[0]; if (k == "enableCategory") music_obj['enableCategories'].push(unescape(qraw[i].split("=")[1].replace(/\+/g, "%20"))); - if (k == "enableSong") music_obj['enableSongs'].push(unescape(qraw[i].split("=")[1].replace(/\+/g, "%20"))); + if (k == "enableSong") music_obj['enableSongs'].push(unescape(qraw[i].split("=")[1].replace(/\+/g, "%20"))); } } } } - music_obj.enableCategories = [...new Set(music_obj.enableCategories)]; - music_obj.enableSongs = [...new Set(music_obj.enableSongs)]; - ssid_sessions[socket.ssid].setSessionData("wtv-bgmusic", Object.assign({}, music_obj)); - ssid_sessions[socket.ssid].saveSessionData(); - headers = `200 OK + music_obj.enableCategories = [...new Set(music_obj.enableCategories.filter(value => Object.keys(value).length !== 0))]; + music_obj.enableSongs = [...new Set(music_obj.enableSongs.filter(value => Object.keys(value).length !== 0))]; + music_obj = Object.assign({}, music_obj) + if ((Object.keys(music_obj.enableCategories).length != Object.keys(old_music_obj.enableCategories).length) || (Object.keys(music_obj.enableSongs).length != Object.keys(old_music_obj.enableSongs).length)) { + // something changed + ssid_sessions[socket.ssid].setSessionData("wtv-bgmusic", music_obj); + ssid_sessions[socket.ssid].saveSessionData(); + headers = `200 OK Content-type: text/html wtv-backgroundmusic-load-playlist: wtv-setup:/get-playlist`; + } else { + // nothing changed + headers = `200 OK +Content-type: text/html`; + } } else { var outdata = doErrorPage(); headers = outdata[0]; diff --git a/zefie_wtvp_minisrv/WTVBGMusic.js b/zefie_wtvp_minisrv/WTVBGMusic.js index 2ac816e3..2cfa8bdd 100644 --- a/zefie_wtvp_minisrv/WTVBGMusic.js +++ b/zefie_wtvp_minisrv/WTVBGMusic.js @@ -18,7 +18,9 @@ class WTVBGMusic { "World", "Upbeat", "Mellow", - "Underground" + "Underground", + "Video Games", + "zefie's Choice" ] musiclist_classic = { "100": { @@ -420,6 +422,134 @@ class WTVBGMusic { "1108": { "title": "Xess", "url": "wtv-music:\/music\/newmusic\/pop2\/xess.mid" + }, + "1500": { + "title": "Stickerbrush Symphony", + "url": "wtv-music:\/music\/vidgame\/bramble.mid" + }, + "1501": { + "title": "Dearly Beloved", + "url": "wtv-music:\/music\/vidgame\/DearlyBeloved.mid" + }, + "1502": { + "title": "Night of Fate", + "url": "wtv-music:\/music\/vidgame\/NightofFate.mid" + }, + "1503": { + "title": "SimCity SNES", + "url": "wtv-music:\/music\/vidgame\/city.mid" + }, + "1504": { + "title": "Mt. Gagazat", + "url": "wtv-music:\/music\/vidgame\/Gagazat_Mt.mid" + }, + "1505": { + "title": "Terranigma Remix", + "url": "wtv-music:\/music\/vidgame\/Terranigma_Remix.mid" + }, + "1506": { + "title": "Lufia World Map", + "url": "wtv-music:\/music\/vidgame\/luf1map.mid" + }, + "1507": { + "title": "Lufia Doom Fortress", + "url": "wtv-music:\/music\/vidgame\/luf1fortress.mid" + }, + "1508": { + "title": "Zelda Underworld Remix", + "url": "wtv-music:\/music\/vidgame\/Zelda_I_-_Underworld_Theme.mid" + }, + "1509": { + "title": "Tetris Theme", + "url": "wtv-music:\/music\/vidgame\/tetris.mid" + }, + "1510": { + "title": "Sonic 3 Competition", + "url": "wtv-music:\/music\/vidgame\/competit.mid" + }, + "1511": { + "title": "Balamb Garden", + "url": "wtv-music:\/music\/vidgame\/Whatever_FF8_Balamb_GARDEN.mid" + }, + "1512": { + "title": "SeeD", + "url": "wtv-music:\/music\/vidgame\/Whatever_FF8_SeeD.mid" + }, + "1513": { + "title": "Oil Drum Alley", + "url": "wtv-music:\/music\/vidgame\/dkc.mid" + }, + "1514": { + "title": "The King of Speed", + "url": "wtv-music:\/music\/vidgame\/Daytona_USA_-_The_King_of_Speed.mid" + }, + "1515": { + "title": "Let's Go Away", + "url": "wtv-music:\/music\/vidgame\/Lets_Go_Away-Intermediate_Track.mid" + }, + "1600": { + "title": "I Love You Always Forever", + "url": "wtv-music:\/music\/zefie\/I_Love_You_Always_Forever.mid" + }, + "1601": { + "title": "Only Happy When it Rains", + "url": "wtv-music:\/music\/zefie\/only_happy_when_it_rains.mid" + }, + "1602": { + "title": "Halloween", + "url": "wtv-music:\/music\/zefie\/Halloween.mid" + }, + "1603": { + "title": "Cool", + "url": "wtv-music:\/music\/zefie\/cool.mid" + }, + "1604": { + "title": "Black Celebration", + "url": "wtv-music:\/music\/zefie\/gothmusic1.mid" + }, + "1605": { + "title": "Save Yourself", + "url": "wtv-music:\/music\/zefie\/StabbingWestward_SaveYourself.mid" + }, + "1606": { + "title": "Oh Starry Night", + "url": "wtv-music:\/music\/zefie\/starnite.mid" + }, + "1607": { + "title": "Blue Monday", + "url": "wtv-music:\/music\/zefie\/bluemonday.mid" + }, + "1608": { + "title": "Another Day in Paradise", + "url": "wtv-music:\/music\/zefie\/anotherdayinparadise.mid" + }, + "1609": { + "title": "Goin' Down the Fast Way", + "url": "wtv-music:\/music\/zefie\/new.mid" + }, + "1610": { + "title": "Take On Me", + "url": "wtv-music:\/music\/zefie\/takeonme.mid" + }, + "1611": { + "title": "Better Off Alone", + "url": "wtv-music:\/music\/zefie\/betteroffalone.mid" + }, + "1612": { + "title": "Runaway Train", + "url": "wtv-music:\/music\/zefie\/RunawayTrain.mid" + }, + "1613": { + "title": "Shout", + "url": "wtv-music:\/music\/zefie\/shout.mid" + }, + "1614": { + "title": "Scatman", + "url": "wtv-music:\/music\/zefie\/scatman.mid" + }, + "1615": { + "title": "Please Don't Go", + "url": "wtv-music:\/music\/zefie\/PleaseDontGo.mid" } }; musiclist_rmf = { @@ -982,6 +1112,134 @@ class WTVBGMusic { "1411": { "title": "Shibuya-ku", "url": "wtv-music:\/MusicCache\/headspace\/RMF\/ambient\/shibuya-ku.rmf" + }, + "1500": { + "title": "Stickerbrush Symphony", + "url": "wtv-music:\/music\/vidgame\/bramble.mid" + }, + "1501": { + "title": "Dearly Beloved", + "url": "wtv-music:\/music\/vidgame\/DearlyBeloved.mid" + }, + "1502": { + "title": "Night of Fate", + "url": "wtv-music:\/music\/vidgame\/NightofFate.mid" + }, + "1503": { + "title": "SimCity SNES", + "url": "wtv-music:\/music\/vidgame\/city.mid" + }, + "1504": { + "title": "Mt. Gagazat", + "url": "wtv-music:\/music\/vidgame\/Gagazat_Mt.mid" + }, + "1505": { + "title": "Terranigma Remix", + "url": "wtv-music:\/music\/vidgame\/Terranigma_Remix.mid" + }, + "1506": { + "title": "Lufia World Map", + "url": "wtv-music:\/music\/vidgame\/luf1map.mid" + }, + "1507": { + "title": "Lufia Doom Fortress", + "url": "wtv-music:\/music\/vidgame\/luf1fortress.mid" + }, + "1508": { + "title": "Zelda Underworld Remix", + "url": "wtv-music:\/music\/vidgame\/Zelda_I_-_Underworld_Theme.mid" + }, + "1509": { + "title": "Tetris Theme", + "url": "wtv-music:\/music\/vidgame\/tetris.mid" + }, + "1510": { + "title": "Sonic 3 Competition", + "url": "wtv-music:\/music\/vidgame\/competit.mid" + }, + "1511": { + "title": "Balamb Garden", + "url": "wtv-music:\/music\/vidgame\/Whatever_FF8_Balamb_GARDEN.mid" + }, + "1512": { + "title": "SeeD", + "url": "wtv-music:\/music\/vidgame\/Whatever_FF8_SeeD.mid" + }, + "1513": { + "title": "Oil Drum Alley", + "url": "wtv-music:\/music\/vidgame\/dkc.mid" + }, + "1514": { + "title": "The King of Speed", + "url": "wtv-music:\/music\/vidgame\/Daytona_USA_-_The_King_of_Speed.mid" + }, + "1515": { + "title": "Let's Go Away", + "url": "wtv-music:\/music\/vidgame\/Lets_Go_Away-Intermediate_Track.mid" + }, + "1600": { + "title": "I Love You Always Forever", + "url": "wtv-music:\/music\/zefie\/I_Love_You_Always_Forever.mid" + }, + "1601": { + "title": "Only Happy When it Rains", + "url": "wtv-music:\/music\/zefie\/only_happy_when_it_rains.mid" + }, + "1602": { + "title": "Halloween", + "url": "wtv-music:\/music\/zefie\/Halloween.mid" + }, + "1603": { + "title": "Cool", + "url": "wtv-music:\/music\/zefie\/cool.mid" + }, + "1604": { + "title": "Black Celebration", + "url": "wtv-music:\/music\/zefie\/gothmusic1.mid" + }, + "1605": { + "title": "Save Yourself", + "url": "wtv-music:\/music\/zefie\/StabbingWestward_SaveYourself.mid" + }, + "1606": { + "title": "Oh Starry Night", + "url": "wtv-music:\/music\/zefie\/starnite.mid" + }, + "1607": { + "title": "Blue Monday", + "url": "wtv-music:\/music\/zefie\/bluemonday.mid" + }, + "1608": { + "title": "Another Day in Paradise", + "url": "wtv-music:\/music\/zefie\/anotherdayinparadise.mid" + }, + "1609": { + "title": "Goin' Down the Fast Way", + "url": "wtv-music:\/music\/zefie\/new.mid" + }, + "1610": { + "title": "Take On Me", + "url": "wtv-music:\/music\/zefie\/takeonme.mid" + }, + "1611": { + "title": "Better Off Alone", + "url": "wtv-music:\/music\/zefie\/betteroffalone.mid" + }, + "1612": { + "title": "Runaway Train", + "url": "wtv-music:\/music\/zefie\/RunawayTrain.mid" + }, + "1613": { + "title": "Shout", + "url": "wtv-music:\/music\/zefie\/shout.mid" + }, + "1614": { + "title": "Scatman", + "url": "wtv-music:\/music\/zefie\/scatman.mid" + }, + "1615": { + "title": "Weird", + "url": "wtv-music:\/music\/zefie\/weird.mid" } }; @@ -1009,7 +1267,7 @@ class WTVBGMusic { // set up defaults if (this.session_data.hasCap("client-can-do-rmf")) { // rmf - music_obj.enableCategories = ["1", "2", "3", "7", "12", "13"]; + music_obj.enableCategories = ["1", "2", "3", "7", "12", "13", "15", "16"]; music_obj.enableSongs = [ "100", "101", "102", "104", "107", "109", "205", "206", "207", "211", @@ -1024,11 +1282,13 @@ class WTVBGMusic { "1100", "1101", "1102", "1103", "1104", "1201", "1202", "1203", "1204", "1300", "1302", - "1400", "1401" + "1400", "1401", + "1500", "1503", "1505", "1507", "1511", "1513", "1514", + "1600", "1603", "1607", "1609", "1612", "1614" ]; } else { // classic - music_obj.enableCategories = ["1", "2", "8"]; + music_obj.enableCategories = ["1", "2", "8", "15", "16"]; music_obj.enableSongs = [ "100", "101", "102", "104", "200", "205", "207", "209", "211", @@ -1040,10 +1300,12 @@ class WTVBGMusic { "800", "801", "802", "803", "804", "900", "901", "902", "903", "904", "1000", "1002", "1004", "1005", "1006", - "1100", "1101", "1102", "1103", "1104" + "1100", "1101", "1102", "1103", "1104", + "1500", "1503", "1505", "1507", "1511", "1513", "1514", + "1600", "1603", "1607", "1609", "1612", "1614" ]; } - this.session_data.setSessionData("wtv-bgmusic", Object.assign({}, music_obj)); + this.session_data.setSessionData("wtv-bgmusic", music_obj); this.session_data.saveSessionData(); } return music_obj; @@ -1101,13 +1363,15 @@ class WTVBGMusic { } getCategoryList() { - var categories = []; + var enabledCategories = []; var self = this; Object.keys(self.categories).forEach(function (k) { var songList = self.getCategorySongList(parseInt(k) + 1); - if (songList.length > 0) categories[k] = self.categories[k]; + if (songList.length > 0) enabledCategories.push({ + "id": parseInt(k) + 1, "name": self.categories[k] + }); }); - return categories.filter(value => Object.keys(value).length !== 0); + return enabledCategories.filter(value => Object.keys(value.name).length !== 0); }