okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/develop' into develop

Browse source
This commit is contained in:
child_duckling 2022-04-22 19:47:19 -07:00
commit 288ea77eb2
6 changed files with 303 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/renderer/views/pages/settings.ejs
View file

@ -915,6 +915,17 @@
</div>
<div class="settings-option-body">
<div class="md-option-line" v-show="app.cfg.advanced.AudioContext">
<div class="md-option-segment">
FFmpeg location<br/>
<small>Restart needed to work. Required for AirPlay. (For example: C:\ffmpeg-4.4-essentials_build\bin\ffmpeg.exe)</small><br/>
<small>You can look at the internet on how to install it.</small>
</div>
<div class="md-option-segment md-option-segment_auto">
<input type="text" v-model="app.cfg.advanced.ffmpegLocation"/>
</div>
</div>
<div class="md-option-line">
<div class="md-option-segment">
{{$root.getLz('settings.option.visual.plugin.github.explore')}}