Skip to content

Commit

Permalink
Merge pull request #5019 from joshuaboniface/set-ffmpeg-disabled
Browse files Browse the repository at this point in the history
Set FFmpeg path disabled
  • Loading branch information
joshuaboniface authored Nov 29, 2023
2 parents d5ebc64 + b9ee65e commit a5184bb
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 17 deletions.
3 changes: 1 addition & 2 deletions src/controllers/dashboard/encodingsettings.html
Original file line number Diff line number Diff line change
Expand Up @@ -223,9 +223,8 @@ <h3 class="checkboxListLabel">${LabelHardwareEncodingOptions}</h3>
<div class="inputContainer fldEncoderPath">
<div style="display: flex; align-items: center;">
<div style="flex-grow:1;">
<input is="emby-input" class="txtEncoderPath" label="${LabelffmpegPath}" autocomplete="off" />
<input is="emby-input" class="txtEncoderPath" label="${LabelffmpegPath}" autocomplete="off" disabled />
</div>
<button type="button" is="paper-icon-button-light" id="btnSelectEncoderPath" class="emby-input-iconbutton"><span class="material-icons search" aria-hidden="true"></span></button>
</div>
<div class="fieldDescription">
<div>${LabelffmpegPathHelp}</div>
Expand Down
15 changes: 0 additions & 15 deletions src/controllers/dashboard/encodingsettings.js
Original file line number Diff line number Diff line change
Expand Up @@ -234,21 +234,6 @@ import alert from '../../components/alert';

setDecodingCodecsVisible(page, this.value);
});
$('#btnSelectEncoderPath', page).on('click.selectDirectory', function () {
import('../../components/directorybrowser/directorybrowser').then(({default: DirectoryBrowser}) => {
const picker = new DirectoryBrowser();
picker.show({
includeFiles: true,
callback: function (path) {
if (path) {
$('.txtEncoderPath', page).val(path);
}

picker.close();
}
});
});
});
$('#btnSelectTranscodingTempPath', page).on('click.selectDirectory', function () {
import('../../components/directorybrowser/directorybrowser').then(({default: DirectoryBrowser}) => {
const picker = new DirectoryBrowser();
Expand Down

0 comments on commit a5184bb

Please sign in to comment.