Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-10-22 07:21:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GUI: merge: don't allow setting sub charset for text subs from Matroska files

Browse Source 
The --sub-charset setting is ignored by mkvmerge for tracks read from
Matroska files as those tracks are always encoded in UTF-8.

See #1416.
This commit is contained in:
Moritz Bunkus 2015-08-28 23:08:38 +02:00
parent 4d4b926f30
commit 45ffae051a
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mkvtoolnix-gui/merge/input.cpp
View File

@ -365,10 +365,12 @@ Tab::onTrackSelectionChanged() {
else if (track->isVideo())
Util::enableWidgets(m_videoControls, true);
else if (track->isSubtitles())
else if (track->isSubtitles()) {
Util::enableWidgets(m_subtitleControls, true);
if (track->m_file->m_type == FILE_TYPE_MATROSKA)
Util::enableWidgets(QList<QWidget *>{} << ui->characterSetLabel << ui->subtitleCharacterSet, false);
else if (track->isChapters())
} else if (track->isChapters())
Util::enableWidgets(m_chapterControls, true);
if (track->isAppended())
@ -734,7 +736,10 @@ Tab::onSubtitleCharacterSetChanged(int newValue) {
if (characterSet.isEmpty())
return;
withSelectedTracks([&](Track *track) { track->m_characterSet = characterSet; }, true);
withSelectedTracks([&](Track *track) {
if (track->m_file->m_type != FILE_TYPE_MATROSKA)
track->m_characterSet = characterSet;
}, true);
}
void