added settings for waveform/thumbnail resolution

dialogs/preferencesdialog.cpp

@@ -1,6 +1,7 @@
 #include "preferencesdialog.h"
 
 #include "io/config.h"
+#include "io/path.h"
 #include "playback/audio.h"
 #include "mainwindow.h"
 
@@ -140,7 +141,7 @@ void PreferencesDialog::save() {
 	bool reset_audio_required = (config.preferred_audio_output != audio_output_devices->currentData().toString()
 									|| config.preferred_audio_input != audio_input_devices->currentData().toString());
 	config.preferred_audio_output = audio_output_devices->currentData().toString();
-    config.preferred_audio_input = audio_input_devices->currentData().toString();
+	config.preferred_audio_input = audio_input_devices->currentData().toString();
 	config.audio_rate = audio_sample_rate->currentData().toInt();
 
 	// the following settings may require a restart of Olive to take effect:
@@ -149,18 +150,81 @@ void PreferencesDialog::save() {
 
 	if (config.effect_textbox_lines != effect_textbox_lines_field->value()) {
 		needs_restart = true;
-        config.effect_textbox_lines = effect_textbox_lines_field->value();
+		config.effect_textbox_lines = effect_textbox_lines_field->value();
 	}
 
 	if (config.use_software_fallback != use_software_fallbacks_checkbox->isChecked()) {
 		needs_restart = true;
-        config.use_software_fallback = use_software_fallbacks_checkbox->isChecked();
+		config.use_software_fallback = use_software_fallbacks_checkbox->isChecked();
 	}
 
-    if (config.language_file != language_combobox->currentData().toString()) {
+	if (config.language_file != language_combobox->currentData().toString()) {
-        needs_restart = true;
+		needs_restart = true;
-        config.language_file = language_combobox->currentData().toString();
+		config.language_file = language_combobox->currentData().toString();
-    }
+	}
+
+	if (config.thumbnail_resolution != thumbnail_res_spinbox->value()
+			|| config.waveform_resolution != waveform_res_spinbox->value()) {
+		// we're changing the size of thumbnails and waveforms, so let's delete them and regenerate them next start
+
+		needs_restart = true;
+
+		// delete nothing
+		char delete_match = 0;
+
+		if (config.thumbnail_resolution != thumbnail_res_spinbox->value()) {
+			// delete existing thumbnails
+			config.thumbnail_resolution = thumbnail_res_spinbox->value();
+
+			// delete only thumbnails
+			delete_match = 't';
+		}
+
+		if (config.waveform_resolution != waveform_res_spinbox->value()) {
+			// delete existing waveforms
+			config.waveform_resolution = waveform_res_spinbox->value();
+
+			// if we're already deleting thumbnails
+			if (delete_match == 't') {
+				// delete all
+				delete_match = 1;
+			} else {
+				// just delete waveforms
+				delete_match = 'w';
+			}
+		}
+
+		if (delete_match != 0) {
+			QDir preview_path(get_data_path() + "/previews");
+
+			if (delete_match == 1) {
+				// indiscriminately delete everything
+				preview_path.removeRecursively();
+			} else {
+				QStringList preview_file_list = preview_path.entryList(QDir::Files | QDir::NoDotAndDotDot);
+				for (int i=0;i<preview_file_list.size();i++) {
+
+					const QString& preview_file_str = preview_file_list.at(i);
+
+					// use filename to determine whether this is a thumbnail or a waveform
+					int identifier_char_index = qMax(0, preview_file_str.size()-2);
+
+					// find identifier char
+					while (identifier_char_index >= 0
+						   && preview_file_str.at(identifier_char_index) >= 48
+						   && preview_file_str.at(identifier_char_index) <= 57) {
+						identifier_char_index--;
+					}
+
+					// thumbnails will have a 't' towards the end of the filenames, waveforms will have a 'w'
+					// if they match the type of preview we're deleting, remove them
+					if (preview_file_str.at(identifier_char_index) == delete_match) {
+						QFile::remove(preview_path.filePath(preview_file_str));
+					}
+				}
+			}
+		}
+	}
 
 	// save keyboard shortcuts
 	for (int i=0;i<key_shortcut_fields.size();i++) {
@@ -304,87 +368,107 @@ void PreferencesDialog::setup_ui() {
 	QVBoxLayout* verticalLayout = new QVBoxLayout(this);
 	QTabWidget* tabWidget = new QTabWidget(this);
 
-    // row counter used to ease adding new rows
+	// row counter used to ease adding new rows
-    int row = 0;
+	int row = 0;
 
 	// General
 	QWidget* general_tab = new QWidget(this);
 	QGridLayout* general_layout = new QGridLayout(general_tab);
 
-    // General -> Language
+	// General -> Language
-    general_layout->addWidget(new QLabel(tr("Language:")), row, 0, 1, 1);
+	general_layout->addWidget(new QLabel(tr("Language:")), row, 0, 1, 1);
 
-    language_combobox = new QComboBox();
+	language_combobox = new QComboBox();
 
-    // add default language (en-US)
+	// add default language (en-US)
-    language_combobox->addItem(QLocale::languageToString(QLocale("en-US").language()));
+	language_combobox->addItem(QLocale::languageToString(QLocale("en-US").language()));
 
-    // add languages from file
+	// add languages from file
-    QDir translation_dir(QApplication::applicationDirPath().append("/ts"));
+	QDir translation_dir(QApplication::applicationDirPath().append("/ts"));
-    QStringList translation_files = translation_dir.entryList({"*.qm"}, QDir::Files | QDir::NoDotAndDotDot);
+	QStringList translation_files = translation_dir.entryList({"*.qm"}, QDir::Files | QDir::NoDotAndDotDot);
-    for (int i=0;i<translation_files.size();i++) {
+	for (int i=0;i<translation_files.size();i++) {
-        QString locale_full_path = translation_dir.filePath(translation_files.at(i));
+		QString locale_full_path = translation_dir.filePath(translation_files.at(i));
-        QFileInfo locale_file(translation_files.at(i));
+		QFileInfo locale_file(translation_files.at(i));
-        QString locale_file_basename = locale_file.baseName();
+		QString locale_file_basename = locale_file.baseName();
-        QString locale_str = locale_file_basename.mid(locale_file_basename.lastIndexOf('_')+1);
+		QString locale_str = locale_file_basename.mid(locale_file_basename.lastIndexOf('_')+1);
-        language_combobox->addItem(QLocale(locale_str).nativeLanguageName(), locale_full_path);
+		language_combobox->addItem(QLocale(locale_str).nativeLanguageName(), locale_full_path);
 
-        if (config.language_file == locale_full_path) {
+		if (config.language_file == locale_full_path) {
-            language_combobox->setCurrentIndex(language_combobox->count() - 1);
+			language_combobox->setCurrentIndex(language_combobox->count() - 1);
-        }
+		}
-    }
+	}
 
-    general_layout->addWidget(language_combobox, row, 1, 1, 2);
+	general_layout->addWidget(language_combobox, row, 1, 1, 3);
 
-    row++;
+	row++;
 
 	// General -> Custom CSS
-    general_layout->addWidget(new QLabel(tr("Custom CSS:"), this), row, 0, 1, 1);
+	general_layout->addWidget(new QLabel(tr("Custom CSS:"), this), row, 0, 1, 1);
 
 	custom_css_fn = new QLineEdit(general_tab);
 	custom_css_fn->setText(config.css_path);
-    general_layout->addWidget(custom_css_fn, row, 1, 1, 1);
+	general_layout->addWidget(custom_css_fn, row, 1, 1, 2);
 
 	QPushButton* custom_css_browse = new QPushButton(tr("Browse"), general_tab);
 	connect(custom_css_browse, SIGNAL(clicked(bool)), this, SLOT(browse_css_file()));
-    general_layout->addWidget(custom_css_browse, row, 2, 1, 1);
+	general_layout->addWidget(custom_css_browse, row, 3, 1, 1);
 
-    row++;
+	row++;
 
 	// General -> Image Sequence Formats
-    general_layout->addWidget(new QLabel(tr("Image sequence formats:"), this), row, 0, 1, 1);
+	general_layout->addWidget(new QLabel(tr("Image sequence formats:"), this), row, 0, 1, 1);
 
 	imgSeqFormatEdit = new QLineEdit(general_tab);
 
-    general_layout->addWidget(imgSeqFormatEdit, row, 1, 1, 2);
+	general_layout->addWidget(imgSeqFormatEdit, row, 1, 1, 3);
 
-    row++;
+	row++;
 
 	// General -> Audio Recording
-    general_layout->addWidget(new QLabel(tr("Audio Recording:"), this), row, 0, 1, 1);
+	general_layout->addWidget(new QLabel(tr("Audio Recording:"), this), row, 0, 1, 1);
 
 	recordingComboBox = new QComboBox(general_tab);
 	recordingComboBox->addItem(tr("Mono"));
 	recordingComboBox->addItem(tr("Stereo"));
-    general_layout->addWidget(recordingComboBox, row, 1, 1, 2);
+	general_layout->addWidget(recordingComboBox, row, 1, 1, 3);
 
-    row++;
+	row++;
 
 	// General -> Effect Textbox Lines
-    general_layout->addWidget(new QLabel(tr("Effect Textbox Lines:"), this), row, 0, 1, 1);
+	general_layout->addWidget(new QLabel(tr("Effect Textbox Lines:"), this), row, 0, 1, 1);
 
 	effect_textbox_lines_field = new QSpinBox(general_tab);
 	effect_textbox_lines_field->setMinimum(1);
 	effect_textbox_lines_field->setValue(config.effect_textbox_lines);
-    general_layout->addWidget(effect_textbox_lines_field, row, 1, 1, 2);
+	general_layout->addWidget(effect_textbox_lines_field, row, 1, 1, 3);
 
-    row++;
+	row++;
+
+	// General -> Thumbnail and Waveform Resolution
+	general_layout->addWidget(new QLabel(tr("Thumbnail Resolution:"), this), row, 0, 1, 1);
+
+	thumbnail_res_spinbox = new QSpinBox(this);
+	thumbnail_res_spinbox->setMinimum(1);
+	thumbnail_res_spinbox->setMaximum(INT_MAX);
+	thumbnail_res_spinbox->setValue(config.thumbnail_resolution);
+	general_layout->addWidget(thumbnail_res_spinbox, row, 1, 1, 1);
+
+	general_layout->addWidget(new QLabel(tr("Waveform Resolution:"), this), row, 2, 1, 1);
+
+	waveform_res_spinbox = new QSpinBox(this);
+	waveform_res_spinbox->setMinimum(1);
+	waveform_res_spinbox->setMaximum(INT_MAX);
+	waveform_res_spinbox->setValue(config.waveform_resolution);
+	general_layout->addWidget(waveform_res_spinbox, row, 3, 1, 1);
+
+
+	row++;
 
 	// General -> Use Software Fallbacks When Possible
 	use_software_fallbacks_checkbox = new QCheckBox(general_tab);
 	use_software_fallbacks_checkbox->setText(tr("Use Software Fallbacks When Possible"));
 	use_software_fallbacks_checkbox->setChecked(config.use_software_fallback);
-    general_layout->addWidget(use_software_fallbacks_checkbox, row, 0, 1, 1);
+	general_layout->addWidget(use_software_fallbacks_checkbox, row, 0, 1, 4);
 
 	tabWidget->addTab(general_tab, tr("General"));
 

dialogs/preferencesdialog.h

@@ -65,7 +65,9 @@ private:
 	QComboBox* audio_output_devices;
 	QComboBox* audio_input_devices;
 	QComboBox* audio_sample_rate;
-    QComboBox* language_combobox;
+	QComboBox* language_combobox;
+	QSpinBox* thumbnail_res_spinbox;
+	QSpinBox* waveform_res_spinbox;
 
 	QVector<QAction*> key_shortcut_actions;
 	QVector<QTreeWidgetItem*> key_shortcut_items;

io/config.cpp

@@ -48,7 +48,9 @@ Config::Config()
 	  seek_also_selects(false),
 	  effect_textbox_lines(3),
 	  use_software_fallback(false),
-	  center_timeline_timecodes(true)
+	  center_timeline_timecodes(true),
+	  waveform_resolution(64),
+	  thumbnail_resolution(120)
 {}
 
 void Config::load(QString path) {
@@ -179,10 +181,16 @@ void Config::load(QString path) {
 				} else if (stream.name() == "PreferredAudioInput") {
 					stream.readNext();
 					preferred_audio_input = stream.text().toString();
-                } else if (stream.name() == "LanguageFile") {
+				} else if (stream.name() == "LanguageFile") {
-                    stream.readNext();
+					stream.readNext();
-                    language_file = stream.text().toString();
+					language_file = stream.text().toString();
-                }
+				} else if (stream.name() == "ThumbnailResolution") {
+					stream.readNext();
+					thumbnail_resolution = stream.text().toInt();
+				} else if (stream.name() == "WaveformResolution") {
+					stream.readNext();
+					waveform_resolution = stream.text().toInt();
+				}
 			}
 		}
 		if (stream.hasError()) {
@@ -245,8 +253,10 @@ void Config::save(QString path) {
 	stream.writeTextElement("UseSoftwareFallback", QString::number(use_software_fallback));
 	stream.writeTextElement("CenterTimelineTimecodes", QString::number(center_timeline_timecodes));
 	stream.writeTextElement("PreferredAudioOutput", preferred_audio_output);
-    stream.writeTextElement("PreferredAudioInput", preferred_audio_input);
+	stream.writeTextElement("PreferredAudioInput", preferred_audio_input);
-    stream.writeTextElement("LanguageFile", language_file);
+	stream.writeTextElement("LanguageFile", language_file);
+	stream.writeTextElement("ThumbnailResolution", QString::number(thumbnail_resolution));
+	stream.writeTextElement("WaveformResolution", QString::number(waveform_resolution));
 
 	stream.writeEndElement(); // configuration
 	stream.writeEndDocument(); // doc

io/config.h

@@ -66,7 +66,9 @@ struct Config {
 	bool center_timeline_timecodes;
 	QString preferred_audio_output;
 	QString preferred_audio_input;
-    QString language_file;
+	QString language_file;
+	int waveform_resolution;
+	int thumbnail_resolution;
 
 	void load(QString path);
 	void save(QString path);

io/previewgenerator.cpp

@@ -18,9 +18,6 @@
 #include <QDir>
 #include <QDateTime>
 
-#define WAVEFORM_RESOLUTION 64
-#define THUMBNAIL_RESOLUTION 120
-
 extern "C" {
 #include <libavformat/avformat.h>
 #include <libavcodec/avcodec.h>
@@ -278,7 +275,7 @@ void PreviewGenerator::generate_waveform() {
 			if (s != nullptr) {
 				if (fmt_ctx->streams[packet->stream_index]->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) {
 					if (!s->preview_done) {
-						int dstH = THUMBNAIL_RESOLUTION;
+						int dstH = config.thumbnail_resolution;
 						int dstW = qRound(dstH * (float(temp_frame->width)/float(temp_frame->height)));
 						uint8_t* data = new uint8_t[size_t(dstW*dstH*4)];
 
@@ -317,7 +314,7 @@ void PreviewGenerator::generate_waveform() {
 					}
 					media_lengths[packet->stream_index]++;
 				} else if (fmt_ctx->streams[packet->stream_index]->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) {
-					int interval = qFloor((temp_frame->sample_rate/WAVEFORM_RESOLUTION)/4)*4;
+					int interval = qFloor((temp_frame->sample_rate/config.waveform_resolution)/4)*4;
 
 					AVFrame* swr_frame = av_frame_alloc();
 					swr_frame->channel_layout = temp_frame->channel_layout;