Merge branch 'master' into sqlite_2

This commit is contained in:
advplyr 2023-07-11 17:07:13 -05:00
commit d56e3a3617
3 changed files with 4 additions and 4 deletions

View File

@ -48,7 +48,7 @@ export default {
}, },
methods: { methods: {
clickedOption(action) { clickedOption(action) {
this.$emit('action', action) this.$emit('action', { action })
} }
}, },
mounted() {} mounted() {}

View File

@ -94,7 +94,7 @@
<transition name="slide"> <transition name="slide">
<div v-if="showEncodeOptions" class="mb-4 pb-4 border-b border-white/10"> <div v-if="showEncodeOptions" class="mb-4 pb-4 border-b border-white/10">
<div class="flex flex-wrap -mx-2"> <div class="flex flex-wrap -mx-2">
<ui-text-input-with-label ref="bitrateInput" v-model="encodingOptions.bitrate" :disabled="processing || isTaskFinished" :label="'Audio Bitrate (e.g. 64k)'" class="m-2 max-w-40" /> <ui-text-input-with-label ref="bitrateInput" v-model="encodingOptions.bitrate" :disabled="processing || isTaskFinished" :label="'Audio Bitrate (e.g. 128k)'" class="m-2 max-w-40" />
<ui-text-input-with-label ref="channelsInput" v-model="encodingOptions.channels" :disabled="processing || isTaskFinished" :label="'Audio Channels (1 or 2)'" class="m-2 max-w-40" /> <ui-text-input-with-label ref="channelsInput" v-model="encodingOptions.channels" :disabled="processing || isTaskFinished" :label="'Audio Channels (1 or 2)'" class="m-2 max-w-40" />
<ui-text-input-with-label ref="codecInput" v-model="encodingOptions.codec" :disabled="processing || isTaskFinished" :label="'Audio Codec'" class="m-2 max-w-40" /> <ui-text-input-with-label ref="codecInput" v-model="encodingOptions.codec" :disabled="processing || isTaskFinished" :label="'Audio Codec'" class="m-2 max-w-40" />
</div> </div>
@ -214,7 +214,7 @@ export default {
showEncodeOptions: false, showEncodeOptions: false,
shouldBackupAudioFiles: true, shouldBackupAudioFiles: true,
encodingOptions: { encodingOptions: {
bitrate: '64k', bitrate: '128k',
channels: '2', channels: '2',
codec: 'aac' codec: 'aac'
} }

View File

@ -57,7 +57,7 @@ class AbMergeManager {
} }
async runAudiobookMerge(libraryItem, task, encodingOptions) { async runAudiobookMerge(libraryItem, task, encodingOptions) {
const audioBitrate = encodingOptions.bitrate || '64k' const audioBitrate = encodingOptions.bitrate || '128k'
const audioCodec = encodingOptions.codec || 'aac' const audioCodec = encodingOptions.codec || 'aac'
const audioChannels = encodingOptions.channels || 2 const audioChannels = encodingOptions.channels || 2