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

Merge pull request #997 from vedgy/small-audio-player-fixes

Browse source 
Small audio player fixes
This commit is contained in:
Abs62 2018-04-17 20:30:56 +03:00 committed by GitHub
parent f4c22aac5c 19ab09b754
commit d9980bf662
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
audioplayerfactory.cc
View file

@ -60,14 +60,14 @@ void AudioPlayerFactory::reset()
if( !internalPlayerBackend.isQtmultimedia() ) if( !internalPlayerBackend.isQtmultimedia() )
{ {
if( qobject_cast< Ffmpeg::AudioPlayer * >( playerPtr.data() ) == 0 ) if( !playerPtr || !qobject_cast< Ffmpeg::AudioPlayer * >( playerPtr.data() ) )
playerPtr.reset( new Ffmpeg::AudioPlayer ); playerPtr.reset( new Ffmpeg::AudioPlayer );
return; return;
} }
#endif #endif
#ifdef MAKE_QTMULTIMEDIA_PLAYER #ifdef MAKE_QTMULTIMEDIA_PLAYER
if( qobject_cast< MultimediaAudioPlayer * >( playerPtr.data() ) == 0 ) if( !playerPtr || !qobject_cast< MultimediaAudioPlayer * >( playerPtr.data() ) )
playerPtr.reset( new MultimediaAudioPlayer ); playerPtr.reset( new MultimediaAudioPlayer );
return; return;
#endif #endif

5
ffmpegaudioplayer.hh
View file

@ -22,6 +22,11 @@ public:
this, SIGNAL( error( QString ) ) ); this, SIGNAL( error( QString ) ) );
} }
~AudioPlayer()
{
stop();
}
virtual QString play( const char * data, int size ) virtual QString play( const char * data, int size )
{ {
AudioService::instance().playMemory( data, size ); AudioService::instance().playMemory( data, size );