Ainias/wordRotator
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

changed music to mp3

Browse Source
This commit is contained in:
silas 2018-09-26 14:54:46 +02:00
parent 877ff297c6
commit 8d131e2119
5 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
public/js/app.js
View File

@ -4705,14 +4705,9 @@ class SoundManager {
audioObject.timeOffset = Helper.nonNull(options.timeOffset, audioObject.timeOffset, 0);
this.channels[channel] = audioObject;
console.log(options);
if (audioObject.muted){
this.stop(channel);
}
else if (Helper.isNotNull(options.muted) && options.muted === false){
// this.play(channel);
}
return this.channels[channel];
}
@ -4731,7 +4726,6 @@ class SoundManager {
this.stop(channel);
this.set(audioOrOptions, channel);
console.log(this.channels[channel]);
if (!this.channels[channel].muted) {
let buffer = await this.channels[channel].loadedPromise;
let source = this.context.createBufferSource();
@ -4741,6 +4735,10 @@ class SoundManager {
source.loop = this.channels[channel].loop;
gain.gain.value = this.channels[channel].volume;
//to prevent gap in mp3-files
source.loopStart = 0.3;
source.loopEnd = buffer.duration-0.3;
source.connect(gain);
gain.connect(this.context.destination);
source.start(0);
@ -6341,7 +6339,7 @@ InitPromise.resolve(app).then(function(){
let settingsManager = SettingsManager.getInstance();
let soundManager = SoundManager.getInstance();
soundManager.play(SoundManager.CHANNELS.MUSIC, {audio: "sound/brightAndBeautifull__.wav", loop: true, volume: 0.6, muted: !settingsManager.getSetting("play-music", true)});
soundManager.play(SoundManager.CHANNELS.MUSIC, {audio: "sound/brightAndBeautifull__.mp3", loop: true, volume: 0.6, muted: !settingsManager.getSetting("play-music", true)});
app.start(SynchronizeSite);
Translator.setLanguage("de");

BIN
public/sound/brightAndBeautifull__.mp3 Normal file
View File

Binary file not shown.

2
src/js/init.js
View File

@ -61,7 +61,7 @@ InitPromise.resolve(app).then(function(){
let settingsManager = SettingsManager.getInstance();
let soundManager = SoundManager.getInstance();
soundManager.play(SoundManager.CHANNELS.MUSIC, {audio: "sound/brightAndBeautifull__.wav", loop: true, volume: 0.6, muted: !settingsManager.getSetting("play-music", true)});
soundManager.play(SoundManager.CHANNELS.MUSIC, {audio: "sound/brightAndBeautifull__.mp3", loop: true, volume: 0.6, muted: !settingsManager.getSetting("play-music", true)});
app.start(SynchronizeSite);
Translator.setLanguage("de");

10
src/js/lib/pwa-assets.js
View File

@ -141,14 +141,9 @@ class SoundManager {
audioObject.timeOffset = Helper.nonNull(options.timeOffset, audioObject.timeOffset, 0);
this.channels[channel] = audioObject;
console.log(options);
if (audioObject.muted){
this.stop(channel);
}
else if (Helper.isNotNull(options.muted) && options.muted === false){
// this.play(channel);
}
return this.channels[channel];
}
@ -167,7 +162,6 @@ class SoundManager {
this.stop(channel);
this.set(audioOrOptions, channel);
console.log(this.channels[channel]);
if (!this.channels[channel].muted) {
let buffer = await this.channels[channel].loadedPromise;
let source = this.context.createBufferSource();
@ -177,6 +171,10 @@ class SoundManager {
source.loop = this.channels[channel].loop;
gain.gain.value = this.channels[channel].volume;
//to prevent gap in mp3-files
source.loopStart = 0.3;
source.loopEnd = buffer.duration-0.3;
source.connect(gain);
gain.connect(this.context.destination);
source.start(0);

0
public/sound/brightAndBeautifull__.wav → src/sound/brightAndBeautifull__.wav
View File