~ubuntu-branches/ubuntu/trusty/manaplus/trusty-proposed

« back to all changes in this revision

Viewing changes to src/soundmanager.cpp

Committer: Package Import Robot
Author(s): Patrick Matthäi
Date: 2013-09-17 10:35:51 UTC
mfrom: (1.1.10)
Revision ID: package-import@ubuntu.com-20130917103551-az7p3nz9jgxwqjfn

Tags: 1.3.9.15-1

New upstream release.

files added:
data/graphics/gui/lock.png

src/being

src/being/actor.cpp

src/being/actor.h

src/being/actorsprite.cpp

src/being/actorsprite.h

src/being/actorspritelistener.h

src/being/being.cpp

src/being/being.h

src/being/beingcacheentry.h

src/being/compoundsprite.cpp

src/being/compoundsprite.h

src/being/localplayer.cpp

src/being/localplayer.h

src/being/playerinfo.cpp

src/being/playerinfo.h

src/being/playerrelations.cpp

src/being/playerrelations.h

src/input

src/input/inputevent.cpp

src/input/inputevent.h

src/input/inputmanager.cpp

src/input/inputmanager.h

src/input/joystick.cpp

src/input/joystick.h

src/input/keyboardconfig.cpp

src/input/keyboardconfig.h

src/input/keyboarddata.h

src/input/keydata.h

src/input/keyevent.cpp

src/input/keyevent.h

src/input/keyinput.cpp

src/input/keyinput.h

src/particle

src/particle/animationparticle.cpp

src/particle/animationparticle.h

src/particle/imageparticle.cpp

src/particle/imageparticle.h

src/particle/particle.cpp

src/particle/particle.h

src/particle/particlecontainer.cpp

src/particle/particlecontainer.h

src/particle/particleemitter.cpp

src/particle/particleemitter.h

src/particle/particleemitterprop.h

src/particle/rotationalparticle.cpp

src/particle/rotationalparticle.h

src/particle/textparticle.cpp

src/particle/textparticle.h

src/render

src/render/graphics.cpp

src/render/graphics.h

src/render/mobileopenglgraphics.cpp

src/render/mobileopenglgraphics.h

src/render/normalopenglgraphics.cpp

src/render/normalopenglgraphics.h

src/render/nullopenglgraphics.cpp

src/render/nullopenglgraphics.h

src/render/renderers.cpp

src/render/renderers.h

src/render/rendererslistsdl.h

src/render/rendererslistsdl2.h

src/render/safeopenglgraphics.cpp

src/render/safeopenglgraphics.h

src/render/sdl2graphics.cpp

src/render/sdl2graphics.h

src/render/sdl2softwaregraphics.cpp

src/render/sdl2softwaregraphics.h

src/render/sdlgraphics.cpp

src/render/sdlgraphics.h

src/render/surfacegraphics.cpp

src/render/surfacegraphics.h

src/resources/sdl2softwareimagehelper.cpp

src/resources/sdl2softwareimagehelper.h

src/sdl2gfx/SDL_rotozoom.c

src/sdl2gfx/SDL_rotozoom.h

files removed:
src/actor.cpp

src/actor.h

src/actorsprite.cpp

src/actorsprite.h

src/actorspritelistener.h

src/animationparticle.cpp

src/animationparticle.h

src/being.cpp

src/being.h

src/beingcacheentry.h

src/compoundsprite.cpp

src/compoundsprite.h

src/graphics.cpp

src/graphics.h

src/imageparticle.cpp

src/imageparticle.h

src/inputevent.cpp

src/inputevent.h

src/inputmanager.cpp

src/inputmanager.h

src/joystick.cpp

src/joystick.h

src/keyboardconfig.cpp

src/keyboardconfig.h

src/keyboarddata.h

src/keydata.h

src/keyevent.cpp

src/keyevent.h

src/keyinput.cpp

src/keyinput.h

src/localplayer.cpp

src/localplayer.h

src/mobileopenglgraphics.cpp

src/mobileopenglgraphics.h

src/normalopenglgraphics.cpp

src/normalopenglgraphics.h

src/nullopenglgraphics.cpp

src/nullopenglgraphics.h

src/particle.cpp

src/particle.h

src/particlecontainer.cpp

