[Marble-devel] Patch to NullAudioOutput.cpp

[VrEx]

Hi,

I've checked out the latest source from repository and tried to compile on
windows, but encountered some errors when compiling NullAudioOutput.cpp in
src\plugins\render\routing due to changes made in AudioOutput.h header file.
This patch syncs AudioOutput.h changes made in revisions:




Author:  Dennis Nienhüser <
earthwings at gentoo.org>#mailto:earthwings at gentoo.org
Author date: 4 weeks ago (Sun Feb 05 15:06:49 2012)
Commit date: 4 weeks ago (Sun Feb 05 18:43:36 2012)
Commit hash: 8c0c8f5c7caeb668d31483f6ccca786ee0866882

Voice announcement when deviating from the route, red instr. background
    (cherry picked from commit 1e9527a5f142ebd6a303fd7a336dd052f21ec2a0)

Contained in branches: master
Contained in no tag

-----

Author:  Dennis Nienhüser <
earthwings at gentoo.org>#mailto:earthwings at gentoo.org
Author date: 4 weeks ago (Sun Feb 05 14:42:57 2012)
Commit date: 4 weeks ago (Sun Feb 05 18:43:30 2012)
Commit hash: 2c4da2521a391e92b8d205ab089c3afc1eff59b6

"Destination reached" voice announcement in marble touch
    (cherry picked from commit 8b50ed15b0b686d383f4353bb9521f96fffca132)

Contained in branches: master
Contained in no tag

-----

Author:  Dennis Nienhüser <
earthwings at gentoo.org>#mailto:earthwings at gentoo.org
Author date: 1 month ago (Sun Jan 15 16:23:38 2012)
Commit date: 1 month ago (Tue Jan 31 20:36:52 2012)
Commit hash: 4629393a0447ee160476290f9c6ea1930e12cb0f

Move voice navigation generation logic to the lib.

    Phonon related part remains in the routing plugin.
    (cherry picked from commit 023e6eb95dbf5201dc130d9cfcba15e6496c693e)

Contained in branches: master
Contained in no tag

-----

Author:  Dennis Nienhüser <
earthwings at gentoo.org>#mailto:earthwings at gentoo.org
Author date: 1 month ago (Sun Jan 15 11:49:31 2012)
Commit date: 1 month ago (Tue Jan 31 20:36:37 2012)
Commit hash: ad69b0bf762f75d8b93ddda09450f74cc18b51db

Use an item model for speakers and move to lib.
    (cherry picked from commit 341f461133228758de584d2d75323809367acb0f)

Contained in branches: master
Contained in no tag
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/marble-devel/attachments/20120305/4d1976b4/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Changes-from-AudioOutput.h-synced-with-NullAudioOutp.patch
Type: application/octet-stream
Size: 1728 bytes
Desc: not available
URL: <http://mail.kde.org/pipermail/marble-devel/attachments/20120305/4d1976b4/attachment.obj>