Skip to content

Commit

Permalink
Add right-click context menu for transition links and save settings t…
Browse files Browse the repository at this point in the history 
…o local storage
  • Loading branch information
@jmkao
jmkao committed Feb 21, 2022
1 parent 5263303 commit 198e184
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 43 deletions.
50 changes: 14 additions & 36 deletions src/components/MidiHub.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,17 +174,27 @@ console.log(eventData);
this.midi.disable()
this.midiInputsAvailable = []
this.midiOutputsAvailable = []
let savedMidiInputName = this.$q.localStorage.getItem('lastMidiInputName')
let savedMidiOutputName = this.$q.localStorage.getItem('lastMidiOutputName')
this.midi.enable(error => {
if (error) {
console.log('Webmidi Error:' + error)
}
this.midi.inputs.map(input => {
this.midiInputsAvailable.push(input.name)
console.log(`'${input.id} / '${input.name}`)
if (input.name === savedMidiInputName) {
this.midiInputName = savedMidiInputName
}
})
this.midi.outputs.map(output => {
this.midiOutputsAvailable.push(output.name)
console.log(`'${output.id} / '${output.name}`)
if (output.name === savedMidiOutputName) {
this.midiOutputName = savedMidiOutputName
}
})
if (typeof update !== 'undefined') {
Expand Down Expand Up @@ -216,6 +226,8 @@ console.log(eventData);
return false
}
this.$q.localStorage.set('lastMidiInputName', this.midiInputName)
this.midiInput.addListener('noteon', 'all', data => {
const channel = data.channel
const note = data.note.number
Expand Down Expand Up @@ -249,42 +261,6 @@ console.log(eventData);
this.$global.$emit(eventName, eventData)
}
}
// Controls: 11 12 13 14
// var i = FADER_CCS.indexOf(control)
// if (i > -1) {
// this.$root.$emit('midiFader' + i, {
// midi: this.midi,
// channel: channel,
// control: control,
// value: value
// })
// return
// }
// // Buttons only test if value = 127
// if (value === 127) {
// i = TT_ADV_CCS.indexOf(control)
// if (i > -1) {
// this.$root.$emit('timetable', 'advance')
// }
// i = TT_RET_CCS.indexOf(control)
// if (i > -1) {
// this.$root.$emit('timetable', 'retract')
// }
// i = TRANSITION_CCS.indexOf(control)
// if (i > -1) {
// this.$root.$emit('transition')
// }
// if (control >= SCENE_CC_ZERO && control < (SCENE_CC_ZERO + this.scenes.length)) {
// const event = 'scene' + (control - SCENE_CC_ZERO)
// // console.log('Sending event ' + event)
// this.$root.$emit(event)
// }
// }
})
console.log(this.midiOutputName)
Expand All @@ -296,6 +272,8 @@ console.log(eventData);
console.log(`MIDI Output named ${this.midiOutputName} could not be opened`)
return true
}
this.$q.localStorage.set('lastMidiOutputName', this.midiOutputName)
}
this.$global.$emit('midiout', { name: 'init' })
Expand Down
40 changes: 33 additions & 7 deletions src/layouts/MainLayout.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,21 @@
<div class="row">
<q-btn color="grey" stack icon="navigate_before" class="col-auto mini" label="Timetable" @click="timetable('retract')" />
<q-btn color="grey" stack icon="linked_camera" class="col-auto mini" label="Active" @click="screenshot('active')"/>
<q-btn color="red" class="col" label="Transition" @click="transition()" />
<q-btn color="red" class="col" label="Transition" @click="transition()">
</q-btn>
<q-btn color="grey" stack icon="navigate_before" class="col-auto mini" label="Timetable" @click="timetable('retract')" />
<q-btn color="grey" stack icon="navigate_next" class="col-auto mini" label="Timetable" @click="timetable('advance')"/>
<q-btn color="red" class="col" label="Transition" @click="transition()" />
<q-btn color="grey" stack icon="linked_camera" class="col-auto mini" label="Active" @click="screenshot('active')" />
<q-btn color="grey" stack icon="navigate_next" class="col-auto mini" label="Timetable" @click="timetable('advance')"/>
<q-menu touch-position context-menu>
<div class="row q-pa-md column">
<q-toggle v-model="linkTransitionTTAdvance" label="Link Transition to Timetable Advance"
@update:model-value="(value) => $q.localStorage.set('linkTransitionTTAdvance', value) "/>
<q-toggle v-model="linkTransitionTTRetract" label="Link Transition to Timetable Retract"
@update:model-value="(value) => $q.localStorage.set('linkTransitionTTRetract', value) "/>
</div>
</q-menu>
</div>
</q-header>

Expand Down Expand Up @@ -99,7 +108,9 @@ export default {
status: {
previewIndex: -1,
currentIndex: -1
}
},
linkTransitionTTAdvance: false,
linkTransitionTTRetract: false
}
},
computed: {
Expand All @@ -111,14 +122,22 @@ export default {
}
}
},
created: function () {
// if (typeof window.OBSWebSocket === 'undefined') {
// window.OBSWebSocket = require('obs-websocket-js')
// }
// window.OBSWebSocket = window.obs.websocket
mounted: function () {
this.$global.$on('transition', this.transition)
this.$global.$on('timetable', this.timetable)
this.$global.$on('screenshot', this.screenshot)
if (this.$q.localStorage.has('linkTransitionTTAdvance')) {
this.linkTransitionTTAdvance = this.$q.localStorage.getItem('linkTransitionTTAdvance')
}
if (this.$q.localStorage.has('linkTransitionTTRetract')) {
this.linkTransitionTTRetract = this.$q.localStorage.getItem('linkTransitionTTRetract')
}
if (this.$q.localStorage.has('lastObsAddress')) {
this.obsAddress = this.$q.localStorage.getItem('lastObsAddress')
}
},
unmounted: function () {
try {
Expand Down Expand Up @@ -188,6 +207,7 @@ export default {
this.obsBtnLabel = 'Disconnect'
this.obsConnectionPending = false
this.obsIsConnected = true
this.$q.localStorage.set('lastObsAddress', this.obsAddress)
this.obs.send('GetSceneList').then(data => {
console.log('GetSceneList retrieved # scenes: ' + String(data.scenes.length))
this.scenes = data.scenes
Expand Down Expand Up @@ -276,6 +296,12 @@ export default {
return
}
this.obs.send('TransitionToProgram')
if (this.linkTransitionTTAdvance) {
this.timetable('advance')
}
if (this.linkTransitionTTRetract) {
this.timetable('retract')
}
},
timetable (direction) {
if (!this.obsIsConnected) {
Expand Down

0 comments on commit 198e184

Please sign in to comment.