diff --git a/src/components/sections/SamplerTab.vue b/src/components/sections/SamplerTab.vue index 4c4e8b9..467ddb6 100644 --- a/src/components/sections/SamplerTab.vue +++ b/src/components/sections/SamplerTab.vue @@ -67,6 +67,7 @@ import {sendHttpCommand, websocket} from "@/util/sockets"; import AudioVisualiser from "@/components/sections/sampler/AudioVisualiser"; import SampleHandler from "@/components/sections/files/SampleHandler"; import ModalBox from "@/components/design/modal/ModalBox"; +import {isDeviceMini} from "@/util/util"; export default { name: "SamplerTab", @@ -85,7 +86,7 @@ export default { methods: { isActiveFunction(sampleFunction) { - if (!store.hasActiveDevice()) { + if (!store.hasActiveDevice() || isDeviceMini()) { return false; } return store.getActiveDevice().sampler.banks[this.activeBank][this.activeButton].function === sampleFunction; @@ -96,7 +97,7 @@ export default { }, isActiveOrder(order) { - if (!store.hasActiveDevice()) { + if (!store.hasActiveDevice() || isDeviceMini()) { return false; } return store.getActiveDevice().sampler.banks[this.activeBank][this.activeButton].order === order; @@ -107,7 +108,7 @@ export default { }, getSamples() { - if (!store.hasActiveDevice()) { + if (!store.hasActiveDevice() || isDeviceMini()) { return []; } return store.getActiveDevice().sampler.banks[this.activeBank][this.activeButton].samples; diff --git a/src/components/sections/lighting/LightingEffects.vue b/src/components/sections/lighting/LightingEffects.vue index a24bf8f..ef51d52 100644 --- a/src/components/sections/lighting/LightingEffects.vue +++ b/src/components/sections/lighting/LightingEffects.vue @@ -99,14 +99,14 @@ export default { }, isPresetMuteInactiveState(state) { - if (!store.hasActiveDevice()) { + if (!store.hasActiveDevice() || isDeviceMini()) { return false; } return store.getActiveDevice().lighting.buttons[this.activeEffect].off_style === state; }, isEffectMuteInactiveState(state) { - if (!store.hasActiveDevice()) { + if (!store.hasActiveDevice() || isDeviceMini()) { return false; } return store.getActiveDevice().lighting.buttons[this.activeEffect].off_style === state; @@ -125,7 +125,7 @@ export default { }, getColour(active) { - if (!store.hasActiveDevice()) { + if (!store.hasActiveDevice() || isDeviceMini()) { return "#000000"; } let button = this.activePreset; @@ -134,14 +134,14 @@ export default { }, getEncoderColour(colour) { - if (!store.hasActiveDevice()) { + if (!store.hasActiveDevice() || isDeviceMini()) { return "#000000"; } return "#" + store.getActiveDevice().lighting.encoders[this.activeEncoder][colour]; }, getEffectColour(active) { - if (!store.hasActiveDevice()) { + if (!store.hasActiveDevice() || isDeviceMini()) { return "#000000"; } let colour = (active) ? "colour_one" : "colour_two"; diff --git a/src/components/sections/lighting/LightingMixer.vue b/src/components/sections/lighting/LightingMixer.vue index 5eb0d02..d539800 100644 --- a/src/components/sections/lighting/LightingMixer.vue +++ b/src/components/sections/lighting/LightingMixer.vue @@ -170,14 +170,14 @@ export default { }, getScreenColour() { - if (!store.hasActiveDevice()) { + if (!store.hasActiveDevice() || isDeviceMini()) { return "#000000"; } return "#" + store.getActiveDevice().lighting.simple[ScribbleNames[this.activeChannel]].colour_one; }, getScreenIcons() { - if (!store.hasActiveDevice()) { + if (!store.hasActiveDevice() || isDeviceMini()) { return []; } @@ -185,7 +185,7 @@ export default { }, isActiveIcon(file_name) { - if (!store.hasActiveDevice()) { + if (!store.hasActiveDevice() || isDeviceMini()) { return false; } return store.getActiveDevice().fader_status[this.activeChannel].scribble.file_name === file_name; @@ -200,7 +200,7 @@ export default { }, isShowNumber() { - if (!store.hasActiveDevice()) { + if (!store.hasActiveDevice() || isDeviceMini()) { return false; } if (this.textValue === null) { @@ -216,7 +216,7 @@ export default { }, isInverted() { - if (!store.hasActiveDevice()) { + if (!store.hasActiveDevice() || isDeviceMini()) { return false; } @@ -229,7 +229,7 @@ export default { }, getBottomText() { - if (!store.hasActiveDevice()) { + if (!store.hasActiveDevice() || isDeviceMini()) { return false; } let text = store.getActiveDevice().fader_status[this.activeChannel].scribble.bottom_text; diff --git a/src/components/sections/lighting/LightingSampler.vue b/src/components/sections/lighting/LightingSampler.vue index 8aabf35..c0bd207 100644 --- a/src/components/sections/lighting/LightingSampler.vue +++ b/src/components/sections/lighting/LightingSampler.vue @@ -32,6 +32,7 @@ import PushButton from "@/components/button_list/Button"; import {store} from "@/store"; import {websocket} from "@/util/sockets"; import ColourBox from "@/components/sections/lighting/ColourBox"; +import {isDeviceMini} from "@/util/util"; export default { name: "LightingSampler", @@ -45,7 +46,7 @@ export default { methods: { isInactiveState(state) { - if (!store.hasActiveDevice()) { + if (!store.hasActiveDevice() || isDeviceMini()) { return false; } return store.getActiveDevice().lighting.sampler[this.activeBank].off_style === state; @@ -55,7 +56,7 @@ export default { }, getColour(element) { - if (!store.hasActiveDevice()) { + if (!store.hasActiveDevice() || isDeviceMini()) { return "#000000"; } return "#" + store.getActiveDevice().lighting.sampler[this.activeBank].colours[element]; diff --git a/src/components/sections/sampler/AudioVisualiser.vue b/src/components/sections/sampler/AudioVisualiser.vue index 843c692..b179700 100644 --- a/src/components/sections/sampler/AudioVisualiser.vue +++ b/src/components/sections/sampler/AudioVisualiser.vue @@ -18,6 +18,7 @@