Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Only prune the scope buffer list from a single thread. Maybe fixes issue #120

Browse Source
This commit is contained in:
David Sansome 2010-03-29 14:00:44 +00:00
parent 5e482b99ec
commit 0aec407984
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/xine-engine.cpp
View File

@ -31,6 +31,8 @@
#include <QLocale> #include <QLocale>
#include <QTimer> #include <QTimer>
#include <boost/scoped_ptr.hpp>
extern "C" extern "C"
{ {
#include <unistd.h> #include <unistd.h>
@ -259,9 +261,6 @@ XineEngine::load( const QUrl &url, bool isStream )
qDebug() << "After xine_open() *****"; qDebug() << "After xine_open() *****";
#ifndef XINE_SAFE_MODE #ifndef XINE_SAFE_MODE
//we must ensure the scope is pruned of old buffers
PruneScope();
xine_post_out_t *source = xine_get_audio_source( m_stream ); xine_post_out_t *source = xine_get_audio_source( m_stream );
xine_post_in_t *target = (xine_post_in_t*)xine_post_input( m_post, const_cast<char*>("audio in") ); xine_post_in_t *target = (xine_post_in_t*)xine_post_input( m_post, const_cast<char*>("audio in") );
xine_post_wire( source, target ); xine_post_wire( source, target );
@ -692,9 +691,6 @@ XineEngine::scope()
if (myChannels > 2) if (myChannels > 2)
return m_scope; return m_scope;
//prune the buffer list and update m_currentVpts
PruneScope();
for( int n, frame = 0; frame < 512; ) for( int n, frame = 0; frame < 512; )
{ {
MyNode *best_node = 0; MyNode *best_node = 0;
@ -1307,11 +1303,9 @@ PruneScopeThread::PruneScopeThread(XineEngine *parent)
} }
void PruneScopeThread::run() { void PruneScopeThread::run() {
QTimer* timer = new QTimer; boost::scoped_ptr<QTimer> timer(new QTimer);
connect(timer, SIGNAL(timeout()), engine_, SLOT(PruneScope()), Qt::DirectConnection); connect(timer.get(), SIGNAL(timeout()), engine_, SLOT(PruneScope()), Qt::DirectConnection);
timer->start(1000); timer->start(1000);
exec(); exec();
delete timer;
} }