OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-25 19:30:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/citra-emu/master' into experimental

Browse Source
This commit is contained in:
Anon 2016-09-11 20:33:24 -05:00
commit c8106540e7
4 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis-build.sh
View File

@ -23,11 +23,12 @@ if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then
elif [ "$TRAVIS_OS_NAME" = "osx" ]; then elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
set -o pipefail set -o pipefail
export MACOSX_DEPLOYMENT_TARGET=10.9
export Qt5_DIR=$(brew --prefix)/opt/qt5 export Qt5_DIR=$(brew --prefix)/opt/qt5
mkdir build && cd build mkdir build && cd build
cmake .. -GXcode cmake .. -GXcode
xcodebuild -configuration Release | xcpretty -c xcodebuild -configuration Release
ctest -VV -C Release ctest -VV -C Release
fi fi

16
.travis-deps.sh
View File

@ -9,18 +9,26 @@ if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then
export CXX=g++-6 export CXX=g++-6
mkdir -p $HOME/.local mkdir -p $HOME/.local
if [ ! -e $HOME/.local/bin/cmake ]; then
echo "CMake not found in the cache, get and extract it..."
curl -L http://www.cmake.org/files/v3.2/cmake-3.2.0-Linux-i386.tar.gz \ curl -L http://www.cmake.org/files/v3.2/cmake-3.2.0-Linux-i386.tar.gz \
| tar -xz -C $HOME/.local --strip-components=1 | tar -xz -C $HOME/.local --strip-components=1
else
echo "Using cached CMake"
fi
( if [ ! -e $HOME/.local/lib/libSDL2.la ]; then
echo "SDL2 not found in cache, get and build it..."
wget http://libsdl.org/release/SDL2-2.0.4.tar.gz -O - | tar xz wget http://libsdl.org/release/SDL2-2.0.4.tar.gz -O - | tar xz
cd SDL2-2.0.4 cd SDL2-2.0.4
./configure --prefix=$HOME/.local ./configure --prefix=$HOME/.local
make -j4 && make install make -j4 && make install
) else
echo "Using cached SDL2"
fi
elif [ "$TRAVIS_OS_NAME" = "osx" ]; then elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
brew update > /dev/null # silence the very verbose output brew update > /dev/null # silence the very verbose output
brew unlink cmake brew unlink cmake || true
brew install cmake qt5 sdl2 dylibbundler brew install cmake qt5 sdl2 dylibbundler
gem install xcpretty
fi fi

5
.travis.yml
View File

@ -7,6 +7,7 @@ matrix:
dist: trusty dist: trusty
- os: osx - os: osx
sudo: false sudo: false
osx_image: xcode7.3
env: env:
global: global:
@ -25,6 +26,10 @@ addons:
- lib32stdc++6 # For CMake - lib32stdc++6 # For CMake
- lftp # To upload builds - lftp # To upload builds
cache:
directories:
- $HOME/.local
install: ./.travis-deps.sh install: ./.travis-deps.sh
script: ./.travis-build.sh script: ./.travis-build.sh
after_success: ./.travis-upload.sh after_success: ./.travis-upload.sh

4
src/audio_core/codec.cpp
View File

@ -58,11 +58,11 @@ StereoBuffer16 DecodeADPCM(const u8* const data, const size_t sample_count, cons
size_t outputi = framei * SAMPLES_PER_FRAME; size_t outputi = framei * SAMPLES_PER_FRAME;
size_t datai = framei * FRAME_LEN + 1; size_t datai = framei * FRAME_LEN + 1;
for (size_t i = 0; i < SAMPLES_PER_FRAME && outputi < sample_count; i += 2) { for (size_t i = 0; i < SAMPLES_PER_FRAME && outputi < sample_count; i += 2) {
const s16 sample1 = decode_sample(SIGNED_NIBBLES[data[datai] & 0xF]); const s16 sample1 = decode_sample(SIGNED_NIBBLES[data[datai] >> 4]);
ret[outputi].fill(sample1); ret[outputi].fill(sample1);
outputi++; outputi++;
const s16 sample2 = decode_sample(SIGNED_NIBBLES[data[datai] >> 4]); const s16 sample2 = decode_sample(SIGNED_NIBBLES[data[datai] & 0xF]);
ret[outputi].fill(sample2); ret[outputi].fill(sample2);
outputi++; outputi++;