diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2011-02-11 16:43:55 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2011-02-11 16:43:55 +0000 |
| commit | 37a919696b36d9d49265484ce4f38e48654c6193 (patch) | |
| tree | a2e0890544a4f90901a8cc9f234deb28c543f2ef | |
| parent | e60f6f8e6726e229342a06ff874f6d52c22105b3 (diff) | |
| download | qmmp-37a919696b36d9d49265484ce4f38e48654c6193.tar.gz qmmp-37a919696b36d9d49265484ce4f38e48654c6193.tar.bz2 qmmp-37a919696b36d9d49265484ce4f38e48654c6193.zip | |
fixed problem with glibc 2.13 (Patch by Michał Grosicki)
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2045 90c681e8-e032-0410-971d-27865f9a5e38
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | src/plugins/Output/alsa/outputalsa.cpp | 12 | ||||
| -rw-r--r-- | src/ui/txt/thanks_en.txt | 1 | ||||
| -rw-r--r-- | src/ui/txt/thanks_ru.txt | 1 |
4 files changed, 9 insertions, 6 deletions
@@ -48,6 +48,7 @@ Thanks to: Erik Ölsar <erlk.ozlr@gmail.com> - skinned cursors, ui improvements Funda Wang <fundawang@gmail.com> - cmake files fixes Michail Zheludkov <zheludkovm@mail.ru> - ffmpeg plugin fixes + Michał Grosicki <grosik88@o2.pl> - alsa plugin fixes Panagiotis Papadopoulos <pano_90@gmx.net> - ui fixes, bug reports Pino Toscano <toscano.pino@tiscali.it> - portability patches Karel Volný <kvolny@redhat.com> - various fixes diff --git a/src/plugins/Output/alsa/outputalsa.cpp b/src/plugins/Output/alsa/outputalsa.cpp index 905d58a20..460a300c4 100644 --- a/src/plugins/Output/alsa/outputalsa.cpp +++ b/src/plugins/Output/alsa/outputalsa.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006-2010 by Ilya Kotov * + * Copyright (C) 2006-2011 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -223,7 +223,7 @@ void OutputALSA::drain() l -= m; m = snd_pcm_frames_to_bytes(pcm_handle, m); // convert frames to bytes m_prebuf_fill -= m; - memcpy(m_prebuf, m_prebuf + m, m_prebuf_fill); + memmove(m_prebuf, m_prebuf + m, m_prebuf_fill); } else break; @@ -258,7 +258,7 @@ qint64 OutputALSA::writeAudio(unsigned char *data, qint64 maxSize) { if((maxSize = qMin(maxSize, m_prebuf_size - m_prebuf_fill)) > 0) { - memcpy(m_prebuf + m_prebuf_fill, data, maxSize); + memmove(m_prebuf + m_prebuf_fill, data, maxSize); m_prebuf_fill += maxSize; } @@ -273,7 +273,7 @@ qint64 OutputALSA::writeAudio(unsigned char *data, qint64 maxSize) l -= m; m = snd_pcm_frames_to_bytes(pcm_handle, m); // convert frames to bytes m_prebuf_fill -= m; - memcpy(m_prebuf, m_prebuf + m, m_prebuf_fill); //move data to begin + memmove(m_prebuf, m_prebuf + m, m_prebuf_fill); //move data to begin } else return -1; @@ -297,8 +297,8 @@ long OutputALSA::alsa_write(unsigned char *data, long size) else if (m >= 0) { if (m < size) - { - snd_pcm_wait(pcm_handle, 500); + { + snd_pcm_wait(pcm_handle, 500); } return m; } diff --git a/src/ui/txt/thanks_en.txt b/src/ui/txt/thanks_en.txt index 87ec5f050..2e52ed482 100644 --- a/src/ui/txt/thanks_en.txt +++ b/src/ui/txt/thanks_en.txt @@ -12,6 +12,7 @@ Thanks to: Erik Ölsar <erlk.ozlr@gmail.com> - skinned cursors, ui improvements Funda Wang <fundawang@gmail.com> - cmake files fixes Michail Zheludkov <zheludkovm@mail.ru> - ffmpeg plugin fixes + Michał Grosicki <grosik88@o2.pl> - alsa plugin fixes Panagiotis Papadopoulos <pano_90@gmx.net> - ui fixes, bug reports Pino Toscano <toscano.pino@tiscali.it> - portability patches Karel Volný <kvolny@redhat.com> - various fixes diff --git a/src/ui/txt/thanks_ru.txt b/src/ui/txt/thanks_ru.txt index 523d94e59..c6edb7110 100644 --- a/src/ui/txt/thanks_ru.txt +++ b/src/ui/txt/thanks_ru.txt @@ -12,6 +12,7 @@ Erik Ölsar <erlk.ozlr@gmail.com> - растровые курсоры, улучшения в интерфейсе пользователя Funda Wang <fundawang@gmail.com> - исправления файлов cmake Михаил Желудков <zheludkovm@mail.ru> - исправления в модуле ffmpeg + Michał Grosicki <grosik88@o2.pl> - исправления в модуле alsa Panagiotis Papadopoulos <pano_90@gmx.net> - улучшения в интерфейсе пользователя, сообщения об ошибках Pino Toscano <toscano.pino@tiscali.it> - улучшение кроссплатформенности Karel Volný <kvolny@redhat.com> - различные исправления |