-
Notifications
You must be signed in to change notification settings - Fork 21
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Igor Zinken
committed
Jan 26, 2020
1 parent
ffad171
commit 90023a0
Showing
11 changed files
with
293 additions
and
55 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,154 @@ | ||
| /** | ||
| * The MIT License (MIT) | ||
| * | ||
| * Igor Zinken 2020 - https://www.igorski.nl | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy of | ||
| * this software and associated documentation files (the 'Software'), to deal in | ||
| * the Software without restriction, including without limitation the rights to | ||
| * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of | ||
| * the Software, and to permit persons to whom the Software is furnished to do so, | ||
| * subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in all | ||
| * copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS | ||
| * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR | ||
| * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER | ||
| * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | ||
| * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| */ | ||
| <template> | ||
| <div class="channel-strip"> | ||
| <h3>{{ title }}</h3> | ||
| <h4 class="preset-name">{{ name }}</h4> | ||
| <div class="wrapper input range volume-wrapper"> | ||
| <label v-t="'volumeTitle'" | ||
| for="instrumentVolume" | ||
| class="volume-title" | ||
| ></label> | ||
| <input v-model="volume" | ||
| type="range" | ||
| id="instrumentVolume" | ||
| min="0" max="1" step="0.01" value="1" | ||
| class="range" | ||
| /> | ||
| </div> | ||
| <div v-if="supportsPanning" | ||
| class="wrapper input range panning-wrapper" | ||
| > | ||
| <label v-t="'panTitle'" | ||
| for="instrumentPanning" | ||
| ></label> | ||
| <input v-model="panning" | ||
| type="range" | ||
| id="instrumentPanning" | ||
| min="-1" max="1" step=".01" value="0" | ||
| class="range" | ||
| /> | ||
| </div> | ||
| </div> | ||
| </template> | ||
|
|
||
| <script> | ||
| import { mapState, mapMutations } from 'vuex'; | ||
| import AudioService from '@/services/audio-service'; | ||
| import { supports } from '@/services/audio/webaudio-helper'; | ||
| export default { | ||
| props: { | ||
| instrumentIndex: { | ||
| type: Number, | ||
| required: true, | ||
| }, | ||
| }, | ||
| data: vm => ({ | ||
| title: `# ${vm.instrumentIndex + 1}`, | ||
| supportsPanning: false, | ||
| }), | ||
| computed: { | ||
| ...mapState({ | ||
| activeSong: state => state.song.activeSong, | ||
| }), | ||
| instrument() { | ||
| return this.activeSong.instruments[ this.instrumentIndex ]; | ||
| }, | ||
| name() { | ||
| return (this.instrument.presetName || this.instrument.name || '').replace('FACTORY ', ''); | ||
| }, | ||
| volume: { | ||
| get() { | ||
| return this.instrument.volume; | ||
| }, | ||
| set( value ) { | ||
| this.updateInstrument({ instrumentIndex: this.instrumentIndex, prop: 'volume', value }); | ||
| AudioService.adjustInstrumentVolume( this.instrumentIndex, value ); | ||
| } | ||
| }, | ||
| panning: { | ||
| get() { | ||
| return this.instrument.panning; | ||
| }, | ||
| set( value ) { | ||
| this.updateInstrument({ instrumentIndex: this.instrumentIndex, prop: 'panning', value }); | ||
| AudioService.adjustInstrumentPanning( this.instrumentIndex, value ); | ||
| } | ||
| }, | ||
| }, | ||
| created() { | ||
| this.supportsPanning = supports('panning'); | ||
| }, | ||
| methods: { | ||
| ...mapMutations([ | ||
| 'updateInstrument', | ||
| ]), | ||
| }, | ||
| }; | ||
| </script> | ||
|
|
||
| <style lang='scss' scoped> | ||
| @import '@/styles/_layout.scss'; | ||
| $width: 80px; | ||
| .channel-strip { | ||
| width: $width; | ||
| display: inline-block; | ||
| margin: $spacing-medium 0; | ||
| padding: 0 0 $spacing-large $spacing-medium; | ||
| border-right: 1px solid #666; | ||
| position: relative; | ||
| } | ||
| .preset-name { | ||
| @include textOverflow(); | ||
| margin-left: -$spacing-medium; | ||
| font-size: 75%; | ||
| text-align: center; | ||
| height: 1.5em; | ||
| background-color: $color-2; | ||
| padding: 5px; | ||
| color: #000; | ||
| } | ||
| .range { | ||
| width: 125px; | ||
| height: 25px; | ||
| } | ||
| .volume-title { | ||
| margin-left: $spacing-small; | ||
| } | ||
| .volume-wrapper { | ||
| transform: rotate(-90deg); | ||
| transform-origin: 0; | ||
| margin: 130px 0 0 8px; | ||
| } | ||
| .panning-wrapper { | ||
| width: 70px; | ||
| } | ||
| </style> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| { | ||
| "en-US": { | ||
| "title": "Mixer", | ||
| "volumeTitle": "Volume", | ||
| "panTitle": "Panning" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| /** | ||
| * The MIT License (MIT) | ||
| * | ||
| * Igor Zinken 2020 - https://www.igorski.nl | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy of | ||
| * this software and associated documentation files (the 'Software'), to deal in | ||
| * the Software without restriction, including without limitation the rights to | ||
| * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of | ||
| * the Software, and to permit persons to whom the Software is furnished to do so, | ||
| * subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in all | ||
| * copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS | ||
| * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR | ||
| * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER | ||
| * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | ||
| * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| */ | ||
| <template> | ||
| <div class="mixer"> | ||
| <div class="header"> | ||
| <h2 v-t="'title'"></h2> | ||
| <button class="close-button" | ||
| @click="$emit('close')" | ||
| >x</button> | ||
| </div> | ||
| <div class="channels"> | ||
| <channel-strip v-for="(instrument, index) in activeSong.instruments" | ||
| :key="`channel_${index}`" | ||
| :instrument-index="index" | ||
| /> | ||
| </div> | ||
| </div> | ||
| </template> | ||
|
|
||
| <script> | ||
| import { mapState } from 'vuex'; | ||
| import ChannelStrip from './components/channel-strip'; | ||
| import messages from './messages.json'; | ||
| export default { | ||
| i18n: { messages }, | ||
| components: { | ||
| ChannelStrip, | ||
| }, | ||
| computed: { | ||
| ...mapState({ | ||
| activeSong: state => state.song.activeSong, | ||
| }), | ||
| }, | ||
| }; | ||
| </script> | ||
|
|
||
| <style lang='scss' scoped> | ||
| @import '@/styles/_layout.scss'; | ||
| .mixer { | ||
| @include editorComponent(); | ||
| @include overlay(); | ||
| height: auto; | ||
| } | ||
| .title { | ||
| margin: $spacing-medium; | ||
| } | ||
| /* ideal size and above (tablet/desktop) */ | ||
| $ideal-mixer-width: 895px; | ||
| $ideal-mixer-height: 360px; | ||
| @media screen and ( min-width: $ideal-mixer-width ) { | ||
| .mixer { | ||
| top: 50%; | ||
| left: 50%; | ||
| width: $ideal-mixer-width; | ||
| height: $ideal-mixer-height; | ||
| margin-left: -$ideal-mixer-width / 2; | ||
| margin-top: -$ideal-mixer-height / 2; | ||
| } | ||
| } | ||
| /* small screen / mobile, etc. */ | ||
| @media screen and ( max-width: $ideal-mixer-width ) { | ||
| .mixer { | ||
| position: absolute; | ||
| height: 100%; | ||
| top: 0; | ||
| margin-top: 0; | ||
| @include verticalScrollOnMobile(); | ||
| } | ||
| } | ||
| </style> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,6 @@ | ||
| { | ||
| "en-US": { | ||
| "instrumentEditor": "Instrument editor" | ||
| "instrumentEditor": "Instrument editor", | ||
| "mixer": "Mixer" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.