src/particlecontainer.h

src/particleemitter.cpp

src/particleemitter.h

src/particleemitterprop.h

src/playerinfo.cpp

src/playerinfo.h

src/playerrelations.cpp

src/playerrelations.h

src/rotationalparticle.cpp

src/rotationalparticle.h

src/safeopenglgraphics.cpp

src/safeopenglgraphics.h

src/sdl2graphics.cpp

src/sdl2graphics.h

src/sdlgraphics.cpp

src/sdlgraphics.h

src/surfacegraphics.cpp

src/surfacegraphics.h

src/textparticle.cpp

src/textparticle.h

files modified:
ChangeLog

Makefile.in

PKGBUILD

README

aclocal.m4

config.h.in

configure

configure.ac

data/Makefile.in

data/evol/Makefile.in

data/fonts/Makefile.in

data/fonts/liberationsans-bold.ttf

data/fonts/liberationsans.ttf

data/fonts/liberationsansmono-bold.ttf

data/fonts/liberationsansmono.ttf

data/graphics/Makefile.in

data/graphics/flags/Makefile.in

data/graphics/gui/CMakeLists.txt

data/graphics/gui/Makefile.am

data/graphics/gui/Makefile.in

data/graphics/images/Makefile.in

data/graphics/sprites/Makefile.in

data/help/Makefile.in

data/help/tips/Makefile.in

data/icons/Makefile.in

data/perserver/Makefile.in

data/perserver/default/Makefile.in

data/sfx/Makefile.in

data/sfx/system/Makefile.in

data/themes/Makefile.in

data/themes/blacknblack/Makefile.in

data/themes/blackwood/Makefile.in

data/themes/classic/Makefile.in

data/themes/enchilado/Makefile.in

data/themes/jewelry/Makefile.in

data/themes/mana/Makefile.in

data/themes/pink/Makefile.in

data/themes/unity/Makefile.in

data/themes/wood/Makefile.in

data/tmw/Makefile.in

data/translations/Makefile.in

data/translations/help/Makefile.in

data/translations/help/es.po

debian/changelog

docs/Makefile.in

manaplus.spec

po/POTFILES.in

po/ar.po

po/bg.po

po/ca.po

po/cs.gmo

po/cs.po

po/da.po

po/de.gmo

po/de.po

po/el.po

po/en_GB.po

po/eo.po

po/es.gmo

po/es.po

po/et.po

po/fa.po

po/fi.gmo

po/fi.po

po/fr.gmo

po/fr.po

po/he.po

po/hr.po

po/hu.po

po/id.gmo

po/id.po

po/it.gmo

po/it.po

po/ja.gmo

po/ja.po

po/ka.po

po/manaplus.pot

po/nb.po

po/nl.po

po/nl_BE.gmo

po/nl_BE.po

po/pl.gmo

po/pl.po

po/pt.gmo

po/pt.po

po/pt_BR.gmo

po/pt_BR.po

po/ru.gmo

po/ru.po

po/sk.po

po/sq.po

po/sv.po

po/sv_SE.po

po/te.po

po/th.po

po/tr.gmo

po/tr.po

po/vls.po

po/zh_CN.gmo

po/zh_CN.po

po/zh_HK.po

po/zh_TW.po

src/CMakeLists.txt

src/Makefile.am

src/Makefile.in

src/actionmanager.cpp

src/actionmanager.h

src/actorspritemanager.cpp

src/actorspritemanager.h

src/animatedsprite.cpp

src/animatedsprite.h

src/auctionmanager.cpp

src/auctionmanager.h

src/avatar.cpp

src/beingequipbackend.cpp

src/chatlogger.cpp

src/client.cpp

src/client.h

src/commandhandler.cpp

src/commands.cpp

src/commands.h

src/configuration.h

src/defaults.cpp

src/depricatedlistener.h

src/dragdrop.h

src/dropshortcut.cpp

src/effectmanager.cpp

src/effectmanager.h

src/emoteshortcut.cpp

src/flooritem.cpp

src/flooritem.h

src/game.cpp

src/game.h

src/graphicsmanager.cpp

src/graphicsmanager.h

src/graphicsvertexes.h

src/gui/beingpopup.cpp

src/gui/botcheckerwindow.cpp

