Merge remote-tracking branch 'zini/master' into misc-cleanup

apps/openmw/mwgui/messagebox.cpp

@@ -1,6 +1,8 @@
 #include <components/misc/stringops.hpp>
 
 #include "messagebox.hpp"
+#include "../mwbase/environment.hpp"
+#include "../mwbase/soundmanager.hpp"
 
 using namespace MWGui;
 
@@ -375,6 +377,7 @@ void InteractiveMessageBox::enterPressed()
         if(Misc::StringUtils::lowerCase((*button)->getCaption()) == ok)
         {
             buttonActivated(*button);
+            MWBase::Environment::get().getSoundManager()->playSound("Menu Click", 1.f, 1.f);
             break;
         }
     }

apps/openmw/mwsound/ffmpeg_decoder.cpp

@@ -134,6 +134,18 @@ size_t FFmpeg_Decoder::readAVAudioData(void *data, size_t length)
     return dec;
 }
 
+static AVSampleFormat ffmpegNonPlanarSampleFormat (AVSampleFormat format)
+{
+    switch (format)
+    {
+    case AV_SAMPLE_FMT_U8P:  return AV_SAMPLE_FMT_U8;
+    case AV_SAMPLE_FMT_S16P: return AV_SAMPLE_FMT_S16;
+    case AV_SAMPLE_FMT_S32P: return AV_SAMPLE_FMT_S32;
+    case AV_SAMPLE_FMT_FLTP: return AV_SAMPLE_FMT_FLT;
+    case AV_SAMPLE_FMT_DBLP: return AV_SAMPLE_FMT_DBL;
+    default:return format;
+    }
+}
 
 void FFmpeg_Decoder::open(const std::string &fname)
 {
@@ -153,10 +165,6 @@ void FFmpeg_Decoder::open(const std::string &fname)
 
     try
     {
-        for(size_t j = 0;j < mFormatCtx->nb_streams;j++)
-            if(mFormatCtx->streams[j]->codec->codec_type == AVMEDIA_TYPE_AUDIO)
-                mFormatCtx->streams[j]->codec->request_sample_fmt = AV_SAMPLE_FMT_S16;
-
         if(avformat_find_stream_info(mFormatCtx, NULL) < 0)
             fail("Failed to find stream info in "+fname);
 
@@ -164,7 +172,6 @@ void FFmpeg_Decoder::open(const std::string &fname)
         {
             if(mFormatCtx->streams[j]->codec->codec_type == AVMEDIA_TYPE_AUDIO)
             {
-                mFormatCtx->streams[j]->codec->request_sample_fmt = AV_SAMPLE_FMT_S16;
                 mStream = &mFormatCtx->streams[j];
                 break;
             }
@@ -172,6 +179,8 @@ void FFmpeg_Decoder::open(const std::string &fname)
         if(!mStream)
             fail("No audio streams in "+fname);
 
+        (*mStream)->codec->request_sample_fmt = ffmpegNonPlanarSampleFormat ((*mStream)->codec->sample_fmt);
+
         AVCodec *codec = avcodec_find_decoder((*mStream)->codec->codec_id);
         if(!codec)
         {

credits.txt

@@ -12,65 +12,74 @@ Marc Zinnschlag (Zini) - Lead Programmer/Project Manager
 
 Adam Hogan (aurix)
 Aleksandar Jovanov
+Alexander Nadeau (wareya)
 Alexander Olofsson (Ace)
 Artem Kotsynyak (greye)
 athile
 BrotherBrick
-Chris Robinson
+Chris Robinson (KittyCat)
 Cory F. Cohen (cfcohen)
 Cris Mihalache (Mirceam)
 Douglas Diniz (Dgdiniz)
+Douglas Mencken (dougmencken)
+Edmondo Tommasina (edmondo)
 Eduard Cot (trombonecot)
 Eli2
-Emanuel "potatoesmaster" Guével
+Emanuel Guével (potatoesmaster)
-gugus / gus
+gugus/gus
 Jacob Essex (Yacoby)
 Jannik Heller (scrawl)
 Jason Hooks (jhooks)
 Joel Graff (graffy)
+Jordan Milne
+Julien Voisin (jvoisin/ap0)
 Karl-Felix Glatzer (k1ll)
 Lars Söderberg (Lazaroth)
 lazydev
 Leon Saunders (emoose)
 Lukasz Gromanowski (lgro)
 Marcin Hulist (Gohan)
+Mark Siewert (mark76)
+Manuel Edelmann (vorenon)
 Michael Mc Donnell
 Michael Papageorgiou (werdanith)
 Nathan Jeffords (blunted2night)
 Nikolay Kasyanov (corristo)
+Nolan Poe (nopoe)
+Paul McElroy (Greendogo)
 Pieter van der Kloet (pvdk)
+Radu-Marius Popovici (rpopovici)
 Roman Melnik (Kromgart)
+Sandy Carter (bwrsandman)
 Sebastian Wick (swick)
 Sergey Shambir
-Sylvain T. (Garvek)
+Sylvain Thesnieres (Garvek)
 Tom Mason (wheybags)
 
+
 Packagers:
 Alexander Olofsson (Ace) - Windows
 BrotherBrick - Ubuntu Linux
-Edmondo Tommasina - Gentoo Linux
+Edmondo Tommasina (edmondo) - Gentoo Linux
+Julian Ospald (hasufell) - Gentoo Linux
+Karl-Felix Glatzer (k1ll) - Linux Binaries
 Kenny Armstrong (artorius) - Fedora Linux
 Nikolay Kasyanov (corristo) - Mac OS X
 Sandy Carter (bwrsandman) - Arch Linux
 
 
-Public Relations:
+Public Relations and Translations:
-ElderTroll - Release Manager
+Julien Voisin (jvoisin/ap0) - French News Writer
-sir_herrbatka - News Writer
+Artem Kotsynyak (greye) - Russian News Writer
+Pithorn - Chinese News Writer
+sir_herrbatka - English/Polish News Writer
 WeirdSexy - Podcaster
 
 
 Website:
-juanmnzsk8 - Spanish News Writer
-Julien Voisin (jvoisin/ap0) - French News Writer
-Kingpix - Italian News Writer
 Lukasz Gromanowski (lgro) - Website Administrator
-Nikolay Kasyanov (corristo) - Russian News Writer
-Okulo - Dutch News Writer
-penguinroad - Indonesian News Writer
 Ryan Sardonic (Wry) - Wiki Editor
-sir_herrbatka - Forum Admin/Polish News Writer
+sir_herrbatka - Forum Administrator
-spyboot - German News Writer
 
 
 Formula Research:
@@ -86,20 +95,32 @@ Sadler
 
 Artwork:
 Necrod - OpenMW Logo
-raevol - Wordpress Theme
+Mickey Lyle (raevol) - Wordpress Theme
-
+Okulo - OpenMW Editor Icons
 
 Inactive Contributors:
 Ardekantur
 Armin Preiml
+Carl Maxwell
 Diggory Hardy
-Jan Borsodi
+Dmitry Marakasov (AMDmi3)
+ElderTroll
+guidoj
 Jan-Peter Nilsson (peppe)
+Jan Borsodi
 Josua Grawitter
+juanmnzsk8
+Kingpix
 Lordrea
+Michal Sciubidlo
 Nicolay Korslund
+pchan3
+penguinroad
+psi29a
 sergoz
+spyboot
 Star-Demon
+Thoronador
 Yuri Krupenin
 
 

readme.txt

@@ -9,7 +9,7 @@ Website: http://www.openmw.org
 
 Font Licenses:
 EBGaramond-Regular.ttf: OFL (see OFL.txt for more information)
-VeraMono.ttf: custom (see Bitstream Vera License.txt for more information)
+DejaVuLGCSansMono.ttf: custom (see DejaVu Font License.txt for more information)