Abs62
|
531aa79805
|
Merge branch 'Original' into Qt4x5
Conflicts:
ffmpegaudio.cc
|
2014-07-16 17:58:40 +04:00 |
|
Abs62
|
2f8b4975a3
|
Fix play ADPCM wav files via internal player
|
2014-07-15 18:47:08 +04:00 |
|
Timon Wong
|
555b51260a
|
Merge branch 'master' into qt4x5
|
2013-06-26 21:07:46 +08:00 |
|
Tvangeste
|
55e4de2cca
|
Stop the internal audio player when the page is closed or changed
|
2013-06-23 11:54:46 +02:00 |
|
Timon Wong
|
f5a43e22d4
|
Merge branch 'master' into qt4x5
Conflicts:
goldendict.pro
|
2013-06-18 11:22:07 +08:00 |
|
Timon Wong
|
cf71499242
|
Add "DISABLE_INTERNAL_PLAYER" to .pro as an option to disable internal audio player (issue #356)
|
2013-06-18 09:12:31 +08:00 |
|
Timon Wong
|
1d85f1b359
|
#212: Scratch, currently works under windows, for both Qt4 and Qt5
|
2013-05-30 21:24:21 +08:00 |
|
Timon Wong
|
525a539b7e
|
FFmpeg: Fix potential crash on some codecs (speex for example)
|
2013-05-24 16:15:07 +08:00 |
|
Timon Wong
|
680c201b88
|
audio: localizable error string
|
2013-05-15 00:00:31 +08:00 |
|
Timon Wong
|
fa1e0711b5
|
audio: give more meaningful error message for ao_open_live(). see #312
|
2013-05-14 22:24:19 +08:00 |
|
Timon Wong
|
c4752eb14c
|
Add internal audio player(ffmpeg/libav + libao).
* phonon, bass, playsound are removed.
|
2013-05-05 18:22:12 +08:00 |
|