src/gui/botcheckerwindow.h

src/gui/buydialog.cpp

src/gui/buyselldialog.cpp

src/gui/changeemaildialog.h

src/gui/changepassworddialog.h

src/gui/charcreatedialog.cpp

src/gui/charcreatedialog.h

src/gui/charselectdialog.cpp

src/gui/charselectdialog.h

src/gui/chatwindow.cpp

src/gui/chatwindow.h

src/gui/confirmdialog.cpp

src/gui/debugwindow.cpp

src/gui/debugwindow.h

src/gui/didyouknowwindow.cpp

src/gui/didyouknowwindow.h

src/gui/editdialog.cpp

src/gui/editdialog.h

src/gui/editserverdialog.cpp

src/gui/editserverdialog.h

src/gui/emotewindow.cpp

src/gui/emotewindow.h

src/gui/equipmentwindow.cpp

src/gui/equipmentwindow.h

src/gui/gui.cpp

src/gui/gui.h

src/gui/helpwindow.cpp

src/gui/helpwindow.h

src/gui/inventorywindow.cpp

src/gui/inventorywindow.h

src/gui/itemamountwindow.cpp

src/gui/itempopup.cpp

src/gui/itempopup.h

src/gui/killstats.cpp

src/gui/logindialog.cpp

src/gui/logindialog.h

src/gui/minimap.cpp

src/gui/ministatuswindow.cpp

src/gui/npcdialog.cpp

src/gui/npcdialog.h

src/gui/okdialog.cpp

src/gui/outfitwindow.cpp

src/gui/outfitwindow.h

src/gui/palette.cpp

src/gui/palette.h

src/gui/popupmenu.cpp

src/gui/popupmenu.h

src/gui/questswindow.cpp

src/gui/quitdialog.cpp

src/gui/registerdialog.cpp

src/gui/registerdialog.h

src/gui/sdlfont.cpp

src/gui/sdlfont.h

src/gui/sdlinput.cpp

src/gui/sdlinput.h

src/gui/selldialog.cpp

src/gui/selldialog.h

src/gui/serverdialog.cpp

src/gui/serverdialog.h

src/gui/setup_audio.cpp

src/gui/setup_audio.h

src/gui/setup_chat.cpp

src/gui/setup_chat.h

src/gui/setup_colors.cpp

src/gui/setup_input.cpp

src/gui/setup_input.h

src/gui/setup_joystick.cpp

src/gui/setup_other.cpp

src/gui/setup_other.h

src/gui/setup_perfomance.cpp

src/gui/setup_perfomance.h

src/gui/setup_players.cpp

src/gui/setup_players.h

src/gui/setup_relations.cpp

src/gui/setup_relations.h

src/gui/setup_theme.cpp

src/gui/setup_theme.h

src/gui/setup_touch.cpp

src/gui/setup_touch.h

src/gui/setup_video.cpp

src/gui/setup_video.h

src/gui/setupactiondata.h

src/gui/shopwindow.cpp

src/gui/shopwindow.h

src/gui/shortcutwindow.cpp

src/gui/skilldialog.cpp

src/gui/skilldialog.h

src/gui/socialwindow.cpp

src/gui/socialwindow.h

src/gui/spellpopup.cpp

src/gui/spellpopup.h

src/gui/statuspopup.cpp

src/gui/statuspopup.h

src/gui/statuswindow.cpp

src/gui/textcommandeditor.cpp

src/gui/textcommandeditor.h

src/gui/textdialog.cpp

src/gui/textpopup.cpp

src/gui/textpopup.h

src/gui/theme.cpp

src/gui/theme.h

src/gui/tradewindow.cpp

src/gui/tradewindow.h

src/gui/unregisterdialog.cpp

src/gui/unregisterdialog.h

src/gui/updaterwindow.cpp

src/gui/userpalette.cpp

src/gui/viewport.cpp

src/gui/viewport.h

src/gui/whoisonline.cpp

src/gui/whoisonline.h

src/gui/widgets/avatarlistbox.cpp

src/gui/widgets/avatarlistbox.h

src/gui/widgets/battletab.cpp

src/gui/widgets/browserbox.cpp

src/gui/widgets/browserbox.h

src/gui/widgets/button.cpp

src/gui/widgets/button.h

