hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-11-30 17:24:08 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge pull request #1424 from shenlebantongying/fix/insanly-click-audio-crash

Browse source 
fix: crash when clicking audio insanely fast.
This commit is contained in:
xiaoyifang 2024-03-20 13:20:38 +08:00 committed by GitHub
parent 728fa4850c 97a3824e9f
commit 52c07b9291
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/ffmpegaudio.cc
View file

@ -52,11 +52,12 @@ AudioService::~AudioService()
void AudioService::playMemory( const char * ptr, int size ) void AudioService::playMemory( const char * ptr, int size )
{ {
emit cancelPlaying( false ); emit cancelPlaying( false );
if ( !thread.isNull() ) {
thread->wait();
}
QByteArray audioData( ptr, size ); QByteArray audioData( ptr, size );
thread = std::make_shared< DecoderThread >( audioData, this ); thread.reset( new DecoderThread( audioData, this ) );
connect( this, &AudioService::cancelPlaying, thread.get(), [ this ]( bool waitFinished ) { connect( this, &AudioService::cancelPlaying, thread.get(), &DecoderThread::cancel );
thread->cancel( waitFinished );
} );
thread->start(); thread->start();
} }
@ -263,6 +264,11 @@ bool DecoderContext::openOutputDevice( QString & errorString )
} }
#endif #endif
if ( audioOutput == nullptr ) {
errorString += QStringLiteral( "Failed to create audioOutput." );
return false;
}
audioOutput->setAudioFormat( 44100, codecContext_->channels ); audioOutput->setAudioFormat( 44100, codecContext_->channels );
return true; return true;
} }

2
src/ffmpegaudio.hh
View file

@ -29,7 +29,7 @@ class DecoderThread;
class AudioService: public QObject class AudioService: public QObject
{ {
Q_OBJECT Q_OBJECT
std::shared_ptr< DecoderThread > thread; QScopedPointer< DecoderThread > thread;
public: public:
static AudioService & instance(); static AudioService & instance();