Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
mirror of https://github.com/clementine-player/Clementine synced 2024-12-16 19:31:02 +01:00
Code Issues Releases Wiki Activity

* Add check that chromaprinter is only used from a non-UI thread.

Browse Source 
* Update copyright date
This commit is contained in:
John Maguire 2012-01-09 15:30:59 +01:00
parent 8582253738
commit 0c5f422eb8
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/musicbrainz/chromaprinter.cpp
View File

@ -1,5 +1,5 @@
/* This file is part of Clementine. /* This file is part of Clementine.
Copyright 2010, David Sansome <me@davidsansome.com> Copyright 2012, David Sansome <me@davidsansome.com>
Clementine is free software: you can redistribute it and/or modify Clementine is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -17,8 +17,10 @@
#include "chromaprinter.h" #include "chromaprinter.h"
#include <QCoreApplication>
#include <QDir> #include <QDir>
#include <QEventLoop> #include <QEventLoop>
#include <QThread>
#include <QtDebug> #include <QtDebug>
#include <QTime> #include <QTime>
@ -32,9 +34,7 @@ Chromaprinter::Chromaprinter(const QString& filename)
: filename_(filename), : filename_(filename),
event_loop_(NULL), event_loop_(NULL),
convert_element_(NULL), convert_element_(NULL),
finishing_(false) finishing_(false) {
{
buffer_.open(QIODevice::WriteOnly);
} }
Chromaprinter::~Chromaprinter() { Chromaprinter::~Chromaprinter() {
@ -57,6 +57,10 @@ GstElement* Chromaprinter::CreateElement(const QString &factory_name,
} }
QString Chromaprinter::CreateFingerprint() { QString Chromaprinter::CreateFingerprint() {
Q_ASSERT(QThread::currentThread() != qApp->thread());
buffer_.open(QIODevice::WriteOnly);
GMainContext* context = g_main_context_new(); GMainContext* context = g_main_context_new();
g_main_context_push_thread_default(context); g_main_context_push_thread_default(context);
event_loop_ = g_main_loop_new(context, FALSE); event_loop_ = g_main_loop_new(context, FALSE);