src/gui/widgets/characterdisplay.h

src/gui/widgets/characterviewsmall.h

src/gui/widgets/chattab.cpp

src/gui/widgets/checkbox.cpp

src/gui/widgets/checkbox.h

src/gui/widgets/colormodel.cpp

src/gui/widgets/colormodel.h

src/gui/widgets/colorpage.cpp

src/gui/widgets/colorpage.h

src/gui/widgets/container.h

src/gui/widgets/desktop.cpp

src/gui/widgets/dropdown.cpp

src/gui/widgets/dropdown.h

src/gui/widgets/dropshortcutcontainer.cpp

src/gui/widgets/dropshortcutcontainer.h

src/gui/widgets/emotepage.cpp

src/gui/widgets/emotepage.h

src/gui/widgets/emoteshortcutcontainer.cpp

src/gui/widgets/emoteshortcutcontainer.h

src/gui/widgets/extendedlistbox.cpp

src/gui/widgets/extendednamesmodel.cpp

src/gui/widgets/extendednamesmodel.h

src/gui/widgets/gmtab.cpp

src/gui/widgets/guildchattab.cpp

src/gui/widgets/guitable.cpp

src/gui/widgets/inttextfield.cpp

src/gui/widgets/itemcontainer.cpp

src/gui/widgets/itemcontainer.h

src/gui/widgets/itemlinkhandler.cpp

src/gui/widgets/itemshortcutcontainer.cpp

src/gui/widgets/itemshortcutcontainer.h

src/gui/widgets/listbox.cpp

src/gui/widgets/listbox.h

src/gui/widgets/namesmodel.cpp

src/gui/widgets/playerbox.cpp

src/gui/widgets/playerbox.h

src/gui/widgets/popup.cpp

src/gui/widgets/popup.h

src/gui/widgets/popuplist.cpp

src/gui/widgets/popuplist.h

src/gui/widgets/progressbar.cpp

src/gui/widgets/progressbar.h

src/gui/widgets/progressindicator.cpp

src/gui/widgets/radiobutton.cpp

src/gui/widgets/radiobutton.h

src/gui/widgets/scrollarea.cpp

src/gui/widgets/scrollarea.h

src/gui/widgets/setupitem.cpp

src/gui/widgets/setupitem.h

src/gui/widgets/setuptabscroll.cpp

src/gui/widgets/setuptouchitem.cpp

src/gui/widgets/setuptouchitem.h

src/gui/widgets/shoplistbox.cpp

src/gui/widgets/shortcutcontainer.cpp

src/gui/widgets/shortcutcontainer.h

src/gui/widgets/skilldata.cpp

src/gui/widgets/skilldata.h

src/gui/widgets/skillinfo.cpp

src/gui/widgets/skillinfo.h

src/gui/widgets/skillmodel.cpp

src/gui/widgets/skillmodel.h

src/gui/widgets/slider.cpp

src/gui/widgets/slider.h

src/gui/widgets/sliderlist.cpp

src/gui/widgets/spellshortcutcontainer.cpp

src/gui/widgets/spellshortcutcontainer.h

src/gui/widgets/tab.cpp

src/gui/widgets/tab.h

src/gui/widgets/tabbedarea.cpp

src/gui/widgets/tabbedarea.h

src/gui/widgets/tabstrip.cpp

src/gui/widgets/tabstrip.h

src/gui/widgets/textbox.cpp

src/gui/widgets/textfield.cpp

src/gui/widgets/textfield.h

src/gui/widgets/textpreview.cpp

src/gui/widgets/textpreview.h

src/gui/widgets/tradetab.cpp

src/gui/widgets/whispertab.cpp

src/gui/widgets/whispertab.h

src/gui/widgets/widget2.h

src/gui/widgets/window.cpp

src/gui/widgets/window.h

src/gui/windowmenu.cpp

src/gui/worldselectdialog.cpp

src/gui/worldselectdialog.h

src/guild.cpp

src/guildmanager.cpp

src/guildmanager.h

src/imagesprite.cpp

src/inventory.h

src/itemshortcut.cpp

src/logger.cpp

src/main.cpp

src/main.h

src/map.cpp

src/map.h

src/maplayer.cpp

src/maplayer.h

src/mouseinput.h

