Merge branch 'develop' of https://github.com/ciderapp/Cider into develop

This commit is contained in:
booploops 2022-05-12 23:07:02 -07:00
commit e9575411d8

View file

@ -66,7 +66,7 @@
<select class="md-select" style="width:180px;" <select class="md-select" style="width:180px;"
v-model="$root.cfg.audio.maikiwiAudio.atmosphereRealizer1_value" v-model="$root.cfg.audio.maikiwiAudio.atmosphereRealizer1_value"
v-on:change="CiderAudio.hierarchical_loading();"> v-on:change="CiderAudio.hierarchical_loading();">
<option v-for="profile in arprofiles" :value="profile.id">{{ getProfileLz("CTS", profile.name) }}</option> <option v-for="profile in arprofiles" :value="profile.id">{{ getProfileLz("CAR", profile.id) }}</option>
</select> </select>
</div> </div>
</div> </div>
@ -91,7 +91,7 @@
<select class="md-select" style="width:180px;" <select class="md-select" style="width:180px;"
v-model="$root.cfg.audio.maikiwiAudio.atmosphereRealizer2_value" v-model="$root.cfg.audio.maikiwiAudio.atmosphereRealizer2_value"
v-on:change="CiderAudio.hierarchical_loading();"> v-on:change="CiderAudio.hierarchical_loading();">
<option v-for="profile in arprofiles" :value="profile.id">{{ getProfileLz("CTS", profile.name) }}</option> <option v-for="profile in arprofiles" :value="profile.id">{{ getProfileLz("CAR", profile.id) }}</option>
</select> </select>
</div> </div>
</div> </div>
@ -117,7 +117,7 @@
<select class="md-select" style="width:180px;" <select class="md-select" style="width:180px;"
v-model="$root.cfg.audio.maikiwiAudio.spatialProfile" v-model="$root.cfg.audio.maikiwiAudio.spatialProfile"
v-on:change="toggleMaikiwiSpatial"> v-on:change="toggleMaikiwiSpatial">
<option v-for="profile in spprofiles" :value="profile.id">{{ getProfileLz("CAR", profile.id) }}</option> <option v-for="profile in spprofiles" :value="profile.id">{{ getProfileLz("CTS", profile.name) }}</option>
</select> </select>
</div> </div>
</div> </div>
@ -187,15 +187,21 @@
}, },
methods: { methods: {
getProfileLz(type, name) { getProfileLz(type, name) {
if (name === "Cryptofyre" || name === "Maikiwi") { switch (name) {
return name; case "CRYPTO":
return "Cryptofyre";
break;
case "Maikiwi":
return "Maikiwi";
break;
} }
switch (type) { switch (type) {
case "CAR": case "CAR":
return this.$root.getLz('settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.' + name); return this.$root.getLz('settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.' + name);
break; break;
case "CTS": case "CTS":
return this.$root.getLz('settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.' + name); return this.$root.getLz('settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.' + name.toLowerCase());
break; break;
default: default:
return name; return name;