fixed various issues with threading

playback/audio.cpp

@@ -102,8 +102,10 @@ void stop_audio() {
 
 void clear_audio_ibuffer() {
 	if (audio_thread != nullptr) audio_thread->lock.lock();
+	audio_write_lock.lock();
 	memset(audio_ibuffer, 0, audio_ibuffer_size);
 	audio_ibuffer_read = 0;
+	audio_write_lock.unlock();
 	if (audio_thread != nullptr) audio_thread->lock.unlock();
 }
 
@@ -292,7 +294,7 @@ bool start_recording() {
 		return false;
 	}
 
-    QString audio_path = project_url + " " + QCoreApplication::translate("Audio", "Audio");
+	QString audio_path = project_url + " " + QCoreApplication::translate("Audio", "Audio");
 	QDir audio_dir(audio_path);
 	if (!audio_dir.exists() && !audio_dir.mkpath(".")) {
 		qCritical() << "Failed to create audio directory";
@@ -303,7 +305,7 @@ bool start_recording() {
 	int file_number = 0;
 	do {
 		file_number++;
-        audio_filename = audio_path + "/" + QCoreApplication::translate("Audio", "Recording") + " " + QString::number(file_number) + ".wav";
+		audio_filename = audio_path + "/" + QCoreApplication::translate("Audio", "Recording") + " " + QString::number(file_number) + ".wav";
 	} while (QFile(audio_filename).exists());
 
 	output_recording.setFileName(audio_filename);

playback/cacher.cpp

@@ -376,11 +376,13 @@ void cache_audio_worker(Clip* c, bool scrubbing, QVector<Clip*>& nests) {
 				qint16 new_sample = static_cast<qint16>((frame->data[0][c->frame_sample_index+1] & 0xFF) << 8 | (frame->data[0][c->frame_sample_index] & 0xFF));
 				qint16 mixed_sample = mix_audio_sample(old_sample, new_sample);
 
-				audio_ibuffer[upper_byte_index] = static_cast<quint8>((mixed_sample >> 8) & 0xFF);
-				audio_ibuffer[lower_byte_index] = static_cast<quint8>(mixed_sample & 0xFF);
+				audio_ibuffer[upper_byte_index] = quint8((mixed_sample >> 8) & 0xFF);
+				audio_ibuffer[lower_byte_index] = quint8(mixed_sample & 0xFF);
 
 				c->audio_buffer_write+=2;
 				c->frame_sample_index+=2;
+
+				if (c->audio_reset) break;
 			}
 
 #ifdef AUDIOWARNINGS
@@ -389,6 +391,8 @@ void cache_audio_worker(Clip* c, bool scrubbing, QVector<Clip*>& nests) {
 
 			audio_write_lock.unlock();
 
+			if (c->audio_reset) return;
+
 			if (scrubbing) {
 				if (audio_thread != nullptr) audio_thread->notifyReceiver();
 			}
@@ -558,7 +562,9 @@ void reset_cache(Clip* c, long target_frame) {
 		} else {
 			if (c->stream->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) {
 				// clear current queue
+				c->queue_lock.lock();
 				c->queue_clear();
+				c->queue_lock.unlock();
 
 				// seeks to nearest keyframe (target_frame represents internal clip frame)
 				int64_t target_ts = seconds_to_timestamp(c, playhead_to_clip_seconds(c, target_frame));

playback/playback.cpp

@@ -158,8 +158,10 @@ void get_clip_frame(Clip* c, long playhead) {
 #endif
 						closest_frame = i;
 						break;
-					} else if (c->queue.at(i)->pts > c->queue.at(closest_frame)->pts && c->queue.at(i)->pts < target_pts) {
-						closest_frame = i;
+					} else {
+						if (c->queue.at(i)->pts > c->queue.at(closest_frame)->pts && c->queue.at(i)->pts < target_pts) {
+							closest_frame = i;
+						}
 					}
 				}
 
@@ -247,7 +249,7 @@ void get_clip_frame(Clip* c, long playhead) {
 		if (target_frame == nullptr || reset) {
 			// reset cache
 			texture_failed = true;
-			qInfo() << "Frame queue couldn't keep up - either the user seeked or the system is overloaded (queue size:" << c->queue.size() << ")";
+//			qInfo() << "Frame queue couldn't keep up - either the user seeked or the system is overloaded (queue size:" << c->queue.size() << ")";
 		}
 
 		if (target_frame != nullptr) {