src/net/beinghandler.h

src/net/charserverhandler.h

src/net/ea/beinghandler.cpp

src/net/ea/buysellhandler.cpp

src/net/ea/buysellhandler.h

src/net/ea/chathandler.cpp

src/net/ea/gamehandler.cpp

src/net/ea/gui/guildtab.cpp

src/net/ea/gui/partytab.cpp

src/net/ea/guildhandler.cpp

src/net/ea/inventoryhandler.cpp

src/net/ea/inventoryhandler.h

src/net/ea/partyhandler.cpp

src/net/ea/playerhandler.cpp

src/net/ea/skillhandler.cpp

src/net/ea/token.h

src/net/ea/tradehandler.cpp

src/net/eathena/adminhandler.cpp

src/net/eathena/beinghandler.cpp

src/net/eathena/buysellhandler.cpp

src/net/eathena/chathandler.cpp

src/net/eathena/gamehandler.cpp

src/net/eathena/gui/guildtab.cpp

src/net/eathena/gui/partytab.cpp

src/net/eathena/guildhandler.cpp

src/net/eathena/npchandler.cpp

src/net/eathena/partyhandler.cpp

src/net/eathena/tradehandler.cpp

src/net/logindata.h

src/net/playerhandler.h

src/net/tmwa/adminhandler.cpp

src/net/tmwa/beinghandler.cpp

src/net/tmwa/beinghandler.h

src/net/tmwa/buysellhandler.cpp

src/net/tmwa/chathandler.cpp

src/net/tmwa/gamehandler.cpp

src/net/tmwa/gui/guildtab.cpp

src/net/tmwa/gui/partytab.cpp

src/net/tmwa/guildhandler.cpp

src/net/tmwa/loginhandler.cpp

src/net/tmwa/network.cpp

src/net/tmwa/network.h

src/net/tmwa/npchandler.cpp

src/net/tmwa/partyhandler.cpp

src/net/tmwa/protocol.h

src/net/tmwa/questhandler.cpp

src/net/tmwa/tradehandler.cpp

src/net/tradehandler.h

src/notifymanager.cpp

src/notifymanager.h

src/party.cpp

src/resources/ambientlayer.cpp

src/resources/atlasmanager.cpp

src/resources/beinginfo.h

src/resources/fboinfo.h

src/resources/image.cpp

src/resources/image.h

src/resources/imagehelper.cpp

src/resources/imagehelper.h

src/resources/iteminfo.h

src/resources/mapdb.cpp

src/resources/mapreader.cpp

src/resources/openglimagehelper.cpp

src/resources/openglimagehelper.h

src/resources/sdl2imagehelper.cpp

src/resources/sdl2imagehelper.h

src/resources/sdlimagehelper.cpp

src/resources/sdlimagehelper.h

src/resources/sdlmusic.cpp

src/resources/sounddb.cpp

src/resources/subimage.cpp

src/resources/surfaceimagehelper.cpp

src/resources/surfaceimagehelper.h

src/simpleanimation.cpp

src/soundmanager.cpp

src/spellmanager.cpp

src/spellmanager.h

src/spellshortcut.cpp

src/spellshortcut.h

src/statuseffect.h

src/test/testlauncher.cpp

src/test/testmain.cpp

src/test/testmain.h

src/text.cpp

src/text.h

src/touchactions.cpp

src/touchmanager.cpp

src/touchmanager.h

src/units.cpp

src/utils/copynpaste.cpp

Show diffs side-by-side

added added

removed removed

src/soundmanager.cpp

#include "soundmanager.h"

#include "configuration.h"

#include "localplayer.h"

#include "being/localplayer.h"

#include "resources/sdlmusic.h"

#include "resources/resourcemanager.h"

292

293

294

void SoundManager::fadeOutMusic(const int ms)

294

295

{

296

if (!mPlayMusic)

297

return;

298

295

299

mCurrentMusicFile.clear();

296

300

297

301

if (!mInstalled)

316

320

void SoundManager::fadeOutAndPlayMusic(const std::string &fileName,

317

321

const int ms)

318

322

{

323

if (!mPlayMusic)

324

return;

325

319

326

mNextMusicFile = fileName;

320

327

fadeOutMusic(ms);

321

328

}

Older »