Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "Added option to remove/replace originals in transcoder dialog." 

This reverts commit 6b6547095a.
This commit is contained in:
John Maguire 2022-01-13 21:30:42 +00:00
parent ab37de5e8f
commit e69ceb25df
2 changed files with 1 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/transcoder/transcodedialog.cpp
View File

@ -98,9 +98,6 @@ TranscodeDialog::TranscodeDialog(QWidget* parent)
}
}
ui_->remove_original->setChecked(
s.value("overwrite_existing", false).toBool());
// Add a start button
start_button_ = ui_->button_box->addButton(tr("Start transcoding"),
QDialogButtonBox::ActionRole);
@ -186,7 +183,6 @@ void TranscodeDialog::Start() {
QSettings s;
s.beginGroup(kSettingsGroup);
s.setValue("last_output_format", preset.codec_mimetype_);
s.setValue("overwrite_existing", ui_->remove_original->isChecked());
}
void TranscodeDialog::Cancel() {
@ -210,20 +206,6 @@ void TranscodeDialog::JobComplete(const QUrl& input, const QString& output,
UpdateStatusText();
UpdateProgress();
bool overwrite_existing = ui_->remove_original->isChecked();
QFileInfo input_fileinfo(input);
QFileInfo output_fileinfo(output);
bool same_extension = input_fileinfo.suffix() == output_fileinfo.suffix();
bool same_path =
input_fileinfo.absolutePath() == output_fileinfo.absolutePath();
if (success && overwrite_existing) {
QFile(input).remove();
if (same_path && same_extension) {
QFile(output).rename(input);
}
}
}
void TranscodeDialog::UpdateProgress() {

12
src/transcoder/transcodedialog.ui
View File

@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>499</width>
<height>482</height>
<height>448</height>
</rect>
</property>
<property name="windowTitle">
@ -165,16 +165,6 @@
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QCheckBox" name="remove_original">
<property name="toolTip">
<string>If enabled the original files will be removed. If transcoded files have the same file extension and the destination is the same directory as the original files, the original files will be replaced.</string>
</property>
<property name="text">
<string>Remove or replace original files </string>
</property>
</widget>
</item>
</layout>
</widget>
</item>