Merge pull request #211 from citra-emu/master

update

.travis-build.sh

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

.travis-deps.sh

@@ -20,7 +20,6 @@ if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then
     )
 elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
     brew update > /dev/null # silence the very verbose output
-    brew unlink cmake
+    brew unlink cmake || true
     brew install cmake qt5 sdl2 dylibbundler
-    gem install xcpretty
 fi

.travis.yml

@@ -7,6 +7,7 @@ matrix:
       dist: trusty
     - os: osx
       sudo: false
+      osx_image: xcode7.3
 
 env:
   global:

src/audio_core/codec.cpp

@@ -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 datai = framei * FRAME_LEN + 1;
         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);
             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);
             outputi++;
 

src/citra_qt/configure_dialog.cpp

@@ -9,10 +9,9 @@
 
 #include "core/settings.h"
 
-ConfigureDialog::ConfigureDialog(QWidget *parent, bool running) :
+ConfigureDialog::ConfigureDialog(QWidget *parent) :
     QDialog(parent),
-    ui(new Ui::ConfigureDialog),
+    ui(new Ui::ConfigureDialog)
-    emulation_running(running)
 {
     ui->setupUi(this);
     this->setConfiguration();
@@ -22,9 +21,6 @@ ConfigureDialog::~ConfigureDialog() {
 }
 
 void ConfigureDialog::setConfiguration() {
-    // System tab needs set manually
-    // depending on whether emulation is running
-    ui->systemTab->setConfiguration(emulation_running);
 }
 
 void ConfigureDialog::applyConfiguration() {

src/citra_qt/configure_dialog.h

@@ -16,7 +16,7 @@ class ConfigureDialog : public QDialog
     Q_OBJECT
 
 public:
-    explicit ConfigureDialog(QWidget *parent, bool emulation_running);
+    explicit ConfigureDialog(QWidget *parent);
     ~ConfigureDialog();
 
     void applyConfiguration();
@@ -26,5 +26,4 @@ private:
 
 private:
     std::unique_ptr<Ui::ConfigureDialog> ui;
-    bool emulation_running;
 };

src/citra_qt/configure_system.cpp

@@ -8,6 +8,7 @@
 
 #include "core/hle/service/fs/archive.h"
 #include "core/hle/service/cfg/cfg.h"
+#include "core/system.h"
 
 static const std::array<int, 12> days_in_month = {{
     31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
@@ -17,6 +18,7 @@ ConfigureSystem::ConfigureSystem(QWidget *parent) :
     QWidget(parent),
     ui(new Ui::ConfigureSystem) {
     ui->setupUi(this);
+    this->setConfiguration();
 
     connect(ui->combo_birthmonth, SIGNAL(currentIndexChanged(int)), SLOT(updateBirthdayComboBox(int)));
 }
@@ -24,8 +26,8 @@ ConfigureSystem::ConfigureSystem(QWidget *parent) :
 ConfigureSystem::~ConfigureSystem() {
 }
 
-void ConfigureSystem::setConfiguration(bool emulation_running) {
+void ConfigureSystem::setConfiguration() {
-    enabled = !emulation_running;
+    enabled = !System::IsPoweredOn();
 
     if (!enabled) {
         ReadSystemSettings();

src/citra_qt/configure_system.h

@@ -20,7 +20,7 @@ public:
     ~ConfigureSystem();
 
     void applyConfiguration();
-    void setConfiguration(bool emulation_running);
+    void setConfiguration();
 
 public slots:
     void updateBirthdayComboBox(int birthmonth_index);

src/citra_qt/main.cpp

@@ -510,7 +510,7 @@ void GMainWindow::ToggleWindowMode() {
 }
 
 void GMainWindow::OnConfigure() {
-    ConfigureDialog configureDialog(this, emulation_running);
+    ConfigureDialog configureDialog(this);
     auto result = configureDialog.exec();
     if (result == QDialog::Accepted)
     {