[Scummvm-cvs-logs] scummvm master -> 8e0d7d72554a7f21e3c717871da3895c3d8ec118
sev-
sev at scummvm.org
Sun Jan 11 21:13:04 CET 2015
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
7225101e62 Add Theora support to systems which use libtremor
762910d8bb SYMBIAN: Updated settings and moved to config.mmh
dd5f5588d9 SYMBIAN: Updated settings
8e0d7d7255 Merge pull request #559 from fedor4ever/master
Commit: 7225101e6257d0574fb94be8a6016a3b67a09855
https://github.com/scummvm/scummvm/commit/7225101e6257d0574fb94be8a6016a3b67a09855
Author: Fedor Strizhnev (fedor_qd at mail.ru)
Date: 2015-01-05T16:53:35+03:00
Commit Message:
Add Theora support to systems which use libtremor
Changed paths:
video/theora_decoder.cpp
video/theora_decoder.h
diff --git a/video/theora_decoder.cpp b/video/theora_decoder.cpp
index cb6289b..ba596c6 100644
--- a/video/theora_decoder.cpp
+++ b/video/theora_decoder.cpp
@@ -360,7 +360,11 @@ static double rint(double v) {
}
bool TheoraDecoder::VorbisAudioTrack::decodeSamples() {
+#ifdef USE_TREMOR
+ ogg_int32_t **pcm;
+#else
float **pcm;
+#endif
// if there's pending, decoded audio, grab it
int ret = vorbis_synthesis_pcmout(&_vorbisDSP, &pcm);
diff --git a/video/theora_decoder.h b/video/theora_decoder.h
index feb4c6b..5b683cf 100644
--- a/video/theora_decoder.h
+++ b/video/theora_decoder.h
@@ -33,7 +33,12 @@
#include "graphics/surface.h"
#include <theora/theoradec.h>
+
+#ifdef USE_TREMOR
+#include <tremor/ivorbiscodec.h>
+#else
#include <vorbis/codec.h>
+#endif
namespace Common {
class SeekableReadStream;
Commit: 762910d8bb72c587bb7aa76274577a82b7a8b74a
https://github.com/scummvm/scummvm/commit/762910d8bb72c587bb7aa76274577a82b7a8b74a
Author: Fedor Strizhnev (fedor_qd at mail.ru)
Date: 2015-01-06T12:45:20+03:00
Commit Message:
SYMBIAN: Updated settings and moved to config.mmh
Changed paths:
backends/platform/symbian/mmp/scummvm_voyeur.mmp.in
diff --git a/backends/platform/symbian/mmp/scummvm_voyeur.mmp.in b/backends/platform/symbian/mmp/scummvm_voyeur.mmp.in
index 86dc32b..4221e34 100644
--- a/backends/platform/symbian/mmp/scummvm_voyeur.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_voyeur.mmp.in
@@ -32,10 +32,7 @@
TARGET scummvm_voyeur.lib
TARGETTYPE lib
-OPTION MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-OPTION GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
-ALWAYS_BUILD_AS_ARM
+#include "config.mmh"
//START_AUTO_MACROS_SLAVE//
@@ -52,20 +49,3 @@ SOURCEPATH ..\..\..\..\engines\voyeur
// empty base file, will be updated by Perl build scripts
//STOP_AUTO_OBJECTS_VOYEUR_//
-
-// *** Include paths
-
-USERINCLUDE ..\..\..\..\engines
-USERINCLUDE ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src
-
-SYSTEMINCLUDE \epoc32\include\freetype
-SYSTEMINCLUDE \epoc32\include\mpeg2dec
-SYSTEMINCLUDE \epoc32\include\jpeg
-SYSTEMINCLUDE \epoc32\include\png
-SYSTEMINCLUDE \epoc32\include\ESDL
-SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE \epoc32\include\libc
-SYSTEMINCLUDE \epoc32\include\theora
-SYSTEMINCLUDE \epoc32\include\tremor
-SYSTEMINCLUDE \epoc32\include
-SYSTEMINCLUDE ..\src // for portdefs.h
Commit: dd5f5588d9fb29179dfd0f354728dc6cacf26897
https://github.com/scummvm/scummvm/commit/dd5f5588d9fb29179dfd0f354728dc6cacf26897
Author: Fedor Strizhnev (fedor_qd at mail.ru)
Date: 2015-01-06T12:45:55+03:00
Commit Message:
SYMBIAN: Updated settings
Changed paths:
backends/platform/symbian/mmp/scummvm_zvision.mmp.in
diff --git a/backends/platform/symbian/mmp/scummvm_zvision.mmp.in b/backends/platform/symbian/mmp/scummvm_zvision.mmp.in
index e647275..ea0a7b0 100644
--- a/backends/platform/symbian/mmp/scummvm_zvision.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_zvision.mmp.in
@@ -33,6 +33,7 @@
TARGET scummvm_zvision.lib
TARGETTYPE lib
+USERINCLUDE ..\..\..\..\engines\zvision\graphics
#include "config.mmh"
//START_AUTO_MACROS_SLAVE//
Commit: 8e0d7d72554a7f21e3c717871da3895c3d8ec118
https://github.com/scummvm/scummvm/commit/8e0d7d72554a7f21e3c717871da3895c3d8ec118
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2015-01-11T21:12:01+01:00
Commit Message:
Merge pull request #559 from fedor4ever/master
VIDEO: Add Theora support to systems which use libtremor
Changed paths:
backends/platform/symbian/mmp/scummvm_voyeur.mmp.in
backends/platform/symbian/mmp/scummvm_zvision.mmp.in
video/theora_decoder.cpp
video/theora_decoder.h
More information about the Scummvm-git-logs
mailing list