|
[-]
[+]
|
Changed |
emumaster.changes
|
|
|
|
[-]
[+]
|
Changed |
emumaster.spec
^
|
|
|
|
[-]
[+]
|
Deleted |
0001-Remove-obsolete-members-from-HostVideo.patch
^
|
| @@ -1,414 +0,0 @@
-From 16ea416c63b3cb06789719cbdbd495f6a7217f97 Mon Sep 17 00:00:00 2001
-From: Ruediger Gad <r.c.g@gmx.de>
-Date: Tue, 15 Jan 2013 19:59:23 +0000
-Subject: [PATCH 1/4] Remove obsolete members from HostVideo.
-
----
- src/base/emuview.cpp | 12 +--
- src/base/hostinput.cpp | 2 +-
- src/base/hostvideo.cpp | 220 +-----------------------------------------------
- src/base/hostvideo.h | 33 --------
- 4 files changed, 11 insertions(+), 256 deletions(-)
-
-diff --git a/src/base/emuview.cpp b/src/base/emuview.cpp
-index 94e53b8..0a8b40a 100644
---- a/src/base/emuview.cpp
-+++ b/src/base/emuview.cpp
-@@ -138,7 +138,8 @@ void EmuView::setupSettingsView()
- {
- m_settingsView = new QDeclarativeView(this);
- m_settingsView->setViewport(new QGLWidget());
-- m_settingsView->resize(HostVideo::Width, HostVideo::Height);
-+ //FIXME: Resize properly.
-+// m_settingsView->resize(HostVideo::Width, HostVideo::Height);
- QObject::connect(m_settingsView->engine(), SIGNAL(quit()), SLOT(close()));
-
- m_settingsView->engine()->addImageProvider("state", new StateImageProvider(m_stateListModel));
-@@ -509,7 +510,6 @@ void EmuView::finishSetupConfiguration()
- m_thread->setFrameSkip(loadOptionFromSettings(s, "frameSkip").toInt());
- m_hostVideo->setFpsVisible(loadOptionFromSettings(s, "fpsVisible").toBool());
- m_hostVideo->setKeepAspectRatio(loadOptionFromSettings(s, "keepAspectRatio").toBool());
-- m_hostVideo->setShader(loadOptionFromSettings(s, "videoFilter").toString());
- setAudioEnabled(loadOptionFromSettings(s, "audioEnable").toBool());
- m_runInBackground = loadOptionFromSettings(s, "runInBackground").toBool();
-
-@@ -622,17 +622,17 @@ bool EmuView::areLRButtonsVisible() const
-
- void EmuView::setVideoFilter(const QString &name)
- {
-- m_hostVideo->setShader(name);
-+ //FIXME: Remove
- }
-
- QString EmuView::videoFilter() const
- {
-- return m_hostVideo->shader();
-+ //FIXME: Remove
- }
-
- QStringList EmuView::availableVideoFilters() const
- {
-- return m_hostVideo->shaderList();
-+ //FIXME: Remove
- }
-
- void EmuView::disableSafetyTimer()
-@@ -643,6 +643,6 @@ void EmuView::disableSafetyTimer()
-
- void EmuView::hostVideoShaderChanged()
- {
-- emConf.setValue("videoFilter", m_hostVideo->shader());
-+ //FIXME: Remove
- emit videoFilterChanged();
- }
-diff --git a/src/base/hostinput.cpp b/src/base/hostinput.cpp
-index 85cf5f3..9363ad2 100644
---- a/src/base/hostinput.cpp
-+++ b/src/base/hostinput.cpp
-@@ -89,7 +89,7 @@ void HostInput::processTouch(QEvent *e)
- if (y < 64) {
- if (x < 80)
- emit pause();
-- else if (x > HostVideo::Width-80)
-+ else if (x > 800) //FIXME: 800 is a hardcoded value.
- emit quit();
- }
- }
-diff --git a/src/base/hostvideo.cpp b/src/base/hostvideo.cpp
-index f9f3e6e..16b7634 100644
---- a/src/base/hostvideo.cpp
-+++ b/src/base/hostvideo.cpp
-@@ -40,26 +40,6 @@ struct QGLRect
- operator QRectF() const {return QRectF(left, top, right-left, bottom-top);}
- };
-
--static const char *defaultVertexShader =
-- "attribute highp vec4 a_vertex; \n"
-- "attribute vec2 a_texCoord; \n"
-- "varying vec2 v_texCoord; \n"
-- "uniform highp mat4 u_pvmMatrix; \n"
-- "void main() \n"
-- "{ \n"
-- " gl_Position = u_pvmMatrix * a_vertex;\n"
-- " v_texCoord = a_texCoord; \n"
-- "} \n";
--
--static const char *defaultFragmentShader =
-- "precision mediump float; \n"
-- "varying vec2 v_texCoord; \n"
-- "uniform sampler2D s_texture; \n"
-- "void main() \n"
-- "{ \n"
-- " gl_FragColor = texture2D(s_texture, v_texCoord);\n"
-- "} \n";
--
- /*!
- \class HostVideo
- HostVideo class displays frames generated by the emulation and buttons
-@@ -78,10 +58,7 @@ HostVideo::HostVideo(HostInput *hostInput,
- QGLWidget(parent),
- m_hostInput(hostInput),
- m_emu(emu),
-- m_thread(thread),
-- m_program(0),
-- m_programIndex(0),
-- m_programDirty(true)
-+ m_thread(thread)
- {
- setAttribute(Qt::WA_NoSystemBackground);
- setAttribute(Qt::WA_AcceptTouchEvents);
-@@ -95,8 +72,6 @@ HostVideo::HostVideo(HostInput *hostInput,
-
- m_keepAspectRatio = emConf.defaultValue("keepAspectRatio").toBool();
-
-- setupProgramList();
--
- QObject::connect(m_emu, SIGNAL(videoSrcRectChanged()), SLOT(updateRects()));
- }
-
-@@ -119,88 +94,7 @@ static inline void setCoords(GLfloat *coords, const QGLRect &rect)
- /*! \internal */
- void HostVideo::paintEvent(QPaintEvent *)
- {
-- if (!m_thread->m_inFrameGenerated)
-- return;
--
-- if (m_programDirty) {
-- if (!loadShaderProgram())
-- return;
-- }
--
-- QPainter painter;
-- painter.begin(this);
--
-- // clear screen early only when we are not drawing on entire screen later
-- if (m_keepAspectRatio)
-- painter.fillRect(rect(), Qt::black);
--
-- painter.beginNativePainting();
-- paintEmuFrame();
-- painter.endNativePainting();
--
-- if (m_fpsVisible)
-- paintFps(&painter);
--
-- // draw buttons
-- m_hostInput->paint(&painter);
-- painter.end();
--}
--
--void HostVideo::paintGL()
--{
-- paintEmuFrame();
--}
--
--void HostVideo::paintEmuFrame()
--{
-- const QImage &tex = m_emu->frame();
-- QSizeF textureSize = tex.size();
-- QGLRect src = m_srcRect;
-- GLfloat dx = 1.0 / textureSize.width() ;
-- GLfloat dy = 1.0 / textureSize.height();
-- QGLRect srcTextureRect(src.left*dx, src.top*dy, src.right*dx, src.bottom*dy);
-- setCoords(m_texCoordArray, srcTextureRect);
--
-- if (m_keepAspectRatio) {
-- qglClearColor(Qt::black);
-- glClear(GL_COLOR_BUFFER_BIT);
-- }
-- m_program->bind();
-- if (m_u_displaySizeLocation != -1) {
-- qreal w = m_dstRect.width() * textureSize.width() / m_srcRect.width();
-- qreal h = m_dstRect.height() * textureSize.height() / m_srcRect.height();
-- m_program->setUniformValue(m_u_displaySizeLocation, QSizeF(w, h));
-- }
-- m_program->enableAttributeArray(m_a_vertexLocation);
-- m_program->enableAttributeArray(m_a_texCoordLocation);
-- m_program->setAttributeArray(m_a_vertexLocation, m_vertexArray, 2);
-- m_program->setAttributeArray(m_a_texCoordLocation, m_texCoordArray, 2);
-- glActiveTexture(GL_TEXTURE0);
-- bindTexture(tex, GL_TEXTURE_2D, GL_RGB, QGLContext::MemoryManagedBindOption);
-- glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
-- m_program->disableAttributeArray(m_a_vertexLocation);
-- m_program->disableAttributeArray(m_a_texCoordLocation);
-- m_program->release();
--}
--
--/*! \internal */
--void HostVideo::paintFps(QPainter *painter)
--{
|
|
[-]
[+]
|
Deleted |
0002-Add-prototype-of-new-way-for-drawing-frames.patch
^
|
| @@ -1,180 +0,0 @@
-From f39714d5eb0cb96dc9e87add5fafb3bdc886cb35 Mon Sep 17 00:00:00 2001
-From: Ruediger Gad <r.c.g@gmx.de>
-Date: Tue, 15 Jan 2013 20:44:52 +0000
-Subject: [PATCH 2/4] Add prototype of new way for drawing frames.
-
----
- src/base/base.pro | 4 +++-
- src/base/emuview.cpp | 2 +-
- src/base/hostvideo.cpp | 29 ++++++++++++++++++++++++++++-
- src/base/hostvideo.h | 29 +++++++++++++++++++++--------
- src/snes/snes.cpp | 1 +
- 5 files changed, 54 insertions(+), 11 deletions(-)
-
-diff --git a/src/base/base.pro b/src/base/base.pro
-index d84e42e..5aae514 100644
---- a/src/base/base.pro
-+++ b/src/base/base.pro
-@@ -42,6 +42,7 @@ HEADERS += \
- emuinput.h \
- stringlistproxy.h \
- audioringbuffer.h \
-+ glpainter.h \
- memutils.h
-
- SOURCES += \
-@@ -62,7 +63,8 @@ SOURCES += \
- emu.cpp \
- emuinput.cpp \
- stringlistproxy.cpp \
-- memutils.cpp
-+ glpainter.cpp \
-+ memutils.cpp
-
- unix {
- qml.path = /opt/emumaster/qml/base
-diff --git a/src/base/emuview.cpp b/src/base/emuview.cpp
-index 0a8b40a..8a9a787 100644
---- a/src/base/emuview.cpp
-+++ b/src/base/emuview.cpp
-@@ -322,7 +322,7 @@ void EmuView::onFrameGenerated(bool videoOn)
- if (m_audioEnable)
- m_hostAudio->sendFrame();
- if (videoOn)
-- m_hostVideo->repaint();
-+ m_hostVideo->updateFrame(m_emu->frame().copy(m_emu->videoSrcRect().toRect()));
- // sync input with the emulation
- m_hostInput->sync();
- }
-diff --git a/src/base/hostvideo.cpp b/src/base/hostvideo.cpp
-index 16b7634..922e27c 100644
---- a/src/base/hostvideo.cpp
-+++ b/src/base/hostvideo.cpp
-@@ -58,10 +58,13 @@ HostVideo::HostVideo(HostInput *hostInput,
- QGLWidget(parent),
- m_hostInput(hostInput),
- m_emu(emu),
-- m_thread(thread)
-+ m_thread(thread),
-+ glPainter(this),
-+ glThread(this)
- {
- setAttribute(Qt::WA_NoSystemBackground);
- setAttribute(Qt::WA_AcceptTouchEvents);
-+ setAttribute(Qt::WA_PaintOutsidePaintEvent);
- setAttribute(Qt::WA_QuitOnClose, false);
- setAutoFillBackground(false);
-
-@@ -73,6 +76,8 @@ HostVideo::HostVideo(HostInput *hostInput,
- m_keepAspectRatio = emConf.defaultValue("keepAspectRatio").toBool();
-
- QObject::connect(m_emu, SIGNAL(videoSrcRectChanged()), SLOT(updateRects()));
-+ QObject::connect(this, SIGNAL(videoFrameChanged(QImage)), &glPainter,
-+ SLOT(paintFrame(QImage)), Qt::QueuedConnection);
- }
-
- HostVideo::~HostVideo()
-@@ -97,12 +102,34 @@ void HostVideo::paintEvent(QPaintEvent *)
- // We do nothing here as we render in a distinct thread.
- }
-
-+void HostVideo::resizeEvent(QResizeEvent *event)
-+{
-+ glPainter.resizeViewport(event->size());
-+}
-+
- /*! Sets if fps should be drawn (\a on=true) or not. */
- void HostVideo::setFpsVisible(bool on)
- {
- m_fpsVisible = on;
- }
-
-+void HostVideo::startRendering()
-+{
-+ glPainter.moveToThread(&glThread);
-+ connect(&glThread, SIGNAL(started()), &glPainter, SLOT(start()));
-+ glThread.start();
-+}
-+
-+void HostVideo::stopRendering()
-+{
-+ glPainter.stop();
-+ glThread.wait();
-+}
-+
-+void HostVideo::updateFrame(QImage frame) {
-+ emit videoFrameChanged(frame);
-+}
-+
- /*! \internal */
- void HostVideo::updateRects()
- {
-diff --git a/src/base/hostvideo.h b/src/base/hostvideo.h
-index 073bc4d..9641743 100644
---- a/src/base/hostvideo.h
-+++ b/src/base/hostvideo.h
-@@ -22,7 +22,8 @@ class HostInput;
- #include "base_global.h"
- #include <QGLWidget>
- #include <QTime>
--#include <QGLShaderProgram>
-+#include <QThread>
-+#include "glpainter.h"
-
- class BASE_EXPORT HostVideo : public QGLWidget
- {
-@@ -43,13 +44,10 @@ public:
- QRectF dstRect() const;
-
- QPoint convertCoordHostToEmu(const QPoint &hostPos);
--signals:
-- void shaderChanged();
--protected:
-- void paintEvent(QPaintEvent *);
--private slots:
-- void updateRects();
--private:
-+
-+ void startRendering();
-+ void stopRendering();
-+
- HostInput *m_hostInput;
- Emu *m_emu;
- EmuThread *m_thread;
-@@ -63,6 +61,21 @@ private:
- QTime m_fpsCounterTime;
-
- bool m_keepAspectRatio;
-+
-+ void updateFrame(QImage frame);
-+signals:
-+ void videoFrameChanged(QImage frame);
-+
-+protected:
-+ void paintEvent(QPaintEvent *);
-+ void resizeEvent(QResizeEvent *event);
-+
-+private slots:
-+ void updateRects();
-+
-+private:
-+ GLPainter glPainter;
-+ QThread glThread;
- };
-
- inline QRectF HostVideo::dstRect() const
-diff --git a/src/snes/snes.cpp b/src/snes/snes.cpp
-index 18d0bae..4732222 100644
---- a/src/snes/snes.cpp
-+++ b/src/snes/snes.cpp
-@@ -294,6 +294,7 @@ void SnesEmu::sl() {
- int main(int argc, char *argv[]) {
- if (argc < 2)
- return -1;
-+ QCoreApplication::setAttribute(Qt::AA_X11InitThreads);
- QApplication app(argc, argv);
- EmuView view(&snesEmu, argv[1]);
- return app.exec();
---
-1.7.10.3
-
|
|
[-]
[+]
|
Deleted |
0003-Force-graphicssystem-to-opengl-on-desktop-file.patch
^
|
| @@ -1,24 +0,0 @@
-From 00bef7ea6fe5cf69b80a2ba80d7a37a0ca658c4c Mon Sep 17 00:00:00 2001
-From: Ruediger Gad <r.c.g@gmx.de>
-Date: Tue, 15 Jan 2013 20:47:11 +0000
-Subject: [PATCH 3/4] Force graphicssystem to opengl on desktop file.
-
----
- src/diskgallery/diskgallery.desktop | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/diskgallery/diskgallery.desktop b/src/diskgallery/diskgallery.desktop
-index c536b75..7323d5a 100644
---- a/src/diskgallery/diskgallery.desktop
-+++ b/src/diskgallery/diskgallery.desktop
-@@ -3,6 +3,6 @@ Version=1.0
- Type=Application
- Terminal=false
- Name=EmuMaster
--Exec=/usr/bin/invoker --type=e -s -S /opt/emumaster/data/splash.png -L /opt/emumaster/data/splash-l.png /opt/emumaster/bin/diskgallery
-+Exec=QT_GRAPHICSSYSTEM=opengl /usr/bin/invoker --type=e -s -S /opt/emumaster/data/splash.png -L /opt/emumaster/data/splash-l.png /opt/emumaster/bin/diskgallery
- Icon=/opt/emumaster/data/diskgallery.png
- Categories=Game;Emulator;
---
-1.7.10.3
-
|
|
[-]
[+]
|
Deleted |
0004-Add-missing-glpainter.patch
^
|
| @@ -1,157 +0,0 @@
-From 446b6dd8e8ca70489f91bdfe1551c1d5e537f795 Mon Sep 17 00:00:00 2001
-From: Ruediger Gad <r.c.g@gmx.de>
-Date: Tue, 15 Jan 2013 21:19:53 +0000
-Subject: [PATCH 4/4] Add missing glpainter.
-
----
- src/base/glpainter.cpp | 75 ++++++++++++++++++++++++++++++++++++++++++++++++
- src/base/glpainter.h | 55 +++++++++++++++++++++++++++++++++++
- 2 files changed, 130 insertions(+)
- create mode 100644 src/base/glpainter.cpp
- create mode 100644 src/base/glpainter.h
-
-diff --git a/src/base/glpainter.cpp b/src/base/glpainter.cpp
-new file mode 100644
-index 0000000..9d48b72
---- /dev/null
-+++ b/src/base/glpainter.cpp
-@@ -0,0 +1,75 @@
-+#include <QDebug>
-+#include "glpainter.h"
-+#include "hostvideo.h"
-+#include "emu.h"
-+#include "emuthread.h"
-+#include "hostinput.h"
-+
-+GLPainter::GLPainter(HostVideo *widget) :
-+ glWidget(widget),
-+ doRendering(true)
-+ {
-+ }
-+
-+void GLPainter::start()
-+{
-+ qDebug("Starting glPainter");
-+// glWidget->makeCurrent();
-+// startTimer(20);
-+}
-+
-+void GLPainter::stop()
-+{
-+ QMutexLocker locker(&mutex);
-+ doRendering = false;
-+}
-+
-+void GLPainter::resizeViewport(const QSize &size)
-+{
-+ QMutexLocker locker(&mutex);
-+ viewportWidth = size.width();
-+ viewportHeight = size.height();
-+}
-+
-+void GLPainter::paintFps(QPainter *painter)
-+{
-+ // calculate fps
-+ glWidget->m_fpsCounter++;
-+ if (glWidget->m_fpsCounterTime.elapsed() >= 1000) {
-+ glWidget->m_fpsCount = glWidget->m_fpsCounter;
-+ glWidget->m_fpsCounter = 0;
-+ glWidget->m_fpsCounterTime.restart();
-+ }
-+ // set font and draw fps
-+ QFont font = painter->font();
-+ font.setPointSize(12);
-+ painter->setFont(font);
-+ painter->setPen(Qt::red);
-+ painter->drawText(QRectF(80.0f, 0.0f, 100.0f, 60.0f),
-+ Qt::AlignCenter,
-+ QString("%1 FPS").arg(glWidget->m_fpsCount));
-+}
-+
-+void GLPainter::paintFrame(QImage frame) {
-+ QMutexLocker locker(&mutex);
-+
-+ glWidget->makeCurrent();
-+ QPainter painter(glWidget);
-+// painter.begin(this);
-+
-+ // clear screen early only when we are not drawing on entire screen later
-+ if (glWidget->m_keepAspectRatio)
-+ painter.fillRect(glWidget->rect(), Qt::black);
-+
-+ GLuint t = glWidget->bindTexture(frame);
-+ glWidget->drawTexture(glWidget->m_dstRect, t);
-+ glWidget->deleteTexture(t);
-+
-+ if (glWidget->m_fpsVisible)
-+ paintFps(&painter);
-+
-+ // draw buttons
-+ glWidget->m_hostInput->paint(&painter);
-+ painter.end();
-+}
-+
-diff --git a/src/base/glpainter.h b/src/base/glpainter.h
-new file mode 100644
-index 0000000..720a100
---- /dev/null
-+++ b/src/base/glpainter.h
-@@ -0,0 +1,55 @@
-+/*
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public License as
-+ * published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef GLPAINTER_H
-+#define GLPAINTER_H
-+
-+#include <QObject>
-+#include <QTimer>
-+#include <QPainter>
-+#include <QMutex>
-+#include <QThread>
-+#include <QTimerEvent>
-+#include <QPainter>
-+
-+class HostVideo;
-+
-+class GLPainter : public QObject
-+{
-+ Q_OBJECT
-+public:
-+ GLPainter(HostVideo *widget);
-+ void stop();
-+ void resizeViewport(const QSize &size);
-+
-+public slots:
-+ void start();
-+
-+ void paintFrame(QImage frame);
-+
-+protected:
-+ void paint();
-+
-+private:
-+ QMutex mutex;
-+ HostVideo *glWidget;
-+ int viewportWidth;
-+ int viewportHeight;
-+ bool doRendering;
-+
-+ void paintFps(QPainter *painter);
-+};
-+
-+#endif // GLPAINTER_H
---
-1.7.10.3
-
|
|
[-]
[+]
|
Deleted |
dynamically_determine_screensize_for_emuview.patch
^
|
| @@ -1,21 +0,0 @@
-diff --git a/src/base/emuview.cpp b/src/base/emuview.cpp
-index 2f2472c..79e1e31 100644
---- a/src/base/emuview.cpp
-+++ b/src/base/emuview.cpp
-@@ -31,6 +31,7 @@
- #include <qdeclarative.h>
- #include <QCloseEvent>
- #include <QApplication>
-+#include <QDesktopWidget>
- #include <QDeclarativeEngine>
- #include <QTimer>
- #include <QDir>
-@@ -67,7 +68,7 @@ EmuView::EmuView(Emu *emu, const QString &diskFileName) :
- m_hostAudio = new HostAudio(m_emu);
- m_hostVideo = new HostVideo(m_hostInput, m_emu, m_thread);
- m_hostVideo->setParent(this);
-- m_hostVideo->resize(HostVideo::Width, HostVideo::Height);
-+ m_hostVideo->resize(QApplication::desktop()->width(), QApplication::desktop()->height());
- m_hostVideo->installEventFilter(m_hostInput);
- m_hostInput->touchInputDevice()->setHostVideo(m_hostVideo);
- QObject::connect(m_hostInput, SIGNAL(quit()), SLOT(close()));
|
|
[-]
[+]
|
Deleted |
dynamically_determine_screensize_for_touchinput.patch
^
|
| @@ -1,244 +0,0 @@
-diff --git a/src/base/touchinputdevice.cpp b/src/base/touchinputdevice.cpp
-index 67052fa..aad2636 100644
---- a/src/base/touchinputdevice.cpp
-+++ b/src/base/touchinputdevice.cpp
-@@ -19,6 +19,8 @@
- #include "emu.h"
- #include <QTouchEvent>
- #include <QPainter>
-+#include <QApplication>
-+#include <QDesktopWidget>
-
- enum ButtonsInImage {
- Button_Settings,
-@@ -68,6 +70,9 @@ TouchInputDevice::TouchInputDevice(QObject *parent) :
- QObject::connect(this, SIGNAL(emuFunctionChanged()), SLOT(onEmuFunctionChanged()));
-
- m_buttonsImage.load(pathManager.installationDirPath()+"/data/buttons.png");
-+
-+ m_width = QApplication::desktop()->width();
-+ m_height = QApplication::desktop()->height();
- }
-
- void TouchInputDevice::setHostVideo(HostVideo *hostVideo)
-@@ -158,20 +163,20 @@ void TouchInputDevice::convertPad()
- for (int i = 0; i < m_numPoints; i++) {
- int x = m_points[i].x();
- int y = m_points[i].y();
-- if (y >= HostVideo::Height-m_areaSize) {
-- y -= HostVideo::Height-m_areaSize;
-+ if (y >= m_height-m_areaSize) {
-+ y -= m_height-m_areaSize;
- if (x < m_areaSize) {
- // directions
- m_buttons |= buttonsInDpad(x, y);
-- } else if (x >= HostVideo::Width-m_areaSize) {
-+ } else if (x >= m_width-m_areaSize) {
- // a,b,x,y
-- x -= HostVideo::Width-m_areaSize;
-+ x -= m_width-m_areaSize;
- m_buttons |= buttonsInDpad(x, y) << 4;
-- } else if (x >= HostVideo::Width/2-ButtonWidth &&
-- x < HostVideo::Width/2+ButtonWidth) {
-+ } else if (x >= m_width/2-ButtonWidth &&
-+ x < m_width/2+ButtonWidth) {
- // select, start
- if (y >= m_areaSize-ButtonHeight) {
-- if (x < HostVideo::Width/2)
-+ if (x < m_width/2)
- m_buttons |= EmuPad::Button_Select;
- else
- m_buttons |= EmuPad::Button_Start;
-@@ -183,9 +188,9 @@ void TouchInputDevice::convertPad()
- m_buttons |= EmuPad::Button_L1;
- else if (x < ButtonWidth*2)
- m_buttons |= EmuPad::Button_L2;
-- else if (x >= HostVideo::Width-ButtonWidth)
-+ else if (x >= m_width-ButtonWidth)
- m_buttons |= EmuPad::Button_R1;
-- else if (x >= HostVideo::Width-ButtonWidth*2)
-+ else if (x >= m_width-ButtonWidth*2)
- m_buttons |= EmuPad::Button_R2;
- }
- }
-@@ -206,8 +211,8 @@ void TouchInputDevice::convertMouse()
- for (int i = 0; i < m_numPoints; i++) {
- int x = m_points[i].x();
- int y = m_points[i].y();
-- if (y >= HostVideo::Height-m_areaSize) {
-- y -= HostVideo::Height-m_areaSize;
-+ if (y >= m_height-m_areaSize) {
-+ y -= m_height-m_areaSize;
- if (x < m_areaSize) {
- m_mouseX = x - m_areaSize/2;
- m_mouseY = y - m_areaSize/2;
-@@ -217,8 +222,8 @@ void TouchInputDevice::convertMouse()
- m_lastMouseY = m_mouseY;
- }
- newMoving = true;
-- } else if (x >= HostVideo::Width-m_areaSize) {
-- x -= HostVideo::Width-m_areaSize;
-+ } else if (x >= m_width-m_areaSize) {
-+ x -= m_width-m_areaSize;
- int buttons = buttonsInDpad(x, y);
- // swap bits
- int left = (buttons & 2) >> 1;
-@@ -391,7 +396,7 @@ void TouchInputDevice::updatePaintedButtons()
-
- // settings,exit
- addPaintedButton(Button_Settings, 0, QPointF(0, 0));
-- addPaintedButton(Button_Exit, 0, QPointF(HostVideo::Width-PaintedButtonSize, 0));
-+ addPaintedButton(Button_Exit, 0, QPointF(m_width-PaintedButtonSize, 0));
-
- if (emuFunction() <= 2)
- addPaintedButtonsPad();
-@@ -402,17 +407,17 @@ void TouchInputDevice::updatePaintedButtons()
- void TouchInputDevice::addPaintedButtonsPad()
- {
- // left dpad
-- QPointF leftPos(10, HostVideo::Height-m_areaSize/2-PaintedButtonSize/2);
-+ QPointF leftPos(10, m_height-m_areaSize/2-PaintedButtonSize/2);
- addPaintedButton(Button_Left, EmuPad::Button_Left, leftPos);
- QPointF rightPos(m_areaSize-PaintedButtonSize-10, leftPos.y());
- addPaintedButton(Button_Right, EmuPad::Button_Right, rightPos);
- QPointF upPos(m_areaSize/2-PaintedButtonSize/2,
-- HostVideo::Height-m_areaSize+10);
-+ m_height-m_areaSize+10);
- addPaintedButton(Button_Up, EmuPad::Button_Up, upPos);
-- QPointF downPos(upPos.x(), HostVideo::Height-PaintedButtonSize-10);
-+ QPointF downPos(upPos.x(), m_height-PaintedButtonSize-10);
- addPaintedButton(Button_Down, EmuPad::Button_Down, downPos);
- // buttons at the right
-- QPointF offset(HostVideo::Width-m_areaSize, 0);
-+ QPointF offset(m_width-m_areaSize, 0);
- if (!m_gbaButtonsEnable) {
- if (!m_picoButtonsEnable) {
- addPaintedButton(m_psxButtonsEnable ? Button_Square : Button_Y,
-@@ -430,7 +435,7 @@ void TouchInputDevice::addPaintedButtonsPad()
- EmuPad::Button_B, downPos + offset);
- // l1,r1,l2,r2
- QPointF lPos(ButtonWidth/2-PaintedButtonSize/2, m_lrYPos);
-- QPointF rPos = lPos + QPointF(HostVideo::Width-ButtonWidth, 0);
-+ QPointF rPos = lPos + QPointF(m_width-ButtonWidth, 0);
- QPointF l2Pos = lPos + QPointF(ButtonWidth, 0);
- QPointF r2Pos = rPos - QPointF(ButtonWidth, 0);
- if (m_lrVisible) {
-@@ -450,8 +455,8 @@ void TouchInputDevice::addPaintedButtonsPad()
- }
- }
- // select,start
-- QPointF selectPos(HostVideo::Width/2-ButtonWidth/2-PaintedButtonSize/2,
-- HostVideo::Height-ButtonHeight/2-PaintedButtonSize/2);
-+ QPointF selectPos(m_width/2-ButtonWidth/2-PaintedButtonSize/2,
-+ m_height-ButtonHeight/2-PaintedButtonSize/2);
- QPointF startPos = selectPos + QPointF(ButtonWidth, 0);
- addPaintedButton(Button_Select, EmuPad::Button_Select, selectPos);
- addPaintedButton(Button_Start, EmuPad::Button_Start, startPos);
-@@ -459,13 +464,13 @@ void TouchInputDevice::addPaintedButtonsPad()
-
- void TouchInputDevice::addPaintedButtonsMouse()
- {
-- QPointF leftPos(10, HostVideo::Height-m_areaSize/2-PaintedButtonSize/2);
-+ QPointF leftPos(10, m_height-m_areaSize/2-PaintedButtonSize/2);
- QPointF rightPos(m_areaSize-PaintedButtonSize-10, leftPos.y());
- QPointF upPos(m_areaSize/2-PaintedButtonSize/2,
-- HostVideo::Height-m_areaSize+10);
-- QPointF downPos(upPos.x(), HostVideo::Height-PaintedButtonSize-10);
-+ m_height-m_areaSize+10);
-+ QPointF downPos(upPos.x(), m_height-PaintedButtonSize-10);
- // buttons at the right
-- QPointF offset(HostVideo::Width-m_areaSize, 0);
-+ QPointF offset(m_width-m_areaSize, 0);
-
- addPaintedButton(Button_L, EmuMouse::Button_Left, downPos + offset);
- addPaintedButton(Button_R, EmuMouse::Button_Right, rightPos + offset);
-@@ -492,7 +497,7 @@ void TouchInputDevice::addPaintedButton(int button, int flag, QPointF pos)
-
- void TouchInputDevice::updateGrid()
- {
-- m_lrYPos = ButtonHeight/2+(HostVideo::Height-m_areaSize-ButtonHeight)/2;
-+ m_lrYPos = ButtonHeight/2+(m_height-m_areaSize-ButtonHeight)/2;
- m_grid = QPainterPath();
-
- if (emuFunction() <= 0)
-@@ -501,7 +506,7 @@ void TouchInputDevice::updateGrid()
- // add "touchpad" rect even if grid is not visible
- if (emuFunction() >= 3 && emuFunction() <= 4 && (m_gridVisible || m_buttonsVisible)) {
- // left "touchpad"
-- QPointF p1(0, HostVideo::Height-m_areaSize);
-+ QPointF p1(0, m_height-m_areaSize);
- QSizeF sizeArea(m_areaSize-1, m_areaSize-1);
- m_grid.addRect(QRectF(p1, sizeArea));
- }
-@@ -513,14 +518,14 @@ void TouchInputDevice::updateGrid()
- // settings button
- m_grid.addRect(QRectF(QPointF(0, 0), sizeButton));
- // exit button
-- m_grid.addRect(QRectF(QPointF(HostVideo::Width-ButtonWidth, 0), sizeButton));
-+ m_grid.addRect(QRectF(QPointF(m_width-ButtonWidth, 0), sizeButton));
-
- if (emuFunction() <= 2) {
- addGridPad();
- } else if (emuFunction() <= 4) {
- // l,r,m mouse buttons
-- addDpadAreaToGrid(HostVideo::Width-m_areaSize,
-- HostVideo::Height-m_areaSize);
-+ addDpadAreaToGrid(m_width-m_areaSize,
-+ m_height-m_areaSize);
- }
- }
-
-@@ -528,16 +533,16 @@ void TouchInputDevice::addGridPad()
- {
- QSizeF sizeButton(ButtonWidth-1, ButtonHeight-1);
- // left dpad
-- addDpadAreaToGrid(0, HostVideo::Height-m_areaSize);
-+ addDpadAreaToGrid(0, m_height-m_areaSize);
- // right dpad
-- addDpadAreaToGrid(HostVideo::Width-m_areaSize, HostVideo::Height-m_areaSize);
-+ addDpadAreaToGrid(m_width-m_areaSize, m_height-m_areaSize);
|
|
[-]
[+]
|
Deleted |
fix-audio-playback.patch
^
|
| @@ -1,61 +0,0 @@
-diff --git a/src/base/emuview.cpp b/src/base/emuview.cpp
-index dc46602..eea1d5a 100644
---- a/src/base/emuview.cpp
-+++ b/src/base/emuview.cpp
-@@ -30,10 +30,8 @@
- #include <QQuickView>
- #include <QQmlContext>
- #include <QtQml>
--//#include <qdeclarative.h>
- #include <QCloseEvent>
--#include <QApplication>
--//#include <QDesktopWidget>
-+#include <QGuiApplication>
- #include <QQmlEngine>
- #include <QTimer>
- #include <QDir>
-@@ -84,6 +82,7 @@ EmuView::EmuView(Emu *emu, const QString &diskFileName, QQuickView *view, QObjec
- SIGNAL(inputDevicesChanged()));
- // QObject::connect(m_hostVideo, SIGNAL(shaderChanged()),
- // SLOT(hostVideoShaderChanged()));
-+ QObject::connect(m_view, SIGNAL(sceneGraphInvalidated()), SLOT(close()));
-
- m_stateListModel = new StateListModel(m_emu, m_diskFileName);
-
-@@ -238,7 +237,7 @@ bool EmuView::close()
- pause();
- return false;
- } else {
-- qApp->quit();
-+ QGuiApplication::quit();
- return true;
- }
- }
-@@ -465,8 +464,9 @@ void EmuView::paintEvent(QPaintEvent *)
-
- void EmuView::closeEvent(QCloseEvent *e)
- {
-- e->ignore();
-- close();
-+ qDebug("Got a close event.");
-+ if (! close())
-+ close();
- }
-
- void EmuView::changeEvent(QEvent *e)
-diff --git a/src/snes/snes.cpp b/src/snes/snes.cpp
-index 51adb16..fc1e29d 100644
---- a/src/snes/snes.cpp
-+++ b/src/snes/snes.cpp
-@@ -301,8 +301,10 @@ int main(int argc, char *argv[]) {
- // QGuiApplication *app = SailfishApp::application(argc, argv);
- // QQuickView *view = SailfishApp::createView();
- QGuiApplication *app = new QGuiApplication(argc, argv);
-+ app->setQuitOnLastWindowClosed(false);
- QQuickView *view = new QQuickView();
-
- EmuView emuView(&snesEmu, argv[1], view);
-- return app->exec();
-+ int ret = app->exec();
-+ return ret;
- }
|
|
[-]
[+]
|
Deleted |
fix-diskgallery-rendering.patch
^
|
| @@ -1,17 +0,0 @@
-diff --git a/qml/gallery/main.qml b/qml/gallery/main.qml
-index 0695c7d..8108555 100644
---- a/qml/gallery/main.qml
-+++ b/qml/gallery/main.qml
-@@ -22,12 +22,6 @@ PageStackWindow {
- initialPage: mainPage
- showStatusBar: false
-
-- platformStyle: PageStackWindowStyle {
-- id: customStyle;
-- background: "image://theme/meegotouch-video-background"
-- backgroundFillMode: Image.Stretch
-- cornersVisible: false
-- }
- CollectionMenuPage { id: mainPage }
- GalleryPage { id: galleryPage }
-
|
|
[-]
[+]
|
Deleted |
fix-memory-leak.patch
^
|
| @@ -1,35 +0,0 @@
-diff --git a/src/base/frameitem.cpp b/src/base/frameitem.cpp
-index e83ba31..be4d4a0 100644
---- a/src/base/frameitem.cpp
-+++ b/src/base/frameitem.cpp
-@@ -17,14 +17,14 @@ FrameItem::FrameItem(QQuickItem *parent) :
- }
-
- void FrameItem::handleNewFrame(QImage frame) {
-- m_currentFrame = new QImage(frame);
-+ m_currentFrame = frame;
- update();
- }
-
- void FrameItem::paint(QPainter *painter)
- {
-- if (m_currentFrame) {
-- painter->drawImage(contentsBoundingRect(), m_currentFrame->copy());
-+ if (! m_currentFrame.isNull()) {
-+ painter->drawImage(contentsBoundingRect(), m_currentFrame);
- m_emuView->hostInput()->paint(painter);
- paintFps(painter);
- }
-diff --git a/src/base/frameitem.h b/src/base/frameitem.h
-index d147a0d..1a802f5 100644
---- a/src/base/frameitem.h
-+++ b/src/base/frameitem.h
-@@ -43,7 +43,7 @@ protected:
-
- private:
- EmuView *m_emuView;
-- QImage *m_currentFrame;
-+ QImage m_currentFrame;
- bool m_keepAspectRatio;
-
- bool m_fpsVisible;
|
|
[-]
[+]
|
Deleted |
fix-settingsview-not-displayed.patch
^
|
| @@ -1,100 +0,0 @@
-diff --git a/qml/base/SettingsPage.qml b/qml/base/SettingsPage.qml
-index 9439650..e430d58 100644
---- a/qml/base/SettingsPage.qml
-+++ b/qml/base/SettingsPage.qml
-@@ -206,11 +206,6 @@ Page {
- }
- SettingsSwitchItem { text: qsTr("Show FPS"); paramName: "fpsVisible" }
- SettingsSwitchItem { text: qsTr("Keep Aspect Ratio"); paramName: "keepAspectRatio" }
-- SelectionItem {
-- titleText: qsTr("Video Filter")
-- subtitleText: emuView.videoFilter
-- onClicked: videoFilterSelector.open()
-- }
- }
-
- Column {
-@@ -266,15 +261,4 @@ Page {
- titleText: qsTr("Select Configuration")
- onAccepted: inputDevice.emuFunction = selectedIndex
- }
--
-- StringListProxy {
-- id: videoFilterModel
-- stringListModel: emuView.availableVideoFilters
-- }
-- SelectionDialog {
-- id: videoFilterSelector
-- model: videoFilterModel
-- titleText: qsTr("Select Video Filter")
-- onAccepted: emuView.videoFilter = videoFilterModel.get(selectedIndex)
-- }
- }
-diff --git a/src/base/emuview.cpp b/src/base/emuview.cpp
-index 8a9a787..3eb2d70 100644
---- a/src/base/emuview.cpp
-+++ b/src/base/emuview.cpp
-@@ -138,8 +138,7 @@ void EmuView::setupSettingsView()
- {
- m_settingsView = new QDeclarativeView(this);
- m_settingsView->setViewport(new QGLWidget());
-- //FIXME: Resize properly.
--// m_settingsView->resize(HostVideo::Width, HostVideo::Height);
-+ m_settingsView->resize(QApplication::desktop()->width(), QApplication::desktop()->height());
- QObject::connect(m_settingsView->engine(), SIGNAL(quit()), SLOT(close()));
-
- m_settingsView->engine()->addImageProvider("state", new StateImageProvider(m_stateListModel));
-@@ -251,6 +250,7 @@ void EmuView::showSettingsView()
- if (m_audioEnable)
- m_hostAudio->close();
- m_settingsView->setVisible(true);
-+ m_settingsView->resize(QApplication::desktop()->width(), QApplication::desktop()->height());
- m_settingsView->setFocus();
- m_hostVideo->setVisible(false);
- setSwipeEnabled(true);
-@@ -620,21 +620,6 @@ bool EmuView::areLRButtonsVisible() const
- return m_lrButtonsVisible;
- }
-
--void EmuView::setVideoFilter(const QString &name)
--{
-- //FIXME: Remove
--}
--
--QString EmuView::videoFilter() const
--{
-- //FIXME: Remove
--}
--
--QStringList EmuView::availableVideoFilters() const
--{
-- //FIXME: Remove
--}
--
- void EmuView::disableSafetyTimer()
- {
- m_safetyTimerDisabled = true;
-diff --git a/src/base/emuview.h b/src/base/emuview.h
-index 80d924c..f21752a 100644
---- a/src/base/emuview.h
-+++ b/src/base/emuview.h
-@@ -41,8 +41,6 @@ class BASE_EXPORT EmuView : public QWidget
- Q_PROPERTY(bool lrButtonsVisible READ areLRButtonsVisible WRITE setLRButtonsVisible NOTIFY lrButtonsVisibleChanged)
- Q_PROPERTY(QString error READ error CONSTANT)
- Q_PROPERTY(QList<QObject *> inputDevices READ inputDevices NOTIFY inputDevicesChanged)
-- Q_PROPERTY(QString videoFilter READ videoFilter WRITE setVideoFilter NOTIFY videoFilterChanged)
-- Q_PROPERTY(QStringList availableVideoFilters READ availableVideoFilters CONSTANT)
- public:
- explicit EmuView(Emu *emu, const QString &diskFileName);
- ~EmuView();
-@@ -69,10 +67,6 @@ public:
-
- QString error() const;
-
-- void setVideoFilter(const QString &name);
-- QString videoFilter() const;
-- QStringList availableVideoFilters() const;
--
- void disableSafetyTimer();
- public slots:
- bool close();
|
|
[-]
[+]
|
Deleted |
fix_compile_and_linking.patch
^
|
| @@ -1,62 +0,0 @@
-diff --git a/src/base/base.pro b/src/base/base.pro
-index bc47c5d..ca20646 100644
---- a/src/base/base.pro
-+++ b/src/base/base.pro
-@@ -2,10 +2,13 @@ TEMPLATE = lib
- DESTDIR = ../../lib
- INCLUDEPATH += ..
- QT += declarative opengl network
--LIBS += -L../../lib -lpulse
-+LIBS += -L../../lib -lpulse -lQtFeedback
- CONFIG += mobility
- MOBILITY += sensors feedback
-
-+QMAKE_CFLAGS_RELEASE += -mfpu=neon
-+QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -mfpu=neon
-+
- linux-g++-maemo {
- MEEGO_VERSION_MAJOR = 1
- MEEGO_VERSION_MINOR = 2
-diff --git a/src/emu.pri b/src/emu.pri
-index d5044fd..6965ae5 100644
---- a/src/emu.pri
-+++ b/src/emu.pri
-@@ -3,6 +3,9 @@ LIBS += -L../../lib -lbase
- INCLUDEPATH += ..
- QT += opengl declarative
-
-+QMAKE_CFLAGS_RELEASE += -mfpu=neon
-+QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -mfpu=neon
-+
- #contains(CONFIG,release) {
- # QMAKE_CFLAGS_RELEASE -= -O2
- # QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO -= -O2
-diff --git a/src/nes/nes.pro b/src/nes/nes.pro
-index e842d70..d1bfcaf 100644
---- a/src/nes/nes.pro
-+++ b/src/nes/nes.pro
-@@ -10,6 +10,9 @@ contains(DEFINES,ENABLE_DEBUGGING) {
- QT += network
- }
-
-+QMAKE_CFLAGS_RELEASE += -mfpu=neon
-+QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -mfpu=neon
-+
- HEADERS += \
- apu.h \
- apuchannel.h \
-diff --git a/src/psx/psx.pro b/src/psx/psx.pro
-index 73e22a8..a5a8339 100644
---- a/src/psx/psx.pro
-+++ b/src/psx/psx.pro
-@@ -1,5 +1,10 @@
- include(../emu.pri)
-
-+QMAKE_CFLAGS_RELEASE += -mfpu=neon
-+QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -mfpu=neon
-+
-+LIBS += -lz
-+
- HEADERS += \
- ppf.h \
- misc.h \
|
|
[-]
[+]
|
Deleted |
fix_home_dir_path.patch
^
|
| @@ -1,34 +0,0 @@
-diff --git a/qml/gallery/CoverSelectorPage.qml b/qml/gallery/CoverSelectorPage.qml
-index db06dc3..ed4e254 100644
---- a/qml/gallery/CoverSelectorPage.qml
-+++ b/qml/gallery/CoverSelectorPage.qml
-@@ -43,7 +43,7 @@ Page {
-
- FolderListModel {
- id: folderModel
-- folder: "file:/home/user/MyDocs/emumaster/covers"
-+ folder: "file:/home/nemo/emumaster/covers"
- nameFilters: ["*.jpg"]
- showDirs: false
- }
-diff --git a/src/base/pathmanager.cpp b/src/base/pathmanager.cpp
-index 5639cdb..e76489e 100644
---- a/src/base/pathmanager.cpp
-+++ b/src/base/pathmanager.cpp
-@@ -36,7 +36,7 @@ PathManager::PathManager()
-
- m_installationDirPath = "/opt/emumaster";
- m_userDataDirPath = QString("%1/.emumaster").arg(getenv("HOME"));
-- m_diskDirBase = QString("%1/MyDocs/emumaster").arg(getenv("HOME"));
-+ m_diskDirBase = QString("%1/emumaster").arg(getenv("HOME"));
- }
-
- /*! Creates subdirs for every emulation in the given \a dir. */
-@@ -60,7 +60,6 @@ void PathManager::buildLocalDirTree()
- dir.cd("screenshot"); createEmusSubtree(dir); dir.cdUp();
-
- dir = QDir(getenv("HOME"));
-- dir.cd("MyDocs");
- dir.mkdir("emumaster");
- dir.cd("emumaster");
- dir.mkdir("covers");
|
|
[-]
[+]
|
Deleted |
fix_linux-gpp-maemo_scope.patch
^
|
| @@ -1,39 +0,0 @@
-diff --git a/src/base/base.pro b/src/base/base.pro
-index ca20646..78e4a25 100644
---- a/src/base/base.pro
-+++ b/src/base/base.pro
-@@ -9,7 +9,7 @@ MOBILITY += sensors feedback
- QMAKE_CFLAGS_RELEASE += -mfpu=neon
- QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -mfpu=neon
-
--linux-g++-maemo {
-+unix {
- MEEGO_VERSION_MAJOR = 1
- MEEGO_VERSION_MINOR = 2
- MEEGO_VERSION_PATCH = 0
-diff --git a/src/diskgallery/diskgallery.pro b/src/diskgallery/diskgallery.pro
-index e63a0a4..4c2e7f0 100644
---- a/src/diskgallery/diskgallery.pro
-+++ b/src/diskgallery/diskgallery.pro
-@@ -21,7 +21,7 @@ HEADERS += \
- disklistmodel.h \
- touchinputview.h
-
--linux-g++-maemo {
-+unix {
- MEEGO_VERSION_MAJOR = 1
- MEEGO_VERSION_MINOR = 2
- MEEGO_VERSION_PATCH = 0
-diff --git a/src/emu.pri b/src/emu.pri
-index b93260e..6f6d9b9 100644
---- a/src/emu.pri
-+++ b/src/emu.pri
-@@ -22,7 +22,7 @@ QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -mfpu=neon
- # -falign-functions=32
- #}
-
--linux-g++-maemo {
-+unix {
- MEEGO_VERSION_MAJOR = 1
- MEEGO_VERSION_MINOR = 2
- MEEGO_VERSION_PATCH = 0
|
|
[-]
[+]
|
Deleted |
gl_painting_qt5_changes.patch
^
|
| @@ -1,2606 +0,0 @@
-diff --git a/qml/base/EmuView.qml b/qml/base/EmuView.qml
-index e69de29..93f7663 100644
---- a/qml/base/EmuView.qml
-+++ b/qml/base/EmuView.qml
-@@ -0,0 +1,25 @@
-+import QtQuick 2.0
-+import Sailfish.Silica 1.0
-+import EmuMaster 1.0
-+
-+ApplicationWindow
-+{
-+ initialPage: Page {
-+ allowedOrientations: Orientation.Landscape
-+ Rectangle {
-+ anchors.fill: parent
-+ color: "green"
-+
-+ FrameItem {
-+ id: frameItem
-+
-+ anchors.fill: parent
-+ }
-+ }
-+ }
-+
-+ Component.onCompleted: {
-+ frameItem.setEmuView(emuView)
-+ }
-+}
-+
-diff --git a/qml/gallery/AboutPage.qml b/qml/gallery/AboutPage.qml
-index b8d28dc..e142c1b 100644
---- a/qml/gallery/AboutPage.qml
-+++ b/qml/gallery/AboutPage.qml
-@@ -15,19 +15,12 @@
- */
-
- import QtQuick 2.0
--import com.nokia.meego 1.1
-+import Sailfish.Silica 1.0
-
- Page {
- id: aboutPage
-
-- tools: ToolBarLayout {
-- ToolIcon {
-- iconId: "toolbar-back"
-- onClicked: appWindow.pageStack.pop()
-- }
-- }
--
-- Flickable {
-+ SilicaFlickable {
- anchors.fill: parent
- contentHeight: column.height
-
-diff --git a/qml/gallery/AdvancedLaunchPage.qml b/qml/gallery/AdvancedLaunchPage.qml
-index c313233..7938f45 100644
---- a/qml/gallery/AdvancedLaunchPage.qml
-+++ b/qml/gallery/AdvancedLaunchPage.qml
-@@ -15,7 +15,7 @@
- */
-
- import QtQuick 2.0
--import com.nokia.meego 1.1
-+import Sailfish.Silica 1.0
- import "../base"
-
- Page {
-@@ -25,12 +25,6 @@ Page {
- default property alias columnContent: column.children
-
- id: advancedRunPage
-- tools: ToolBarLayout {
-- ToolIcon {
-- iconId: "toolbar-back"
-- onClicked: appWindow.pageStack.pop()
-- }
-- }
-
- Connections {
- target: diskGallery
-@@ -42,8 +36,7 @@ Page {
- }
- }
-
-- children: [
-- Flickable {
-+ SilicaFlickable {
- id: flickable
- anchors.fill: parent
- flickableDirection: Flickable.VerticalFlick
-@@ -70,7 +63,6 @@ Page {
- text: qsTr("Auto Save/Load")
- }
- }
-- },
-- ScrollDecorator { flickableItem: flickable }
-- ]
-+ }
- }
-+
-diff --git a/qml/gallery/CollectionMenuPage.qml b/qml/gallery/CollectionMenuPage.qml
-index 6132acd..f00c400 100644
---- a/qml/gallery/CollectionMenuPage.qml
-+++ b/qml/gallery/CollectionMenuPage.qml
-@@ -27,8 +27,8 @@ Page {
-
- Grid {
- id: collectionGrid
-- rows: appWindow.inPortrait ? 4 : 3
-- columns: appWindow.inPortrait ? 2 : 3
-+ rows: 4
-+ columns: 2
- anchors.horizontalCenter: parent.horizontalCenter
-
- CollectionTypeButton { name: "fav" }
-@@ -47,10 +47,10 @@ Page {
- text: qsTr("Global Settings")
- onClicked: appWindow.pageStack.push(Qt.resolvedUrl("GlobalSettings.qml"))
- }
-- MenuItem {
-- text: qsTr("SixAxis Monitor")
-- onClicked: diskGallery.sixAxisMonitor()
-- }
-+// MenuItem {
-+// text: qsTr("SixAxis Monitor")
-+// onClicked: diskGallery.sixAxisMonitor()
-+// }
- MenuItem {
- text: qsTr("About EmuMaster ...")
- onClicked: appWindow.pageStack.push(Qt.resolvedUrl("AboutPage.qml"))
-diff --git a/qml/gallery/GalleryPage.qml b/qml/gallery/GalleryPage.qml
-index f4bb0cd..ecbe36c 100644
---- a/qml/gallery/GalleryPage.qml
-+++ b/qml/gallery/GalleryPage.qml
-@@ -51,7 +51,7 @@ Page {
- id: diskViewPortrait
- anchors.fill: parent
- spacing: 10
-- visible: appWindow.inPortrait
-+ visible: false
-
- delegate: ImageListViewDelegate {
- width: 480
-@@ -84,7 +84,7 @@ Page {
- SilicaGridView {
- id: diskViewLandscape
- anchors.fill: parent
-- visible: !appWindow.inPortrait
-+ visible: true
- cellWidth: 284
- cellHeight: 240
-
-diff --git a/src/arm/assem_instr.h b/src/arm/assem_instr.h
-index 645bc9c..f904b80 100644
---- a/src/arm/assem_instr.h
-+++ b/src/arm/assem_instr.h
-@@ -75,7 +75,7 @@ inline int Assembler::GetLdrRegisterImmediateOffset(Instr instr)
- {
- Q_ASSERT(IsLdrRegisterImmediate(instr));
- bool positive = (instr & B23) == B23;
-- int offset = instr & kOff12Mask; // Zero extended offset.
-+ int offset = instr & kOff12Mask; // ZeroFlag extended offset.
- return positive ? offset : -offset;
- }
-
-diff --git a/src/arm/assembler.h b/src/arm/assembler.h
-index 9e0b8c9..8a25446 100644
---- a/src/arm/assembler.h
-+++ b/src/arm/assembler.h
-@@ -458,31 +458,31 @@ public:
- const Condition cond = al);
- void vcvt_f64_s32(const DwVfpRegister dst,
- const SwVfpRegister src,
-- VFPConversionMode mode = kDefaultRoundToZero,
-+ VFPConversionMode mode = kDefaultRoundToZeroFlag,
- const Condition cond = al);
- void vcvt_f32_s32(const SwVfpRegister dst,
- const SwVfpRegister src,
-- VFPConversionMode mode = kDefaultRoundToZero,
-+ VFPConversionMode mode = kDefaultRoundToZeroFlag,
- const Condition cond = al);
- void vcvt_f64_u32(const DwVfpRegister dst,
- const SwVfpRegister src,
-- VFPConversionMode mode = kDefaultRoundToZero,
-+ VFPConversionMode mode = kDefaultRoundToZeroFlag,
- const Condition cond = al);
- void vcvt_s32_f64(const SwVfpRegister dst,
- const DwVfpRegister src,
-- VFPConversionMode mode = kDefaultRoundToZero,
-+ VFPConversionMode mode = kDefaultRoundToZeroFlag,
- const Condition cond = al);
- void vcvt_u32_f64(const SwVfpRegister dst,
- const DwVfpRegister src,
-- VFPConversionMode mode = kDefaultRoundToZero,
-+ VFPConversionMode mode = kDefaultRoundToZeroFlag,
- const Condition cond = al);
- void vcvt_f64_f32(const DwVfpRegister dst,
|
|
[-]
[+]
|
Deleted |
move-ui-implementation-to-qml.patch
^
|
| @@ -1,352 +0,0 @@
-diff --git a/data/quit_button.png b/data/quit_button.png
-index e69de29..bdd3204 100644
-Binary files a/data/quit_button.png and b/data/quit_button.png differ
-diff --git a/data/settings_button.png b/data/settings_button.png
-index e69de29..a1c8bc2 100644
-Binary files a/data/settings_button.png and b/data/settings_button.png differ
-diff --git a/qml/base/EmuView.qml b/qml/base/EmuView.qml
-index 93f7663..119fafb 100644
---- a/qml/base/EmuView.qml
-+++ b/qml/base/EmuView.qml
-@@ -6,6 +6,7 @@ ApplicationWindow
- {
- initialPage: Page {
- allowedOrientations: Orientation.Landscape
-+
- Rectangle {
- anchors.fill: parent
- color: "green"
-@@ -14,6 +15,16 @@ ApplicationWindow
- id: frameItem
-
- anchors.fill: parent
-+
-+ IconButton {
-+ icon.source: "../../data/settings_button.png"
-+ x: 0
-+ y: 0
-+ onClicked: {
-+ emuView.pause()
-+ pageStack.push(settingsPage)
-+ }
-+ }
- }
- }
- }
-@@ -21,5 +32,9 @@ ApplicationWindow
- Component.onCompleted: {
- frameItem.setEmuView(emuView)
- }
-+
-+ SettingsPage {
-+ id: settingsPage
-+ }
- }
-
-diff --git a/qml/base/SettingsPage.qml b/qml/base/SettingsPage.qml
-index f3be485..a6ca522 100644
---- a/qml/base/SettingsPage.qml
-+++ b/qml/base/SettingsPage.qml
-@@ -19,12 +19,20 @@ import EmuMaster 1.0
-
- Page {
- id: settingsPage
-+
- property alias columnContent: column.children
- property alias inputContent: inputColumn.children
- property alias videoContent: videoColumn.children
- property alias miscContent: miscColumn.children
- property string initiatedAction
-
-+ allowedOrientations: Orientation.Landscape
-+
-+ onStatusChanged: {
-+ if (status === PageStatus.Inactive) {
-+ emuView.resume()
-+ }
-+ }
- /*
- tools: ToolBarLayout {
- ToolIcon {
-diff --git a/src/base/emuview.cpp b/src/base/emuview.cpp
-index 736ac4c..610bb56 100644
---- a/src/base/emuview.cpp
-+++ b/src/base/emuview.cpp
-@@ -61,29 +61,16 @@ EmuView::EmuView(Emu *emu, const QString &diskFileName, QQuickView *view, QObjec
- {
- Q_ASSERT(m_emu != 0);
-
--// setAttribute(Qt::WA_NoSystemBackground);
--// setAutoFillBackground(false);
--
- Configuration::setupAppInfo();
-- registerClassesInQml();
- pathManager.setCurrentEmu(m_emu->name());
-
- m_thread = new EmuThread(m_emu);
- m_hostInput = new HostInput(m_emu);
- m_hostAudio = new HostAudio(m_emu);
--// m_hostVideo = new HostVideo(m_hostInput, m_emu, m_thread, m_view);
--// QObject::connect(m_hostVideo, SIGNAL(videoFrameChanged(QImage)), this,
--// SIGNAL(videoFrameChanged(QImage)), Qt::DirectConnection);
--// m_hostVideo->setParent(m_view);
--// m_hostVideo->resize(QApplication::desktop()->width(), QApplication::desktop()->height());
--// m_hostVideo->installEventFilter(m_hostInput);
--// m_hostInput->touchInputDevice()->setHostVideo(m_hostVideo);
- QObject::connect(m_hostInput, SIGNAL(quit()), SLOT(close()));
- QObject::connect(m_hostInput, SIGNAL(pause()), SLOT(pause()));
- QObject::connect(m_hostInput, SIGNAL(devicesChanged()),
- SIGNAL(inputDevicesChanged()));
--// QObject::connect(m_hostVideo, SIGNAL(shaderChanged()),
--// SLOT(hostVideoShaderChanged()));
-
- m_stateListModel = new StateListModel(m_emu, m_diskFileName);
-
-@@ -101,28 +88,14 @@ EmuView::EmuView(Emu *emu, const QString &diskFileName, QQuickView *view, QObjec
- m_error = tr("Unknown error!");
- }
-
-- setupSettingsView();
--
- m_safetyTimer = new QTimer(this);
- m_safetyTimer->setInterval(10000);
- m_safetyTimer->setSingleShot(false);
- QObject::connect(m_safetyTimer, SIGNAL(timeout()), SLOT(onSafetyEvent()));
-
-- const char *method = "showEmulationView";
-- if (m_error.isEmpty()) {
-- QObject::connect(m_stateListModel, SIGNAL(slFailed()),
-- SLOT(onSlFailed()), Qt::QueuedConnection);
-- QObject::connect(m_stateListModel, SIGNAL(stateLoaded()),
-- SLOT(onStateLoaded()), Qt::QueuedConnection);
--#if defined(Q_WS_MAEMO_5)
-- method = "showSettingsView";
--#endif
-- } else {
-- method = "showSettingsView";
-- }
-- QMetaObject::invokeMethod(this, method, Qt::QueuedConnection);
-+ showEmulationView();
-
-- m_view->rootContext()->setContextProperty("emuView", this);
-+ registerClassesInQml();
- m_view->setSource(QUrl("/opt/emumaster/qml/base/EmuView.qml"));
- m_view->show();
-
-@@ -139,27 +112,11 @@ EmuView::~EmuView()
- m_emu->shutdown();
- }
- delete m_thread;
-- delete m_settingsView;
- delete m_stateListModel;
-- delete m_hostVideo;
- delete m_hostAudio;
- delete m_hostInput;
- }
-
--void EmuView::setupSettingsView()
--{
-- m_settingsView = new QQuickView();
--// m_settingsView->setViewport(new QGLWidget());
--// m_settingsView->resize(QApplication::desktop()->width(), QApplication::desktop()->height());
-- QObject::connect(m_settingsView->engine(), SIGNAL(quit()), SLOT(showEmulationView()));
--
-- m_settingsView->engine()->addImageProvider("state", new StateImageProvider(m_stateListModel));
-- QQmlContext *context = m_settingsView->rootContext();
-- context->setContextProperty("emuView", static_cast<QObject *>(this));
-- context->setContextProperty("emu", static_cast<QObject *>(m_emu));
-- context->setContextProperty("stateListModel", static_cast<QObject *>(m_stateListModel));
--}
--
- // two-stage pause preventing deadlocks
- void EmuView::pause()
- {
-@@ -204,7 +161,7 @@ void EmuView::pauseStage2()
- }
- return;
- }
-- showSettingsView();
-+ emit pauseStage2Finished();
- }
-
- void EmuView::resume()
-@@ -243,38 +200,9 @@ bool EmuView::close()
- }
- }
-
--void EmuView::showSettingsView()
--{
-- if (m_running) {
-- pause();
-- return;
-- }
-- if (m_settingsView->source().isEmpty() || !m_error.isEmpty()) {
-- QString path;
-- if (m_error.isEmpty())
-- path = "%1/qml/base/main.qml";
-- else
-- path = "%1/qml/base/error.qml";
-- path = path.arg(pathManager.installationDirPath());
-- QUrl url = QUrl::fromLocalFile(path);
-- m_settingsView->setSource(url);
-- }
-- if (m_audioEnable)
-- m_hostAudio->close();
-- m_settingsView->setVisible(true);
-- m_settingsView->show();
--// m_settingsView->resize(QApplication::desktop()->width(), QApplication::desktop()->height());
--// m_settingsView->setFocus();
--// m_hostVideo->setVisible(false);
|
|
[-]
[+]
|
Deleted |
plasma_active_paint_hack.patch
^
|
| @@ -1,51 +0,0 @@
-diff --git a/src/base/hostvideo.cpp b/src/base/hostvideo.cpp
-index f9f3e6e..d8f3db0 100644
---- a/src/base/hostvideo.cpp
-+++ b/src/base/hostvideo.cpp
-@@ -122,10 +122,12 @@ void HostVideo::paintEvent(QPaintEvent *)
- if (!m_thread->m_inFrameGenerated)
- return;
-
-+ /*
- if (m_programDirty) {
- if (!loadShaderProgram())
- return;
- }
-+ */
-
- QPainter painter;
- painter.begin(this);
-@@ -134,9 +136,22 @@ void HostVideo::paintEvent(QPaintEvent *)
- if (m_keepAspectRatio)
- painter.fillRect(rect(), Qt::black);
-
-+ const QImage &tex = m_emu->frame();
-+
-+ /*
-+ * On Plasma Active somethings wrong with paintEmuFrame.
-+ * This happens on Archos G9 and Nexus 7.
-+ * On Nemo on N950 paintEmuFrame works correctly.
-+ * Hence, for now we just use the painter for drawing the frame on PA.
-+ *
-+ * Question: Could it be that this is faster anyhow?
-+ */
-+ painter.drawImage(m_dstRect, tex, m_srcRect);
-+ /*
- painter.beginNativePainting();
- paintEmuFrame();
- painter.endNativePainting();
-+ */
-
- if (m_fpsVisible)
- paintFps(&painter);
-@@ -215,8 +230,8 @@ void HostVideo::updateRects()
- // update rects if size of source rect changes
- m_srcRect = m_emu->videoSrcRect();
- Q_ASSERT_X(m_srcRect.width() != 0.0f && m_srcRect.height() != 0.0f, "HostVideo", "Define source rect!");
-- qreal ww = Width;
-- qreal wh = Height;
-+ qreal ww = rect().width();
-+ qreal wh = rect().height();
- if (m_keepAspectRatio) {
- // calculate proportionally scaled rect
- qreal scale = qMin(ww/m_srcRect.width(), wh/m_srcRect.height());
|
|
[-]
[+]
|
Deleted |
re-enable_quit_via_touch_input.patch
^
|
| @@ -1,16 +0,0 @@
-diff --git a/src/base/hostinput.cpp b/src/base/hostinput.cpp
-index 0097f50..ab824d5 100644
---- a/src/base/hostinput.cpp
-+++ b/src/base/hostinput.cpp
-@@ -91,9 +91,8 @@ void HostInput::processTouch(QEvent *e)
- if (x < 80)
- qDebug("Pausing this way is temporarily disabled.");
- // emit pause();
-- else if (x > 800) //FIXME: 800 is a hardcoded value.
-- qDebug("Quitting this way is temporarily disabled.");
--// emit quit();
-+ else if (x > 900) //FIXME: 900 is a hardcoded value.
-+ emit quit();
- }
- }
- touchInputDevice()->processTouch(e);
|
|
[-]
[+]
|
Deleted |
re-enable_settings_view.patch
^
|
| @@ -1,219 +0,0 @@
-diff --git a/qml/base/SelectionItem.qml b/qml/base/SelectionItem.qml
-index 01cc4ec..f5bc787 100644
---- a/qml/base/SelectionItem.qml
-+++ b/qml/base/SelectionItem.qml
-@@ -14,7 +14,7 @@
- */
-
- import QtQuick 2.0
--import com.nokia.meego 1.1
-+import Sailfish.Silica 1.0
- import "constants.js" as UI
-
- Item {
-@@ -45,7 +45,7 @@ Item {
-
- height: UI.LIST_ITEM_HEIGHT
- width: parent.width
--
-+/*
- BorderImage {
- id: background
- anchors.fill: parent
-@@ -55,6 +55,7 @@ Item {
- visible: mouseArea.pressed || selectionItem.selected
- source: theme.inverted ? "image://theme/meegotouch-panel-inverted-background-pressed" : "image://theme/meegotouch-panel-background-pressed"
- }
-+*/
-
- Row {
- anchors.fill: parent
-diff --git a/qml/base/SettingsPage.qml b/qml/base/SettingsPage.qml
-index 5872f2f..f3be485 100644
---- a/qml/base/SettingsPage.qml
-+++ b/qml/base/SettingsPage.qml
-@@ -14,7 +14,7 @@
- */
-
- import QtQuick 2.0
--import com.nokia.meego 1.1
-+import Sailfish.Silica 1.0
- import EmuMaster 1.0
-
- Page {
-@@ -25,12 +25,14 @@ Page {
- property alias miscContent: miscColumn.children
- property string initiatedAction
-
-+/*
- tools: ToolBarLayout {
- ToolIcon {
- iconId: "toolbar-back"
- onClicked: emuView.showEmulationView()
- }
- }
-+*/
-
- function yesNoDialogMessage(action) {
- switch (action) {
-@@ -70,17 +72,7 @@ Page {
- }
- }
-
-- Menu {
-- id: stateMenu
--
-- MenuLayout {
-- MenuItem { text: qsTr("Load"); onClicked: settingsPage.initAction("loadState") }
-- MenuItem { text: qsTr("Overwrite"); onClicked: settingsPage.initAction("overwriteState") }
-- MenuItem { text: qsTr("Delete"); onClicked: settingsPage.initAction("deleteState") }
-- }
-- }
--
-- Flickable {
-+ SilicaFlickable {
- id: flickable
- anchors.fill: parent
- flickableDirection: Flickable.VerticalFlick
-@@ -93,7 +85,7 @@ Page {
- spacing: 20
-
- SectionSeperator { text: qsTr("STATE") }
-- ListView {
-+ SilicaListView {
- property int selectedSlot: -3
-
- id: stateListView
-@@ -126,21 +118,9 @@ Page {
- }
- }
- }
-- ButtonColumn {
-- exclusive: false
-- spacing: 5
-- anchors.horizontalCenter: parent.horizontalCenter
-- visible: appWindow.inPortrait
--
-- Button { text: qsTr("Save in New Slot"); onClicked: settingsPage.initAction("saveState") }
-- Button { text: qsTr("Restart"); onClicked: settingsPage.initAction("emuReset") }
-- Button { text: qsTr("Delete All"); onClicked: settingsPage.initAction("deleteAllStates") }
-- }
-- ButtonRow {
-- exclusive: false
-+ Column {
- spacing: 5
- anchors.horizontalCenter: parent.horizontalCenter
-- visible: !appWindow.inPortrait
-
- Button { text: qsTr("Save in New Slot"); onClicked: settingsPage.initAction("saveState") }
- Button { text: qsTr("Restart"); onClicked: settingsPage.initAction("emuReset") }
-@@ -160,7 +140,6 @@ Page {
- minimumValue: 0.0
- maximumValue: 1.0
- stepSize: 0.05
-- valueIndicatorVisible: true
- onValueChanged: emuView.padOpacity = value
- Component.onCompleted: value = emuView.padOpacity
- }
-@@ -200,7 +179,6 @@ Page {
- minimumValue: 0
- maximumValue: 5
- stepSize: 1
-- valueIndicatorVisible: true
- onValueChanged: emuView.frameSkip = value
- Component.onCompleted: value = emuView.frameSkip
- }
-@@ -227,8 +205,15 @@ Page {
- }
- }
-
-+ PullDownMenu {
-+ id: stateMenu
-+
-+ MenuItem { text: qsTr("Load"); onClicked: settingsPage.initAction("loadState") }
-+ MenuItem { text: qsTr("Overwrite"); onClicked: settingsPage.initAction("overwriteState") }
-+ MenuItem { text: qsTr("Delete"); onClicked: settingsPage.initAction("deleteState") }
-+ }
-+
- }
-- ScrollDecorator { flickableItem: flickable }
-
- Connections {
- target: emuView
-@@ -238,19 +223,24 @@ Page {
- }
- }
-
-- QueryDialog {
-+ Dialog {
- id: yesNoDialog
-- titleText: qsTr("Really?")
-- acceptButtonText: qsTr("Yes")
-- rejectButtonText: qsTr("No")
-+
-+ property alias message: yesNoDialogMessage.text
-+
- onAccepted: settingsPage.executeAction(settingsPage.initiatedAction)
-+
-+ Label {
-+ id: yesNoDialogMessage
-+ anchors.centerIn: parent
-+ }
- }
-
-- QueryDialog {
-+ Dialog {
- id: emuFaultDialog
-- titleText: qsTr("Oops")
-- rejectButtonText: qsTr("Close")
- }
-+
-+ /*
- StringListProxy {
- id: inputDeviceFunctionModel
- }
-@@ -261,4 +251,5 @@ Page {
- titleText: qsTr("Select Configuration")
- onAccepted: inputDevice.emuFunction = selectedIndex
- }
-+ */
- }
-diff --git a/qml/base/SettingsSwitchItem.qml b/qml/base/SettingsSwitchItem.qml
-index 9a2b913..da09a09 100644
---- a/qml/base/SettingsSwitchItem.qml
-+++ b/qml/base/SettingsSwitchItem.qml
-@@ -14,7 +14,6 @@
- */
-
- import QtQuick 2.0
--import com.nokia.meego 1.1
-
- EMSwitchOption {
- property string paramName
-diff --git a/src/base/emuview.cpp b/src/base/emuview.cpp
-index dc46602..736ac4c 100644
---- a/src/base/emuview.cpp
-+++ b/src/base/emuview.cpp
-@@ -151,7 +151,7 @@ void EmuView::setupSettingsView()
- m_settingsView = new QQuickView();
- // m_settingsView->setViewport(new QGLWidget());
|
|
[-]
[+]
|
Deleted |
remove-audio-debug-output.patch
^
|
| @@ -1,27 +0,0 @@
-diff --git a/src/base/emuview.cpp b/src/base/emuview.cpp
-index 9a22af5..dc46602 100644
---- a/src/base/emuview.cpp
-+++ b/src/base/emuview.cpp
-@@ -333,7 +333,6 @@ void EmuView::onFrameGenerated(bool videoOn)
- {
- m_safetyCheck = true;
- if (m_audioEnable) {
-- qDebug("Playing audio frame.");
- m_hostAudio->sendFrame();
- }
- if (videoOn)
-diff --git a/src/base/hostaudio.cpp b/src/base/hostaudio.cpp
-index e89f341..7be42cc 100644
---- a/src/base/hostaudio.cpp
-+++ b/src/base/hostaudio.cpp
-@@ -147,10 +147,8 @@ void HostAudio::close()
- /*! Streams a frame of audio from emulated system to the host. */
- void HostAudio::sendFrame()
- {
-- qDebug("sendFrame");
- if (!m_stream)
- return;
-- qDebug("stream not null, going on.");
-
- pa_threaded_mainloop_lock(m_mainloop);
- void *data;
|
|
[-]
[+]
|
Deleted |
remove-six-axis-controller.patch
^
|
| @@ -1,140 +0,0 @@
-diff --git a/src/base/base.pro b/src/base/base.pro
-index 6479a72..bc47c5d 100644
---- a/src/base/base.pro
-+++ b/src/base/base.pro
-@@ -2,7 +2,7 @@ TEMPLATE = lib
- DESTDIR = ../../lib
- INCLUDEPATH += ..
- QT += declarative opengl network
--LIBS += -L../../lib -lpulse -lsixaxisclient
-+LIBS += -L../../lib -lpulse
- CONFIG += mobility
- MOBILITY += sensors feedback
-
-@@ -34,7 +34,6 @@ HEADERS += \
- hostinputdevice.h \
- accelinputdevice.h \
- touchinputdevice.h \
-- sixaxisinputdevice.h \
- keybinputdevice.h \
- crc32.h \
- emuview.h \
-@@ -56,7 +55,6 @@ SOURCES += \
- hostinputdevice.cpp \
- accelinputdevice.cpp \
- touchinputdevice.cpp \
-- sixaxisinputdevice.cpp \
- keybinputdevice.cpp \
- crc32.cpp \
- emuview.cpp \
-diff --git a/src/base/hostinput.cpp b/src/base/hostinput.cpp
-index 05636ee..85cf5f3 100644
---- a/src/base/hostinput.cpp
-+++ b/src/base/hostinput.cpp
-@@ -20,9 +20,7 @@
- #include "touchinputdevice.h"
- #include "accelinputdevice.h"
- #include "keybinputdevice.h"
--#include "sixaxisinputdevice.h"
- #include "memutils.h"
--#include <sixaxisclient/sixaxis.h>
- #include <QKeyEvent>
- #include <QTouchEvent>
-
-@@ -38,8 +36,7 @@
-
- /*! Creates a HostInput object with the given \a emu. */
- HostInput::HostInput(Emu *emu) :
-- m_emu(emu),
-- m_numSixAxes(0)
-+ m_emu(emu)
- {
- m_padOpacity = emConf.defaultValue("padOpacity").toReal();
- // first device in the list is always touch device ...
-@@ -47,16 +44,11 @@ HostInput::HostInput(Emu *emu) :
- // ... and second is always the keyboard
- m_devices.append(new KeybInputDevice(this));
- m_devices.append(new AccelInputDevice(this));
-- // start sixaxis daemon
-- SixAxisDaemon *daemon = SixAxisDaemon::instance();
-- QObject::connect(daemon, SIGNAL(newPad()), SLOT(onSixAxisDetected()));
-- daemon->start();
- }
-
- /*! Destroys HostInput object. */
- HostInput::~HostInput()
- {
-- SixAxisDaemon::instance()->stop();
- }
-
- /*! \internal */
-@@ -121,39 +113,6 @@ void HostInput::setupTouchDevice()
- m_devices.append(touchDevice);
- }
-
--/*! \internal */
--void HostInput::onSixAxisDetected()
--{
-- SixAxisDaemon *daemon = SixAxisDaemon::instance();
-- while (daemon->hasNewPad()) {
-- // create new sixaxis
-- SixAxis *sixAxis = daemon->nextNewPad();
-- SixAxisInputDevice *sixAxisDev = new SixAxisInputDevice(sixAxis, this);
-- int index = m_numSixAxes;
-- sixAxisDev->setDeviceIndex(index);
-- QObject::connect(sixAxisDev, SIGNAL(destroyed()), SLOT(onSixAxisDestroyed()));
-- QObject::connect(sixAxisDev, SIGNAL(pause()), SIGNAL(pause()));
--
-- // set Pad A or Pad B emu function
-- if (index == 0 || index == 1)
-- sixAxisDev->setEmuFunction(index + 1);
--
-- m_devices.append(sixAxisDev);
-- m_numSixAxes++;
-- }
-- emit devicesChanged();
--}
--
--/*! \internal */
--void HostInput::onSixAxisDestroyed()
--{
-- SixAxisInputDevice *sixAxisInputDevice = static_cast<SixAxisInputDevice *>(sender());
-- if (m_devices.removeOne(sixAxisInputDevice)) {
-- m_numSixAxes--;
-- emit devicesChanged();
-- }
--}
--
- /*! Returns touch input device. */
- TouchInputDevice *HostInput::touchInputDevice() const
- {
-diff --git a/src/base/hostinput.h b/src/base/hostinput.h
-index 8d81547..3d37b4c 100644
---- a/src/base/hostinput.h
-+++ b/src/base/hostinput.h
-@@ -51,8 +51,6 @@ signals:
- protected:
- bool eventFilter(QObject *o, QEvent *e);
- private slots:
-- void onSixAxisDetected();
-- void onSixAxisDestroyed();
- private:
- void processTouch(QEvent *e);
- void setupTouchDevice();
-diff --git a/src/emumaster.pro b/src/emumaster.pro
-index 8f02f65..763846a 100644
---- a/src/emumaster.pro
-+++ b/src/emumaster.pro
-@@ -1,11 +1,9 @@
- TEMPLATE = subdirs
-
- SUBDIRS += \
-- sixaxisclient \
- base \
- nes gba snes psx amiga pico \
-- diskgallery \
-- sixaxismonitor
-+ diskgallery
-
- # nes gba snes psx amiga pico \
-
|
|
[-]
[+]
|
Deleted |
remove_neon_specific_optimizations.patch
^
|
| @@ -1,73 +0,0 @@
-diff --git a/src/base/base.pro b/src/base/base.pro
-index 78e4a25..d84e42e 100644
---- a/src/base/base.pro
-+++ b/src/base/base.pro
-@@ -6,9 +6,6 @@ LIBS += -L../../lib -lpulse -lQtFeedback
- CONFIG += mobility
- MOBILITY += sensors feedback
-
--QMAKE_CFLAGS_RELEASE += -mfpu=neon
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -mfpu=neon
--
- unix {
- MEEGO_VERSION_MAJOR = 1
- MEEGO_VERSION_MINOR = 2
-@@ -65,8 +62,7 @@ SOURCES += \
- emu.cpp \
- emuinput.cpp \
- stringlistproxy.cpp \
-- memutils.cpp \
-- memset32_neon.S
-+ memutils.cpp
-
- unix {
- qml.path = /opt/emumaster/qml/base
-diff --git a/src/emu.pri b/src/emu.pri
-index 8f57a78..87227b7 100644
---- a/src/emu.pri
-+++ b/src/emu.pri
-@@ -3,9 +3,6 @@ LIBS += -L../../lib -lbase
- INCLUDEPATH += ..
- QT += opengl declarative
-
--QMAKE_CFLAGS_RELEASE += -mfpu=neon
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -mfpu=neon
--
- #contains(CONFIG,release) {
- # QMAKE_CFLAGS_RELEASE -= -O2
- # QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO -= -O2
-diff --git a/src/emumaster.pro b/src/emumaster.pro
-index 763846a..1357d77 100644
---- a/src/emumaster.pro
-+++ b/src/emumaster.pro
-@@ -2,7 +2,7 @@ TEMPLATE = subdirs
-
- SUBDIRS += \
- base \
-- nes gba snes psx amiga pico \
-+ nes gba snes amiga pico \
- diskgallery
-
- # nes gba snes psx amiga pico \
-diff --git a/src/nes/nes.pro b/src/nes/nes.pro
-index d1bfcaf..9e9b82c 100644
---- a/src/nes/nes.pro
-+++ b/src/nes/nes.pro
-@@ -10,9 +10,6 @@ contains(DEFINES,ENABLE_DEBUGGING) {
- QT += network
- }
-
--QMAKE_CFLAGS_RELEASE += -mfpu=neon
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -mfpu=neon
--
- HEADERS += \
- apu.h \
- apuchannel.h \
-@@ -132,7 +129,6 @@ HEADERS += \
-
- SOURCES += \
- ppu.cpp \
-- ppu_neon.S \
- mapper.cpp \
- disk.cpp \
- apu.cpp \
|
|
[-]
[+]
|
Deleted |
remove_obsolete_check_in_diskgallery.patch
^
|
| @@ -1,20 +0,0 @@
-diff --git a/src/diskgallery/main.cpp b/src/diskgallery/main.cpp
-index d4a686f..8cf539f 100644
---- a/src/diskgallery/main.cpp
-+++ b/src/diskgallery/main.cpp
-@@ -28,15 +28,6 @@ int main(int argc, char *argv[])
- QApplication app(argc, argv);
-
- QSystemInfo sysInfo;
-- if (sysInfo.version(QSystemInfo::Os) < QString("1.2")) {
-- QDeclarativeView view;
-- QObject::connect(view.engine(), SIGNAL(quit()), &view, SLOT(close()));
-- QString qmlPath = QString("%1/qml/gallery/osVersionError.qml")
-- .arg(pathManager.installationDirPath());
-- view.setSource(QUrl::fromLocalFile(qmlPath));
-- view.showFullScreen();
-- return app.exec();
-- }
-
- Configuration::setupAppInfo();
- pathManager.buildLocalDirTree();
|
|
[-]
[+]
|
Deleted |
simple_qt5_changes.patch
^
|
| @@ -1,1917 +0,0 @@
-diff --git a/qml/base/AmigaSettingsPage.qml b/qml/base/AmigaSettingsPage.qml
-index b007bfc..2f1f95b 100644
---- a/qml/base/AmigaSettingsPage.qml
-+++ b/qml/base/AmigaSettingsPage.qml
-@@ -13,7 +13,7 @@
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
--import QtQuick 1.1
-+import QtQuick 2.0
- import com.nokia.meego 1.1
-
- SettingsPage {
-diff --git a/qml/base/ColorDialog.qml b/qml/base/ColorDialog.qml
-index 6431848..3e7e67b 100644
---- a/qml/base/ColorDialog.qml
-+++ b/qml/base/ColorDialog.qml
-@@ -13,7 +13,7 @@
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
--import QtQuick 1.1
-+import QtQuick 2.0
- import com.nokia.meego 1.1
-
- Dialog {
-diff --git a/qml/base/EMSwitchOption.qml b/qml/base/EMSwitchOption.qml
-index 9777761..4e89c3a 100644
---- a/qml/base/EMSwitchOption.qml
-+++ b/qml/base/EMSwitchOption.qml
-@@ -13,8 +13,8 @@
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
--import QtQuick 1.1
--import com.nokia.meego 1.1
-+import QtQuick 2.0
-+import Sailfish.Silica 1.0
-
- Item {
- id: switchItem
-@@ -30,7 +30,6 @@ Item {
- Switch {
- id: enableSwitch
- anchors.right: parent.right
-- platformStyle: SwitchStyle { inverted: true }
- }
- Component.onCompleted: switchItem.height = Math.max(switchLabel.height, enableSwitch.height)
- }
-diff --git a/qml/base/GbaCheats.qml b/qml/base/GbaCheats.qml
-index 80b63c1..d42c758 100644
---- a/qml/base/GbaCheats.qml
-+++ b/qml/base/GbaCheats.qml
-@@ -13,7 +13,7 @@
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
--import QtQuick 1.1
-+import QtQuick 2.0
- import com.nokia.meego 1.1
- import EmuMaster 1.0
-
-diff --git a/qml/base/GbaSettingsPage.qml b/qml/base/GbaSettingsPage.qml
-index f5c06e9..4c72243 100644
---- a/qml/base/GbaSettingsPage.qml
-+++ b/qml/base/GbaSettingsPage.qml
-@@ -13,7 +13,7 @@
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
--import QtQuick 1.1
-+import QtQuick 2.0
- import com.nokia.meego 1.1
-
- SettingsPage {
-diff --git a/qml/base/ImageListViewDelegate.qml b/qml/base/ImageListViewDelegate.qml
-index 3e2d45c..435e271 100644
---- a/qml/base/ImageListViewDelegate.qml
-+++ b/qml/base/ImageListViewDelegate.qml
-@@ -13,8 +13,8 @@
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
--import QtQuick 1.1
--import com.nokia.meego 1.1
-+import QtQuick 2.0
-+import Sailfish.Silica 1.0
-
- Item {
- id: imageListViewDelegate
-diff --git a/qml/base/MySectionScroller.qml b/qml/base/MySectionScroller.qml
-index ea8a140..22204ba 100644
---- a/qml/base/MySectionScroller.qml
-+++ b/qml/base/MySectionScroller.qml
-@@ -38,7 +38,7 @@
- **
- ****************************************************************************/
-
--import QtQuick 1.1
-+import QtQuick 2.0
- import com.nokia.meego 1.1
- import "MySectionScroller.js" as Sections
-
-diff --git a/qml/base/NesCheats.qml b/qml/base/NesCheats.qml
-index 94fd7ee..17ccf26 100644
---- a/qml/base/NesCheats.qml
-+++ b/qml/base/NesCheats.qml
-@@ -13,7 +13,7 @@
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
--import QtQuick 1.1
-+import QtQuick 2.0
- import com.nokia.meego 1.1
- import EmuMaster 1.0
-
-diff --git a/qml/base/NesSettingsPage.qml b/qml/base/NesSettingsPage.qml
-index 3ac767a..ea842b6 100644
---- a/qml/base/NesSettingsPage.qml
-+++ b/qml/base/NesSettingsPage.qml
-@@ -13,7 +13,7 @@
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
--import QtQuick 1.1
-+import QtQuick 2.0
- import com.nokia.meego 1.1
-
- SettingsPage {
-diff --git a/qml/base/PicoSettingsPage.qml b/qml/base/PicoSettingsPage.qml
-index b007bfc..2f1f95b 100644
---- a/qml/base/PicoSettingsPage.qml
-+++ b/qml/base/PicoSettingsPage.qml
-@@ -13,7 +13,7 @@
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
--import QtQuick 1.1
-+import QtQuick 2.0
- import com.nokia.meego 1.1
-
- SettingsPage {
-diff --git a/qml/base/PsxSettingsPage.qml b/qml/base/PsxSettingsPage.qml
-index b007bfc..2f1f95b 100644
---- a/qml/base/PsxSettingsPage.qml
-+++ b/qml/base/PsxSettingsPage.qml
-@@ -13,7 +13,7 @@
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
--import QtQuick 1.1
-+import QtQuick 2.0
- import com.nokia.meego 1.1
-
- SettingsPage {
-diff --git a/qml/base/SectionScrollerLabel.qml b/qml/base/SectionScrollerLabel.qml
-index ea8e0ee..81237f0 100644
---- a/qml/base/SectionScrollerLabel.qml
-+++ b/qml/base/SectionScrollerLabel.qml
-@@ -38,7 +38,7 @@
- **
- ****************************************************************************/
-
--import QtQuick 1.1
-+import QtQuick 2.0
- import com.nokia.meego 1.1
-
- Item {
-diff --git a/qml/base/SectionSeperator.qml b/qml/base/SectionSeperator.qml
-index 8697a83..ffd7db7 100644
---- a/qml/base/SectionSeperator.qml
-+++ b/qml/base/SectionSeperator.qml
-@@ -13,8 +13,7 @@
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
--import QtQuick 1.1
--import com.nokia.meego 1.1
-+import QtQuick 2.0
-
- Item {
- id: sectionDelegate
-diff --git a/qml/base/SelectionItem.qml b/qml/base/SelectionItem.qml
-index 803099a..01cc4ec 100644
---- a/qml/base/SelectionItem.qml
-+++ b/qml/base/SelectionItem.qml
-@@ -13,7 +13,7 @@
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
--import QtQuick 1.1
-+import QtQuick 2.0
- import com.nokia.meego 1.1
- import "constants.js" as UI
-
-diff --git a/qml/base/SettingsPage.qml b/qml/base/SettingsPage.qml
-index e430d58..5872f2f 100644
---- a/qml/base/SettingsPage.qml
-+++ b/qml/base/SettingsPage.qml
|
|
[-]
[+]
|
Changed |
emumaster.yaml
^
|
| @@ -1,34 +1,12 @@
Name: emumaster
Summary: An emulator for different gaming consoles etc.
-Version: 0.3.0
+Version: 0.3.1
Release: 1
Group: Amusements/Games
License: GPLv2
URL: https://bitbucket.org/elemental/emumaster/wiki/Home
Sources:
- "%{name}_%{version}.tar.gz"
-Patches:
- - remove-six-axis-controller.patch
- - remove_obsolete_check_in_diskgallery.patch
- - fix_compile_and_linking.patch
- - fix_linux-gpp-maemo_scope.patch
- - fix_home_dir_path.patch
- - remove_neon_specific_optimizations.patch
- - dynamically_determine_screensize_for_touchinput.patch
- - dynamically_determine_screensize_for_emuview.patch
- - 0001-Remove-obsolete-members-from-HostVideo.patch
- - 0003-Force-graphicssystem-to-opengl-on-desktop-file.patch
- - 0002-Add-prototype-of-new-way-for-drawing-frames.patch
- - 0004-Add-missing-glpainter.patch
- - fix-settingsview-not-displayed.patch
- - fix-diskgallery-rendering.patch
- - simple_qt5_changes.patch
- - gl_painting_qt5_changes.patch
- - remove-audio-debug-output.patch
- - fix-memory-leak.patch
- - re-enable_quit_via_touch_input.patch
- - re-enable_settings_view.patch
- - move-ui-implementation-to-qml.patch
Description:
EmuMaster emulates popular consoles.
It is written in Qt/QML.
|
|
|
Added |
emumaster_0.3.1.tar.gz/data/quit_button.png
^
|
|
|
Added |
emumaster_0.3.1.tar.gz/data/settings_button.png
^
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/qml/base/AmigaSettingsPage.qml
^
|
| @@ -13,7 +13,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-import QtQuick 1.1
+import QtQuick 2.0
import com.nokia.meego 1.1
SettingsPage {
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/qml/base/ColorDialog.qml
^
|
| @@ -13,7 +13,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-import QtQuick 1.1
+import QtQuick 2.0
import com.nokia.meego 1.1
Dialog {
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/qml/base/EMSwitchOption.qml
^
|
| @@ -13,8 +13,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-import QtQuick 1.1
-import com.nokia.meego 1.1
+import QtQuick 2.0
+import Sailfish.Silica 1.0
Item {
id: switchItem
@@ -30,7 +30,6 @@
Switch {
id: enableSwitch
anchors.right: parent.right
- platformStyle: SwitchStyle { inverted: true }
}
Component.onCompleted: switchItem.height = Math.max(switchLabel.height, enableSwitch.height)
}
|
|
[-]
[+]
|
Added |
emumaster_0.3.1.tar.gz/qml/base/EmuView.qml
^
|
| @@ -0,0 +1,40 @@
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+import EmuMaster 1.0
+
+ApplicationWindow
+{
+ initialPage: Page {
+ allowedOrientations: Orientation.Landscape
+
+ Rectangle {
+ anchors.fill: parent
+ color: "green"
+
+ FrameItem {
+ id: frameItem
+
+ anchors.fill: parent
+
+ IconButton {
+ icon.source: "../../data/settings_button.png"
+ x: 0
+ y: 0
+ onClicked: {
+ emuView.pause()
+ pageStack.push(settingsPage)
+ }
+ }
+ }
+ }
+ }
+
+ Component.onCompleted: {
+ frameItem.setEmuView(emuView)
+ }
+
+ SettingsPage {
+ id: settingsPage
+ }
+}
+
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/qml/base/GbaCheats.qml
^
|
| @@ -13,7 +13,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-import QtQuick 1.1
+import QtQuick 2.0
import com.nokia.meego 1.1
import EmuMaster 1.0
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/qml/base/GbaSettingsPage.qml
^
|
| @@ -13,7 +13,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-import QtQuick 1.1
+import QtQuick 2.0
import com.nokia.meego 1.1
SettingsPage {
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/qml/base/ImageListViewDelegate.qml
^
|
| @@ -13,8 +13,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-import QtQuick 1.1
-import com.nokia.meego 1.1
+import QtQuick 2.0
+import Sailfish.Silica 1.0
Item {
id: imageListViewDelegate
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/qml/base/MySectionScroller.qml
^
|
| @@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 1.1
+import QtQuick 2.0
import com.nokia.meego 1.1
import "MySectionScroller.js" as Sections
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/qml/base/NesCheats.qml
^
|
| @@ -13,7 +13,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-import QtQuick 1.1
+import QtQuick 2.0
import com.nokia.meego 1.1
import EmuMaster 1.0
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/qml/base/NesSettingsPage.qml
^
|
| @@ -13,7 +13,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-import QtQuick 1.1
+import QtQuick 2.0
import com.nokia.meego 1.1
SettingsPage {
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/qml/base/PicoSettingsPage.qml
^
|
| @@ -13,7 +13,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-import QtQuick 1.1
+import QtQuick 2.0
import com.nokia.meego 1.1
SettingsPage {
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/qml/base/PsxSettingsPage.qml
^
|
| @@ -13,7 +13,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-import QtQuick 1.1
+import QtQuick 2.0
import com.nokia.meego 1.1
SettingsPage {
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/qml/base/SectionScrollerLabel.qml
^
|
| @@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 1.1
+import QtQuick 2.0
import com.nokia.meego 1.1
Item {
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/qml/base/SectionSeperator.qml
^
|
| @@ -13,8 +13,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-import QtQuick 1.1
-import com.nokia.meego 1.1
+import QtQuick 2.0
Item {
id: sectionDelegate
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/qml/base/SelectionItem.qml
^
|
| @@ -13,8 +13,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-import QtQuick 1.1
-import com.nokia.meego 1.1
+import QtQuick 2.0
+import Sailfish.Silica 1.0
import "constants.js" as UI
Item {
@@ -45,7 +45,7 @@
height: UI.LIST_ITEM_HEIGHT
width: parent.width
-
+/*
BorderImage {
id: background
anchors.fill: parent
@@ -55,6 +55,7 @@
visible: mouseArea.pressed || selectionItem.selected
source: theme.inverted ? "image://theme/meegotouch-panel-inverted-background-pressed" : "image://theme/meegotouch-panel-background-pressed"
}
+*/
Row {
anchors.fill: parent
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/qml/base/SettingsPage.qml
^
|
| @@ -13,24 +13,34 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-import QtQuick 1.1
-import com.nokia.meego 1.1
+import QtQuick 2.0
+import Sailfish.Silica 1.0
import EmuMaster 1.0
Page {
id: settingsPage
+
property alias columnContent: column.children
property alias inputContent: inputColumn.children
property alias videoContent: videoColumn.children
property alias miscContent: miscColumn.children
property string initiatedAction
+ allowedOrientations: Orientation.Landscape
+
+ onStatusChanged: {
+ if (status === PageStatus.Inactive) {
+ emuView.resume()
+ }
+ }
+/*
tools: ToolBarLayout {
ToolIcon {
iconId: "toolbar-back"
onClicked: emuView.showEmulationView()
}
}
+*/
function yesNoDialogMessage(action) {
switch (action) {
@@ -70,17 +80,7 @@
}
}
- Menu {
- id: stateMenu
-
- MenuLayout {
- MenuItem { text: qsTr("Load"); onClicked: settingsPage.initAction("loadState") }
- MenuItem { text: qsTr("Overwrite"); onClicked: settingsPage.initAction("overwriteState") }
- MenuItem { text: qsTr("Delete"); onClicked: settingsPage.initAction("deleteState") }
- }
- }
-
- Flickable {
+ SilicaFlickable {
id: flickable
anchors.fill: parent
flickableDirection: Flickable.VerticalFlick
@@ -93,7 +93,7 @@
spacing: 20
SectionSeperator { text: qsTr("STATE") }
- ListView {
+ SilicaListView {
property int selectedSlot: -3
id: stateListView
@@ -126,21 +126,9 @@
}
}
}
- ButtonColumn {
- exclusive: false
- spacing: 5
- anchors.horizontalCenter: parent.horizontalCenter
- visible: appWindow.inPortrait
-
- Button { text: qsTr("Save in New Slot"); onClicked: settingsPage.initAction("saveState") }
- Button { text: qsTr("Restart"); onClicked: settingsPage.initAction("emuReset") }
- Button { text: qsTr("Delete All"); onClicked: settingsPage.initAction("deleteAllStates") }
- }
- ButtonRow {
- exclusive: false
+ Column {
spacing: 5
anchors.horizontalCenter: parent.horizontalCenter
- visible: !appWindow.inPortrait
Button { text: qsTr("Save in New Slot"); onClicked: settingsPage.initAction("saveState") }
Button { text: qsTr("Restart"); onClicked: settingsPage.initAction("emuReset") }
@@ -160,7 +148,6 @@
minimumValue: 0.0
maximumValue: 1.0
stepSize: 0.05
- valueIndicatorVisible: true
onValueChanged: emuView.padOpacity = value
Component.onCompleted: value = emuView.padOpacity
}
@@ -200,17 +187,11 @@
minimumValue: 0
maximumValue: 5
stepSize: 1
- valueIndicatorVisible: true
onValueChanged: emuView.frameSkip = value
Component.onCompleted: value = emuView.frameSkip
}
SettingsSwitchItem { text: qsTr("Show FPS"); paramName: "fpsVisible" }
SettingsSwitchItem { text: qsTr("Keep Aspect Ratio"); paramName: "keepAspectRatio" }
- SelectionItem {
- titleText: qsTr("Video Filter")
- subtitleText: emuView.videoFilter
- onClicked: videoFilterSelector.open()
- }
}
Column {
@@ -232,8 +213,15 @@
}
}
+ PullDownMenu {
+ id: stateMenu
+
+ MenuItem { text: qsTr("Load"); onClicked: settingsPage.initAction("loadState") }
+ MenuItem { text: qsTr("Overwrite"); onClicked: settingsPage.initAction("overwriteState") }
+ MenuItem { text: qsTr("Delete"); onClicked: settingsPage.initAction("deleteState") }
+ }
+
}
- ScrollDecorator { flickableItem: flickable }
Connections {
target: emuView
@@ -243,19 +231,24 @@
}
}
- QueryDialog {
+ Dialog {
id: yesNoDialog
- titleText: qsTr("Really?")
- acceptButtonText: qsTr("Yes")
- rejectButtonText: qsTr("No")
+
+ property alias message: yesNoDialogMessage.text
+
onAccepted: settingsPage.executeAction(settingsPage.initiatedAction)
+
+ Label {
+ id: yesNoDialogMessage
+ anchors.centerIn: parent
+ }
}
- QueryDialog {
+ Dialog {
id: emuFaultDialog
- titleText: qsTr("Oops")
- rejectButtonText: qsTr("Close")
}
+
+ /*
StringListProxy {
id: inputDeviceFunctionModel
}
@@ -266,15 +259,5 @@
titleText: qsTr("Select Configuration")
onAccepted: inputDevice.emuFunction = selectedIndex
}
-
- StringListProxy {
- id: videoFilterModel
- stringListModel: emuView.availableVideoFilters
- }
- SelectionDialog {
- id: videoFilterSelector
- model: videoFilterModel
- titleText: qsTr("Select Video Filter")
- onAccepted: emuView.videoFilter = videoFilterModel.get(selectedIndex)
- }
+ */
}
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/qml/base/SettingsSwitchItem.qml
^
|
| @@ -13,8 +13,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-import QtQuick 1.1
-import com.nokia.meego 1.1
+import QtQuick 2.0
EMSwitchOption {
property string paramName
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/qml/base/SnesSettingsPage.qml
^
|
| @@ -13,7 +13,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-import QtQuick 1.1
+import QtQuick 2.0
import com.nokia.meego 1.1
SettingsPage {
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/qml/base/error.qml
^
|
| @@ -13,7 +13,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-import QtQuick 1.1
+import QtQuick 2.0
import com.nokia.meego 1.1
PageStackWindow {
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/qml/base/main.qml
^
|
| @@ -13,24 +13,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-import QtQuick 1.1
-import com.nokia.meego 1.1
+import QtQuick 2.0
+import Sailfish.Silica 1.0
-PageStackWindow {
+ApplicationWindow {
id: appWindow
- showStatusBar: false
- platformStyle: PageStackWindowStyle {
- id: customStyle
- background: "image://theme/meegotouch-video-background"
- backgroundFillMode: Image.Stretch
- cornersVisible: false
+ initialPage: SettingsPage {
}
- Component.onCompleted: {
- theme.inverted = true
- var qmlPage = emu.name.charAt(0).toUpperCase() +
- emu.name.substr(1) + "SettingsPage.qml"
- appWindow.pageStack.push(Qt.resolvedUrl(qmlPage))
- }
}
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/qml/gallery/AboutPage.qml
^
|
| @@ -14,20 +14,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-import QtQuick 1.1
-import com.nokia.meego 1.1
+import QtQuick 2.0
+import Sailfish.Silica 1.0
Page {
id: aboutPage
- tools: ToolBarLayout {
- ToolIcon {
- iconId: "toolbar-back"
- onClicked: appWindow.pageStack.pop()
- }
- }
-
- Flickable {
+ SilicaFlickable {
anchors.fill: parent
contentHeight: column.height
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/qml/gallery/AccelCalibrationPage.qml
^
|
| @@ -14,7 +14,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-import QtQuick 1.1
+import QtQuick 2.0
import com.nokia.meego 1.1
import QtMobility.sensors 1.2
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/qml/gallery/AdvancedLaunchPage.qml
^
|
| @@ -14,8 +14,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-import QtQuick 1.1
-import com.nokia.meego 1.1
+import QtQuick 2.0
+import Sailfish.Silica 1.0
import "../base"
Page {
@@ -25,12 +25,6 @@
default property alias columnContent: column.children
id: advancedRunPage
- tools: ToolBarLayout {
- ToolIcon {
- iconId: "toolbar-back"
- onClicked: appWindow.pageStack.pop()
- }
- }
Connections {
target: diskGallery
@@ -42,8 +36,7 @@
}
}
- children: [
- Flickable {
+ SilicaFlickable {
id: flickable
anchors.fill: parent
flickableDirection: Flickable.VerticalFlick
@@ -70,7 +63,6 @@
text: qsTr("Auto Save/Load")
}
}
- },
- ScrollDecorator { flickableItem: flickable }
- ]
+ }
}
+
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/qml/gallery/AmigaAdvancedLaunchPage.qml
^
|
| @@ -14,7 +14,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-import QtQuick 1.1
+import QtQuick 2.0
import com.nokia.meego 1.1
import "../base"
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/qml/gallery/CollectionTypeButton.qml
^
|
| @@ -14,7 +14,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-import QtQuick 1.1
+import QtQuick 2.0
Item {
id: button
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/qml/gallery/CoverSelectorPage.qml
^
|
| @@ -14,7 +14,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-import QtQuick 1.1
+import QtQuick 2.0
import com.nokia.meego 1.1
import Qt.labs.folderlistmodel 1.0
import "../base"
@@ -43,7 +43,7 @@
FolderListModel {
id: folderModel
- folder: "file:/home/user/MyDocs/emumaster/covers"
+ folder: "file:/home/nemo/emumaster/covers"
nameFilters: ["*.jpg"]
showDirs: false
}
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/qml/gallery/GalleryPage.qml
^
|
| @@ -14,8 +14,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-import QtQuick 1.1
-import com.nokia.meego 1.1
+import QtQuick 2.0
+import Sailfish.Silica 1.0
import "../base"
Page {
@@ -29,7 +29,7 @@
}
}
- GalleryMenu { id: galleryMenu }
+// GalleryMenu { id: galleryMenu }
ListModel { id: nullModel }
@@ -41,17 +41,17 @@
}
function diskClickHandle(index) {
- if (searchBar.visible)
- searchBar.visible = false
- else
+// if (searchBar.visible)
+// searchBar.visible = false
+// else
diskGallery.launch(index)
}
- ListView {
+ SilicaListView {
id: diskViewPortrait
anchors.fill: parent
spacing: 10
- visible: appWindow.inPortrait
+ visible: false
delegate: ImageListViewDelegate {
width: 480
@@ -80,16 +80,11 @@
return { sectionData: sectionData, _sections: _sections }
}
}
- MySectionScroller { listView: diskViewPortrait }
- ScrollDecorator {
- flickableItem: diskViewPortrait
- __minIndicatorSize: 80
- }
- GridView {
+ SilicaGridView {
id: diskViewLandscape
anchors.fill: parent
- visible: !appWindow.inPortrait
+ visible: true
cellWidth: 284
cellHeight: 240
@@ -102,11 +97,8 @@
onPressAndHold: galleryMenu.prepareAndOpen(index)
}
}
- ScrollDecorator {
- flickableItem: diskViewLandscape
- __minIndicatorSize: 80
- }
+/*
ToolBar {
id: searchBar
anchors.top: parent.top
@@ -167,7 +159,6 @@
}
}
}
-
QueryDialog {
id: removeDiskDialog
acceptButtonText: qsTr("Yes")
@@ -191,6 +182,7 @@
titleText: qsTr("Tip")
message: qsTr("Press and hold a disk to show the menu")
}
+*/
function homeScreenIcon(diskIndexArg) {
if (diskListModel.getScreenShotUpdate(diskIndexArg) < 0) {
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/qml/gallery/GbaAdvancedLaunchPage.qml
^
|
| @@ -14,7 +14,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-import QtQuick 1.1
+import QtQuick 2.0
import com.nokia.meego 1.1
import "../base"
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/qml/gallery/GlobalSettings.qml
^
|
| @@ -14,19 +14,21 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-import QtQuick 1.1
-import com.nokia.meego 1.1
+import QtQuick 2.0
+import Sailfish.Silica 1.0
import "../base"
Page {
+/*
tools: ToolBarLayout {
ToolIcon {
iconId: "toolbar-back"
onClicked: appWindow.pageStack.pop()
}
}
+*/
- Flickable {
+ SilicaFlickable {
id: flickable
anchors.fill: parent
flickableDirection: Flickable.VerticalFlick
@@ -70,7 +72,6 @@
minimumValue: 0
maximumValue: 5
stepSize: 1
- valueIndicatorVisible: true
onValueChanged: diskGallery.setGlobalOption("frameSkip", value)
Component.onCompleted: value = diskGallery.globalOption("frameSkip")
}
@@ -98,6 +99,7 @@
}
}
+/*
ScrollDecorator { flickableItem: flickable }
QueryDialog {
@@ -109,4 +111,5 @@
onRejected: runInBackgroundSwitch.checked = false
onAccepted: diskGallery.setGlobalOption("runInBackground", true)
}
+*/
}
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/qml/gallery/GlobalSettingsSwitchItem.qml
^
|
| @@ -1,5 +1,4 @@
-import QtQuick 1.1
-import com.nokia.meego 1.1
+import QtQuick 2.0
import "../base"
EMSwitchOption {
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/qml/gallery/HomeScreenIconSheet.qml
^
|
| @@ -14,7 +14,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-import QtQuick 1.1
+import QtQuick 2.0
import com.nokia.meego 1.1
Page {
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/qml/gallery/KeybMappingItem.qml
^
|
| @@ -14,7 +14,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-import QtQuick 1.1
+import QtQuick 2.0
import com.nokia.meego 1.1
Item {
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/qml/gallery/KeybMappingPage.qml
^
|
| @@ -14,7 +14,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-import QtQuick 1.1
+import QtQuick 2.0
import com.nokia.meego 1.1
Page {
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/qml/gallery/MassStorageWarning.qml
^
|
| @@ -14,7 +14,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-import QtQuick 1.1
+import QtQuick 2.0
import com.nokia.meego 1.1
Label {
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/qml/gallery/NesAdvancedLaunchPage.qml
^
|
| @@ -14,7 +14,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-import QtQuick 1.1
+import QtQuick 2.0
import com.nokia.meego 1.1
import "../base"
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/qml/gallery/PicoAdvancedLaunchPage.qml
^
|
| @@ -14,7 +14,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-import QtQuick 1.1
+import QtQuick 2.0
import com.nokia.meego 1.1
import "../base"
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/qml/gallery/PsxAdvancedLaunchPage.qml
^
|
| @@ -14,7 +14,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-import QtQuick 1.1
+import QtQuick 2.0
import com.nokia.meego 1.1
import "../base"
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/qml/gallery/SnesAdvancedLaunchPage.qml
^
|
| @@ -14,7 +14,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-import QtQuick 1.1
+import QtQuick 2.0
import com.nokia.meego 1.1
import "../base"
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/qml/gallery/TouchSettingsPage.qml
^
|
| @@ -14,7 +14,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-import QtQuick 1.1
+import QtQuick 2.0
import com.nokia.meego 1.1
import "../base"
import EmuMaster 1.0
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/qml/gallery/main.qml
^
|
| @@ -14,20 +14,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-import QtQuick 1.1
-import com.nokia.meego 1.1
+import QtQuick 2.0
+import Sailfish.Silica 1.0
-PageStackWindow {
+ApplicationWindow {
id: appWindow
initialPage: mainPage
- showStatusBar: false
- platformStyle: PageStackWindowStyle {
- id: customStyle;
- background: "image://theme/meegotouch-video-background"
- backgroundFillMode: Image.Stretch
- cornersVisible: false
- }
CollectionMenuPage { id: mainPage }
GalleryPage { id: galleryPage }
@@ -59,6 +52,7 @@
errorDialog.open()
}
+/*
QueryDialog {
property bool quitOnReject: false
@@ -72,6 +66,7 @@
Qt.quit()
}
}
+*/
Component.onCompleted: {
theme.inverted = true
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/qml/gallery/osVersionError.qml
^
|
| @@ -14,7 +14,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-import QtQuick 1.1
+import QtQuick 2.0
import com.nokia.meego 1.0
PageStackWindow {
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/qml/sixaxismonitor/MainPage.qml
^
|
| @@ -14,7 +14,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-import QtQuick 1.1
+import QtQuick 2.0
import com.nokia.meego 1.1
import "../base"
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/qml/sixaxismonitor/main.qml
^
|
| @@ -14,7 +14,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-import QtQuick 1.1
+import QtQuick 2.0
import com.nokia.meego 1.1
PageStackWindow {
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/arm/assem_instr.h
^
|
| @@ -75,7 +75,7 @@
{
Q_ASSERT(IsLdrRegisterImmediate(instr));
bool positive = (instr & B23) == B23;
- int offset = instr & kOff12Mask; // Zero extended offset.
+ int offset = instr & kOff12Mask; // ZeroFlag extended offset.
return positive ? offset : -offset;
}
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/arm/assembler.h
^
|
| @@ -458,31 +458,31 @@
const Condition cond = al);
void vcvt_f64_s32(const DwVfpRegister dst,
const SwVfpRegister src,
- VFPConversionMode mode = kDefaultRoundToZero,
+ VFPConversionMode mode = kDefaultRoundToZeroFlag,
const Condition cond = al);
void vcvt_f32_s32(const SwVfpRegister dst,
const SwVfpRegister src,
- VFPConversionMode mode = kDefaultRoundToZero,
+ VFPConversionMode mode = kDefaultRoundToZeroFlag,
const Condition cond = al);
void vcvt_f64_u32(const DwVfpRegister dst,
const SwVfpRegister src,
- VFPConversionMode mode = kDefaultRoundToZero,
+ VFPConversionMode mode = kDefaultRoundToZeroFlag,
const Condition cond = al);
void vcvt_s32_f64(const SwVfpRegister dst,
const DwVfpRegister src,
- VFPConversionMode mode = kDefaultRoundToZero,
+ VFPConversionMode mode = kDefaultRoundToZeroFlag,
const Condition cond = al);
void vcvt_u32_f64(const SwVfpRegister dst,
const DwVfpRegister src,
- VFPConversionMode mode = kDefaultRoundToZero,
+ VFPConversionMode mode = kDefaultRoundToZeroFlag,
const Condition cond = al);
void vcvt_f64_f32(const DwVfpRegister dst,
const SwVfpRegister src,
- VFPConversionMode mode = kDefaultRoundToZero,
+ VFPConversionMode mode = kDefaultRoundToZeroFlag,
const Condition cond = al);
void vcvt_f32_f64(const SwVfpRegister dst,
const DwVfpRegister src,
- VFPConversionMode mode = kDefaultRoundToZero,
+ VFPConversionMode mode = kDefaultRoundToZeroFlag,
const Condition cond = al);
void vneg(const DwVfpRegister dst,
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/arm/constants.h
^
|
| @@ -403,7 +403,7 @@
// VFP FPSCR constants.
enum VFPConversionMode {
kFPSCRRounding = 0,
- kDefaultRoundToZero = 1
+ kDefaultRoundToZeroFlag = 1
};
// This mask does not include the "inexact" or "input denormal" cumulative
@@ -413,7 +413,7 @@
static const u32 kVFPOverflowExceptionBit = 1 << 2;
static const u32 kVFPUnderflowExceptionBit = 1 << 3;
static const u32 kVFPInexactExceptionBit = 1 << 4;
-static const u32 kVFPFlushToZeroMask = 1 << 24;
+static const u32 kVFPFlushToZeroFlagMask = 1 << 24;
static const u32 kVFPNConditionFlagBit = 1 << 31;
static const u32 kVFPZConditionFlagBit = 1 << 30;
@@ -432,7 +432,7 @@
kRoundToNearest = RN,
kRoundToPlusInf = RP,
kRoundToMinusInf = RM,
- kRoundToZero = RZ
+ kRoundToZeroFlag = RZ
};
static const u32 kVFPRoundingModeMask = 3 << 22;
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/arm/macroassembler.cpp
^
|
| @@ -53,6 +53,7 @@
Register rb,
Register rc)
{
+/*
Q_ASSERT(ra.code() < 13 && rb.code() < 13 && rc.code() < 13);
int preserved = 0x1fff | lr.bit();
stm(db_w, sp, preserved);
@@ -81,6 +82,7 @@
msr(CPSR_f, Operand(r4));
ldm(ia_w, sp, preserved);
+ */
}
} // namespace Arm
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/arm/macroassembler.h
^
|
| @@ -654,9 +654,9 @@
DoubleRepresentation value(imm);
// Handle special values first.
if (value.bits == zero.bits) {
- vmov(dst, kDoubleRegZero, cond);
+ vmov(dst, kDoubleRegZeroFlag, cond);
} else if (value.bits == minus_zero.bits) {
- vneg(dst, kDoubleRegZero, cond);
+ vneg(dst, kDoubleRegZeroFlag, cond);
} else {
vmov(dst, imm, cond);
}
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/arm/operand.h
^
|
| @@ -57,7 +57,7 @@
public:
// immediate
explicit Operand(s32 immediate);
- static Operand Zero();
+ static Operand ZeroFlag();
// rm
explicit Operand(Register rm);
@@ -99,7 +99,7 @@
imm32_ = immediate;
}
-inline Operand Operand::Zero()
+inline Operand Operand::ZeroFlag()
{
return Operand(static_cast<s32>(0));
}
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/arm/register.h
^
|
| @@ -312,7 +312,7 @@
// compilation unit that includes this header doesn't use the variables.
#define kFirstCalleeSavedDoubleReg d8
#define kLastCalleeSavedDoubleReg d15
-#define kDoubleRegZero d14
+#define kDoubleRegZeroFlag d14
#define kScratchDoubleReg d15
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/base/base.pro
^
|
| @@ -1,12 +1,13 @@
TEMPLATE = lib
DESTDIR = ../../lib
INCLUDEPATH += ..
-QT += declarative opengl network
-LIBS += -L../../lib -lpulse -lsixaxisclient
+QT += qml quick opengl network widgets
+LIBS += -L../../lib -lpulse
+#LIBS += -L../../lib -lpulse -lQtFeedback
CONFIG += mobility
MOBILITY += sensors feedback
-linux-g++-maemo {
+unix {
MEEGO_VERSION_MAJOR = 1
MEEGO_VERSION_MINOR = 2
MEEGO_VERSION_PATCH = 0
@@ -24,17 +25,13 @@
HEADERS += \
hostaudio.h \
- hostvideo.h \
hostinput.h \
base_global.h \
pathmanager.h \
statelistmodel.h \
- stateimageprovider.h \
configuration.h \
hostinputdevice.h \
- accelinputdevice.h \
touchinputdevice.h \
- sixaxisinputdevice.h \
keybinputdevice.h \
crc32.h \
emuview.h \
@@ -43,20 +40,21 @@
emuinput.h \
stringlistproxy.h \
audioringbuffer.h \
- memutils.h
+ frameitem.h \
+ memutils.h \
+ stateimageprovider.h
+# glpainter.h \
+# hostvideo.h \
+# accelinputdevice.h
SOURCES += \
hostaudio.cpp \
- hostvideo.cpp \
hostinput.cpp \
pathmanager.cpp \
statelistmodel.cpp \
- stateimageprovider.cpp \
configuration.cpp \
hostinputdevice.cpp \
- accelinputdevice.cpp \
touchinputdevice.cpp \
- sixaxisinputdevice.cpp \
keybinputdevice.cpp \
crc32.cpp \
emuview.cpp \
@@ -64,13 +62,18 @@
emu.cpp \
emuinput.cpp \
stringlistproxy.cpp \
- memutils.cpp \
- memset32_neon.S
+ frameitem.cpp \
+ memutils.cpp \
+ stateimageprovider.cpp
+# glpainter.cpp \
+# hostvideo.cpp \
+# accelinputdevice.cpp
unix {
qml.path = /opt/emumaster/qml/base
qml.files = \
../../qml/base/main.qml \
+ ../../qml/base/EmuView.qml \
../../qml/base/error.qml \
../../qml/base/SettingsPage.qml \
../../qml/base/SettingsSwitchItem.qml \
@@ -120,5 +123,5 @@
}
contains(MEEGO_EDITION, harmattan) {
- CONFIG += qmsystem2
+# CONFIG += qmsystem2
}
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/base/emu.h
^
|
| @@ -20,6 +20,8 @@
#include <QObject>
#include <QHash>
#include <QRectF>
+#include <QDataStream>
+
class QImage;
typedef qint8 s8;
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/base/emuthread.cpp
^
|
| @@ -71,7 +71,7 @@
#if defined(MEEGO_EDITION_HARMATTAN)
// prevent screen from locking
int blankinkgPauseCounter = 0;
- m_displayState.setBlankingPause();
+// m_displayState.setBlankingPause();
#endif
qreal frameTime = 1000.0 / m_emu->frameRate();
QTime time;
@@ -108,14 +108,14 @@
#if defined(MEEGO_EDITION_HARMATTAN)
// preventing screen from locking must occur at least one time in 60s
if (++blankinkgPauseCounter > 1000) {
- m_displayState.setBlankingPause();
+// m_displayState.setBlankingPause();
blankinkgPauseCounter = 0;
}
#endif
}
#if defined(MEEGO_EDITION_HARMATTAN)
// stop preventing screen from locking
- m_displayState.cancelBlankingPause();
+// m_displayState.cancelBlankingPause();
#endif
// pause the emulation
m_emu->setRunning(false);
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/base/emuthread.h
^
|
| @@ -19,7 +19,7 @@
class Emu;
#include <QThread>
#if defined(MEEGO_EDITION_HARMATTAN)
-#include <qmsystem2/qmdisplaystate.h>
+//#include <qmsystem2/qmdisplaystate.h>
#endif
class EmuThread : public QThread
@@ -46,7 +46,7 @@
int m_frameSkip;
#if defined(MEEGO_EDITION_HARMATTAN)
- MeeGo::QmDisplayState m_displayState;
+// MeeGo::QmDisplayState m_displayState;
#endif
friend class HostVideo;
};
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/base/emuview.cpp
^
|
| @@ -17,6 +17,7 @@
#include "emu.h"
#include "configuration.h"
#include "emuthread.h"
+#include "frameitem.h"
#include "hostvideo.h"
#include "hostaudio.h"
#include "hostinput.h"
@@ -26,19 +27,24 @@
#include "hostinputdevice.h"
#include "touchinputdevice.h"
#include "stringlistproxy.h"
-#include <QDeclarativeView>
-#include <QDeclarativeContext>
-#include <qdeclarative.h>
+#include <QQuickView>
+#include <QQmlContext>
+#include <QtQml>
+//#include <qdeclarative.h>
#include <QCloseEvent>
#include <QApplication>
-#include <QDeclarativeEngine>
+//#include <QDesktopWidget>
+#include <QQmlEngine>
#include <QTimer>
#include <QDir>
#include <QSettings>
#include <QUdpSocket>
#include <QColor>
+#include <QUrl>
-EmuView::EmuView(Emu *emu, const QString &diskFileName) :
+EmuView::EmuView(Emu *emu, const QString &diskFileName, QQuickView *view, QObject *parent) :
+ QObject(parent),
+ m_view(view),
m_emu(emu),
m_diskFileName(diskFileName),
m_running(false),
@@ -55,27 +61,16 @@
{
Q_ASSERT(m_emu != 0);
- setAttribute(Qt::WA_NoSystemBackground);
- setAutoFillBackground(false);
-
Configuration::setupAppInfo();
- registerClassesInQml();
pathManager.setCurrentEmu(m_emu->name());
m_thread = new EmuThread(m_emu);
m_hostInput = new HostInput(m_emu);
m_hostAudio = new HostAudio(m_emu);
- m_hostVideo = new HostVideo(m_hostInput, m_emu, m_thread);
- m_hostVideo->setParent(this);
- m_hostVideo->resize(HostVideo::Width, HostVideo::Height);
- m_hostVideo->installEventFilter(m_hostInput);
- m_hostInput->touchInputDevice()->setHostVideo(m_hostVideo);
QObject::connect(m_hostInput, SIGNAL(quit()), SLOT(close()));
QObject::connect(m_hostInput, SIGNAL(pause()), SLOT(pause()));
QObject::connect(m_hostInput, SIGNAL(devicesChanged()),
SIGNAL(inputDevicesChanged()));
- QObject::connect(m_hostVideo, SIGNAL(shaderChanged()),
- SLOT(hostVideoShaderChanged()));
m_stateListModel = new StateListModel(m_emu, m_diskFileName);
@@ -93,27 +88,18 @@
m_error = tr("Unknown error!");
}
- setupSettingsView();
-
m_safetyTimer = new QTimer(this);
m_safetyTimer->setInterval(10000);
m_safetyTimer->setSingleShot(false);
QObject::connect(m_safetyTimer, SIGNAL(timeout()), SLOT(onSafetyEvent()));
- const char *method = "showEmulationView";
- if (m_error.isEmpty()) {
- QObject::connect(m_stateListModel, SIGNAL(slFailed()),
- SLOT(onSlFailed()), Qt::QueuedConnection);
- QObject::connect(m_stateListModel, SIGNAL(stateLoaded()),
- SLOT(onStateLoaded()), Qt::QueuedConnection);
-#if defined(Q_WS_MAEMO_5)
- method = "showSettingsView";
-#endif
- } else {
- method = "showSettingsView";
- }
- QMetaObject::invokeMethod(this, method, Qt::QueuedConnection);
- showFullScreen();
+ showEmulationView();
+
+ registerClassesInQml();
+ m_view->setSource(QUrl("/opt/emumaster/qml/base/EmuView.qml"));
+ m_view->show();
+
+// showEmulationView();
}
EmuView::~EmuView()
@@ -126,27 +112,11 @@
m_emu->shutdown();
}
delete m_thread;
- delete m_settingsView;
delete m_stateListModel;
- delete m_hostVideo;
delete m_hostAudio;
delete m_hostInput;
}
-void EmuView::setupSettingsView()
-{
- m_settingsView = new QDeclarativeView(this);
- m_settingsView->setViewport(new QGLWidget());
- m_settingsView->resize(HostVideo::Width, HostVideo::Height);
- QObject::connect(m_settingsView->engine(), SIGNAL(quit()), SLOT(close()));
-
- m_settingsView->engine()->addImageProvider("state", new StateImageProvider(m_stateListModel));
- QDeclarativeContext *context = m_settingsView->rootContext();
- context->setContextProperty("emuView", static_cast<QObject *>(this));
- context->setContextProperty("emu", static_cast<QObject *>(m_emu));
- context->setContextProperty("stateListModel", static_cast<QObject *>(m_stateListModel));
-}
-
// two-stage pause preventing deadlocks
void EmuView::pause()
{
@@ -191,7 +161,7 @@
}
return;
}
- showSettingsView();
+ emit pauseStage2Finished();
}
void EmuView::resume()
@@ -230,36 +200,9 @@
}
}
-void EmuView::showSettingsView()
-{
- if (m_running) {
- pause();
- return;
- }
- if (m_settingsView->source().isEmpty() || !m_error.isEmpty()) {
- QString path;
- if (m_error.isEmpty())
- path = "%1/qml/base/main.qml";
- else
- path = "%1/qml/base/error.qml";
- path = path.arg(pathManager.installationDirPath());
- QUrl url = QUrl::fromLocalFile(path);
- m_settingsView->setSource(url);
- }
- if (m_audioEnable)
- m_hostAudio->close();
- m_settingsView->setVisible(true);
- m_settingsView->setFocus();
- m_hostVideo->setVisible(false);
- setSwipeEnabled(true);
-}
-
void EmuView::showEmulationView()
{
if (!m_running) {
- m_hostVideo->setVisible(true);
- m_hostVideo->setFocus();
- m_settingsView->setVisible(false);
setSwipeEnabled(m_swipeEnabled);
if (m_audioEnable)
m_hostAudio->open();
@@ -271,7 +214,7 @@
{
QString diskTitle = QFileInfo(m_diskFileName).completeBaseName();
QString path = pathManager.screenShotPath(diskTitle);
- if (!QFile::exists(path))
+// if (!QFile::exists(path))
saveScreenShot();
}
@@ -317,10 +260,12 @@
void EmuView::onFrameGenerated(bool videoOn)
{
m_safetyCheck = true;
- if (m_audioEnable)
+ if (m_audioEnable) {
m_hostAudio->sendFrame();
+ }
if (videoOn)
- m_hostVideo->repaint();
+// emit videoFrameChanged(m_emu->frame().copy());
+ emit videoFrameChanged(m_emu->frame().copy(m_emu->videoSrcRect().toRect()));
// sync input with the emulation
m_hostInput->sync();
}
@@ -409,12 +354,17 @@
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/base/emuview.h
^
|
| @@ -20,17 +20,18 @@
class EmuThread;
class HostVideo;
class HostAudio;
-class HostInput;
class SettingsView;
class StateListModel;
class HostInputDevice;
#include "base_global.h"
-#include <QGLWidget>
+#include "hostinput.h"
+#include <QImage>
+#include <QQuickView>
class QThread;
-class QDeclarativeView;
+//class QQuickView;
class QSettings;
-class BASE_EXPORT EmuView : public QWidget
+class BASE_EXPORT EmuView : public QObject
{
Q_OBJECT
Q_PROPERTY(bool fpsVisible READ isFpsVisible WRITE setFpsVisible NOTIFY fpsVisibleChanged)
@@ -41,10 +42,8 @@
Q_PROPERTY(bool lrButtonsVisible READ areLRButtonsVisible WRITE setLRButtonsVisible NOTIFY lrButtonsVisibleChanged)
Q_PROPERTY(QString error READ error CONSTANT)
Q_PROPERTY(QList<QObject *> inputDevices READ inputDevices NOTIFY inputDevicesChanged)
- Q_PROPERTY(QString videoFilter READ videoFilter WRITE setVideoFilter NOTIFY videoFilterChanged)
- Q_PROPERTY(QStringList availableVideoFilters READ availableVideoFilters CONSTANT)
public:
- explicit EmuView(Emu *emu, const QString &diskFileName);
+ explicit EmuView(Emu *emu, const QString &diskFileName, QQuickView *view, QObject *parent = 0);
~EmuView();
void setFpsVisible(bool on);
@@ -69,65 +68,62 @@
QString error() const;
- void setVideoFilter(const QString &name);
- QString videoFilter() const;
- QStringList availableVideoFilters() const;
-
void disableSafetyTimer();
+
+ HostInput* hostInput() { return m_hostInput; };
+
public slots:
bool close();
+ void pause();
+ void resume();
void saveScreenShot();
- void showSettingsView();
void showEmulationView();
signals:
void fpsVisibleChanged();
void frameSkipChanged();
void audioEnableChanged();
void padOpacityChanged();
+ void pauseStage2Finished();
void keepAspectRatioChanged();
void lrButtonsVisibleChanged();
void faultOccured(QString faultMessage);
void inputDevicesChanged();
void videoFilterChanged();
+ void videoFrameChanged(QImage frame);
protected:
void paintEvent(QPaintEvent *);
void closeEvent(QCloseEvent *e);
void changeEvent(QEvent *e);
void focusOutEvent(QFocusEvent *);
private slots:
- void pause();
void pauseStage2();
- void resume();
void onFrameGenerated(bool videoOn);
void onSlFailed();
void onSafetyEvent();
void onStateLoaded();
- void hostVideoShaderChanged();
private:
bool loadConfiguration();
void finishSetupConfiguration();
QVariant loadOptionFromSettings(QSettings &s, const QString &name) const;
QString extractArg(const QStringList &args, const QString &argName);
void parseConfArg(const QString &arg);
- void setupSettingsView();
void saveScreenShotIfNotExists();
int determineLoadSlot(const QStringList &args);
QString constructSlErrorString() const;
void fatalError(const QString &faultStr);
void setSwipeEnabled(bool on);
- static void registerClassesInQml();
+ void registerClassesInQml();
+ QQuickView *m_view;
Emu *m_emu;
QString m_diskFileName;
EmuThread *m_thread;
HostInput *m_hostInput;
HostAudio *m_hostAudio;
- HostVideo *m_hostVideo;
StateListModel *m_stateListModel;
- QDeclarativeView *m_settingsView;
bool m_running;
int m_backgroundCounter;
|
|
[-]
[+]
|
Added |
emumaster_0.3.1.tar.gz/src/base/frameitem.cpp
^
|
| @@ -0,0 +1,65 @@
+#include <QDebug>
+#include <QRect>
+#include "emuview.h"
+#include "frameitem.h"
+#include "hostinput.h"
+#include "touchinputdevice.h"
+
+FrameItem::FrameItem(QQuickItem *parent) :
+ QQuickPaintedItem(parent),
+ m_currentFrame(0)
+{
+ m_fpsCount = 0;
+ m_fpsCounter = 0;
+ m_fpsCounterTime.start();
+
+ setRenderTarget(QQuickPaintedItem::FramebufferObject);
+}
+
+void FrameItem::handleNewFrame(QImage frame) {
+ m_currentFrame = frame;
+ update();
+}
+
+void FrameItem::paint(QPainter *painter)
+{
+ if (! m_currentFrame.isNull()) {
+ painter->drawImage(contentsBoundingRect(), m_currentFrame);
+ m_emuView->hostInput()->paint(painter);
+ paintFps(painter);
+ }
+}
+
+void FrameItem::paintFps(QPainter *painter)
+{
+ // calculate fps
+ m_fpsCounter++;
+ if (m_fpsCounterTime.elapsed() >= 1000) {
+ m_fpsCount = m_fpsCounter;
+ m_fpsCounter = 0;
+ m_fpsCounterTime.restart();
+ }
+
+ // set font and draw fps
+ QFont font = painter->font();
+ font.setPointSize(12);
+ painter->setFont(font);
+ painter->setPen(Qt::red);
+ painter->drawText(QRectF(70.0f, 20.0f, 100.0f, 60.0f),
+ Qt::AlignCenter,
+ QString("%1 FPS").arg(m_fpsCount));
+}
+
+void FrameItem::setEmuView(QObject *emuView) {
+ qDebug("Setting emuView.");
+ m_emuView = qobject_cast<EmuView *>(emuView);
+ connect(m_emuView, SIGNAL(videoFrameChanged(QImage)), this, SLOT(handleNewFrame(QImage)));
+
+ m_emuView->hostInput()->touchInputDevice()->setHeight((int) contentsBoundingRect().height());
+ m_emuView->hostInput()->touchInputDevice()->setWidth((int) contentsBoundingRect().width());
+}
+
+void FrameItem::touchEvent(QTouchEvent *touchEvent) {
+ m_emuView->hostInput()->processTouch(touchEvent);
+}
+
|
|
[-]
[+]
|
Added |
emumaster_0.3.1.tar.gz/src/base/frameitem.h
^
|
| @@ -0,0 +1,57 @@
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef FRAMEITEM_H
+#define FRAMEITEM_H
+
+#include <QImage>
+#include <QPainter>
+#include <QQuickPaintedItem>
+#include <QTime>
+#include <QTouchEvent>
+
+class EmuView;
+
+class FrameItem : public QQuickPaintedItem
+{
+ Q_OBJECT
+
+public:
+ FrameItem(QQuickItem *parent = 0);
+
+ void paint(QPainter *painter);
+
+ Q_INVOKABLE void setEmuView(QObject *emuView);
+
+public slots:
+ void handleNewFrame(QImage frame);
+
+protected:
+ void touchEvent(QTouchEvent * touchEvent);
+
+private:
+ EmuView *m_emuView;
+ QImage m_currentFrame;
+ bool m_keepAspectRatio;
+
+ bool m_fpsVisible;
+ int m_fpsCount;
+ int m_fpsCounter;
+ QTime m_fpsCounterTime;
+
+ void paintFps(QPainter *painter);
+};
+
+#endif // FRAMEITEM_H
|
|
[-]
[+]
|
Added |
emumaster_0.3.1.tar.gz/src/base/glpainter.cpp
^
|
| @@ -0,0 +1,75 @@
+#include <QDebug>
+#include "glpainter.h"
+#include "hostvideo.h"
+#include "emu.h"
+#include "emuthread.h"
+#include "hostinput.h"
+
+GLPainter::GLPainter(HostVideo *widget) :
+ glWidget(widget),
+ doRendering(true)
+ {
+ }
+
+void GLPainter::start()
+{
+ qDebug("Starting glPainter");
+// glWidget->makeCurrent();
+// startTimer(20);
+}
+
+void GLPainter::stop()
+{
+ QMutexLocker locker(&mutex);
+ doRendering = false;
+}
+
+void GLPainter::resizeViewport(const QSize &size)
+{
+ QMutexLocker locker(&mutex);
+ viewportWidth = size.width();
+ viewportHeight = size.height();
+}
+
+void GLPainter::paintFps(QPainter *painter)
+{
+ // calculate fps
+ glWidget->m_fpsCounter++;
+ if (glWidget->m_fpsCounterTime.elapsed() >= 1000) {
+ glWidget->m_fpsCount = glWidget->m_fpsCounter;
+ glWidget->m_fpsCounter = 0;
+ glWidget->m_fpsCounterTime.restart();
+ }
+ // set font and draw fps
+ QFont font = painter->font();
+ font.setPointSize(12);
+ painter->setFont(font);
+ painter->setPen(Qt::red);
+ painter->drawText(QRectF(80.0f, 0.0f, 100.0f, 60.0f),
+ Qt::AlignCenter,
+ QString("%1 FPS").arg(glWidget->m_fpsCount));
+}
+
+void GLPainter::paintFrame(QImage frame) {
+ QMutexLocker locker(&mutex);
+
+ glWidget->makeCurrent();
+ QPainter painter(glWidget);
+// painter.begin(this);
+
+ // clear screen early only when we are not drawing on entire screen later
+ if (glWidget->m_keepAspectRatio)
+ painter.fillRect(glWidget->rect(), Qt::black);
+
+ GLuint t = glWidget->bindTexture(frame);
+ glWidget->drawTexture(glWidget->m_dstRect, t);
+ glWidget->deleteTexture(t);
+
+ if (glWidget->m_fpsVisible)
+ paintFps(&painter);
+
+ // draw buttons
+ glWidget->m_hostInput->paint(&painter);
+ painter.end();
+}
+
|
|
[-]
[+]
|
Added |
emumaster_0.3.1.tar.gz/src/base/glpainter.h
^
|
| @@ -0,0 +1,55 @@
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef GLPAINTER_H
+#define GLPAINTER_H
+
+#include <QObject>
+#include <QTimer>
+#include <QPainter>
+#include <QMutex>
+#include <QThread>
+#include <QTimerEvent>
+#include <QPainter>
+
+class HostVideo;
+
+class GLPainter : public QObject
+{
+ Q_OBJECT
+public:
+ GLPainter(HostVideo *widget);
+ void stop();
+ void resizeViewport(const QSize &size);
+
+public slots:
+ void start();
+
+ void paintFrame(QImage frame);
+
+protected:
+ void paint();
+
+private:
+ QMutex mutex;
+ HostVideo *glWidget;
+ int viewportWidth;
+ int viewportHeight;
+ bool doRendering;
+
+ void paintFps(QPainter *painter);
+};
+
+#endif // GLPAINTER_H
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/base/hostaudio.cpp
^
|
| @@ -17,6 +17,7 @@
#include "emu.h"
#include <stdio.h>
#include <limits.h>
+#include <QDebug>
static void contextStreamCallback(pa_context *context, void *userdata)
{
@@ -148,6 +149,7 @@
{
if (!m_stream)
return;
+
pa_threaded_mainloop_lock(m_mainloop);
void *data;
#if defined(MEEGO_EDITION_HARMATTAN)
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/base/hostinput.cpp
^
|
| @@ -18,11 +18,10 @@
#include "emu.h"
#include "configuration.h"
#include "touchinputdevice.h"
-#include "accelinputdevice.h"
+//#include "accelinputdevice.h"
#include "keybinputdevice.h"
-#include "sixaxisinputdevice.h"
#include "memutils.h"
-#include <sixaxisclient/sixaxis.h>
+#include <QDebug>
#include <QKeyEvent>
#include <QTouchEvent>
@@ -38,25 +37,19 @@
/*! Creates a HostInput object with the given \a emu. */
HostInput::HostInput(Emu *emu) :
- m_emu(emu),
- m_numSixAxes(0)
+ m_emu(emu)
{
m_padOpacity = emConf.defaultValue("padOpacity").toReal();
// first device in the list is always touch device ...
setupTouchDevice();
// ... and second is always the keyboard
m_devices.append(new KeybInputDevice(this));
- m_devices.append(new AccelInputDevice(this));
- // start sixaxis daemon
- SixAxisDaemon *daemon = SixAxisDaemon::instance();
- QObject::connect(daemon, SIGNAL(newPad()), SLOT(onSixAxisDetected()));
- daemon->start();
+// m_devices.append(new AccelInputDevice(this));
}
/*! Destroys HostInput object. */
HostInput::~HostInput()
{
- SixAxisDaemon::instance()->stop();
}
/*! \internal */
@@ -96,9 +89,11 @@
int y = point.pos().y();
if (y < 64) {
if (x < 80)
- emit pause();
- else if (x > HostVideo::Width-80)
- emit quit();
+ qDebug("Settings button should be handled in QML.");
+// emit pause();
+ else if (x > 900) //FIXME: 900 is a hardcoded value.
+ qDebug("Quit button should be handled in QML.");
+// emit quit();
}
}
touchInputDevice()->processTouch(e);
@@ -121,39 +116,6 @@
m_devices.append(touchDevice);
}
-/*! \internal */
-void HostInput::onSixAxisDetected()
-{
- SixAxisDaemon *daemon = SixAxisDaemon::instance();
- while (daemon->hasNewPad()) {
- // create new sixaxis
- SixAxis *sixAxis = daemon->nextNewPad();
- SixAxisInputDevice *sixAxisDev = new SixAxisInputDevice(sixAxis, this);
- int index = m_numSixAxes;
- sixAxisDev->setDeviceIndex(index);
- QObject::connect(sixAxisDev, SIGNAL(destroyed()), SLOT(onSixAxisDestroyed()));
- QObject::connect(sixAxisDev, SIGNAL(pause()), SIGNAL(pause()));
-
- // set Pad A or Pad B emu function
- if (index == 0 || index == 1)
- sixAxisDev->setEmuFunction(index + 1);
-
- m_devices.append(sixAxisDev);
- m_numSixAxes++;
- }
- emit devicesChanged();
-}
-
-/*! \internal */
-void HostInput::onSixAxisDestroyed()
-{
- SixAxisInputDevice *sixAxisInputDevice = static_cast<SixAxisInputDevice *>(sender());
- if (m_devices.removeOne(sixAxisInputDevice)) {
- m_numSixAxes--;
- emit devicesChanged();
- }
-}
-
/*! Returns touch input device. */
TouchInputDevice *HostInput::touchInputDevice() const
{
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/base/hostinput.h
^
|
| @@ -42,6 +42,7 @@
void sync();
void paint(QPainter *painter);
+ void processTouch(QEvent *e);
public slots:
void loadFromConf();
signals:
@@ -51,10 +52,7 @@
protected:
bool eventFilter(QObject *o, QEvent *e);
private slots:
- void onSixAxisDetected();
- void onSixAxisDestroyed();
private:
- void processTouch(QEvent *e);
void setupTouchDevice();
Emu *m_emu;
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/base/hostvideo.cpp
^
|
| @@ -40,26 +40,6 @@
operator QRectF() const {return QRectF(left, top, right-left, bottom-top);}
};
-static const char *defaultVertexShader =
- "attribute highp vec4 a_vertex; \n"
- "attribute vec2 a_texCoord; \n"
- "varying vec2 v_texCoord; \n"
- "uniform highp mat4 u_pvmMatrix; \n"
- "void main() \n"
- "{ \n"
- " gl_Position = u_pvmMatrix * a_vertex;\n"
- " v_texCoord = a_texCoord; \n"
- "} \n";
-
-static const char *defaultFragmentShader =
- "precision mediump float; \n"
- "varying vec2 v_texCoord; \n"
- "uniform sampler2D s_texture; \n"
- "void main() \n"
- "{ \n"
- " gl_FragColor = texture2D(s_texture, v_texCoord);\n"
- "} \n";
-
/*!
\class HostVideo
HostVideo class displays frames generated by the emulation and buttons
@@ -79,12 +59,12 @@
m_hostInput(hostInput),
m_emu(emu),
m_thread(thread),
- m_program(0),
- m_programIndex(0),
- m_programDirty(true)
+ glPainter(this),
+ glThread(this)
{
setAttribute(Qt::WA_NoSystemBackground);
setAttribute(Qt::WA_AcceptTouchEvents);
+ setAttribute(Qt::WA_PaintOutsidePaintEvent);
setAttribute(Qt::WA_QuitOnClose, false);
setAutoFillBackground(false);
@@ -95,9 +75,9 @@
m_keepAspectRatio = emConf.defaultValue("keepAspectRatio").toBool();
- setupProgramList();
-
QObject::connect(m_emu, SIGNAL(videoSrcRectChanged()), SLOT(updateRects()));
+ QObject::connect(this, SIGNAL(videoFrameChanged(QImage)), &glPainter,
+ SLOT(paintFrame(QImage)), Qt::QueuedConnection);
}
HostVideo::~HostVideo()
@@ -119,94 +99,35 @@
/*! \internal */
void HostVideo::paintEvent(QPaintEvent *)
{
- if (!m_thread->m_inFrameGenerated)
- return;
-
- if (m_programDirty) {
- if (!loadShaderProgram())
- return;
- }
-
- QPainter painter;
- painter.begin(this);
-
- // clear screen early only when we are not drawing on entire screen later
- if (m_keepAspectRatio)
- painter.fillRect(rect(), Qt::black);
-
- painter.beginNativePainting();
- paintEmuFrame();
- painter.endNativePainting();
-
- if (m_fpsVisible)
- paintFps(&painter);
-
- // draw buttons
- m_hostInput->paint(&painter);
- painter.end();
+ // We do nothing here as we render in a distinct thread.
}
-void HostVideo::paintGL()
+void HostVideo::resizeEvent(QResizeEvent *event)
{
- paintEmuFrame();
+ glPainter.resizeViewport(event->size());
}
-void HostVideo::paintEmuFrame()
+/*! Sets if fps should be drawn (\a on=true) or not. */
+void HostVideo::setFpsVisible(bool on)
{
- const QImage &tex = m_emu->frame();
- QSizeF textureSize = tex.size();
- QGLRect src = m_srcRect;
- GLfloat dx = 1.0 / textureSize.width() ;
- GLfloat dy = 1.0 / textureSize.height();
- QGLRect srcTextureRect(src.left*dx, src.top*dy, src.right*dx, src.bottom*dy);
- setCoords(m_texCoordArray, srcTextureRect);
-
- if (m_keepAspectRatio) {
- qglClearColor(Qt::black);
- glClear(GL_COLOR_BUFFER_BIT);
- }
- m_program->bind();
- if (m_u_displaySizeLocation != -1) {
- qreal w = m_dstRect.width() * textureSize.width() / m_srcRect.width();
- qreal h = m_dstRect.height() * textureSize.height() / m_srcRect.height();
- m_program->setUniformValue(m_u_displaySizeLocation, QSizeF(w, h));
- }
- m_program->enableAttributeArray(m_a_vertexLocation);
- m_program->enableAttributeArray(m_a_texCoordLocation);
- m_program->setAttributeArray(m_a_vertexLocation, m_vertexArray, 2);
- m_program->setAttributeArray(m_a_texCoordLocation, m_texCoordArray, 2);
- glActiveTexture(GL_TEXTURE0);
- bindTexture(tex, GL_TEXTURE_2D, GL_RGB, QGLContext::MemoryManagedBindOption);
- glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
- m_program->disableAttributeArray(m_a_vertexLocation);
- m_program->disableAttributeArray(m_a_texCoordLocation);
- m_program->release();
+ m_fpsVisible = on;
}
-/*! \internal */
-void HostVideo::paintFps(QPainter *painter)
+void HostVideo::startRendering()
{
- // calculate fps
- m_fpsCounter++;
- if (m_fpsCounterTime.elapsed() >= 1000) {
- m_fpsCount = m_fpsCounter;
- m_fpsCounter = 0;
- m_fpsCounterTime.restart();
- }
- // set font and draw fps
- QFont font = painter->font();
- font.setPointSize(12);
- painter->setFont(font);
- painter->setPen(Qt::red);
- painter->drawText(QRectF(80.0f, 0.0f, 100.0f, 60.0f),
- Qt::AlignCenter,
- QString("%1 FPS").arg(m_fpsCount));
+ glPainter.moveToThread(&glThread);
+ connect(&glThread, SIGNAL(started()), &glPainter, SLOT(start()));
+ glThread.start();
}
-/*! Sets if fps should be drawn (\a on=true) or not. */
-void HostVideo::setFpsVisible(bool on)
+void HostVideo::stopRendering()
{
- m_fpsVisible = on;
+ glPainter.stop();
+ glThread.wait();
+}
+
+void HostVideo::updateFrame(QImage frame) {
+ emit videoFrameChanged(frame);
}
/*! \internal */
@@ -215,8 +136,8 @@
// update rects if size of source rect changes
m_srcRect = m_emu->videoSrcRect();
Q_ASSERT_X(m_srcRect.width() != 0.0f && m_srcRect.height() != 0.0f, "HostVideo", "Define source rect!");
- qreal ww = Width;
- qreal wh = Height;
+ qreal ww = rect().width();
+ qreal wh = rect().height();
if (m_keepAspectRatio) {
// calculate proportionally scaled rect
qreal scale = qMin(ww/m_srcRect.width(), wh/m_srcRect.height());
@@ -230,7 +151,6 @@
m_dstRect = QRectF(QPointF(), QSizeF(ww, wh));
}
QGLRect dst = m_dstRect;
- setCoords(m_vertexArray, dst);
}
/*!
@@ -256,108 +176,3 @@
return QPoint(x, y);
}
-void HostVideo::setShader(const QString &shaderName)
-{
- int index = m_programList.indexOf(shaderName);
- if (index < 0)
- return;
-
- if (index != m_programIndex) {
- m_programIndex = index;
- m_programDirty = true;
- emit shaderChanged();
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/base/hostvideo.h
^
|
| @@ -22,20 +22,13 @@
#include "base_global.h"
#include <QGLWidget>
#include <QTime>
-#include <QGLShaderProgram>
+#include <QThread>
+#include "glpainter.h"
class BASE_EXPORT HostVideo : public QGLWidget
{
Q_OBJECT
public:
-#if defined(MEEGO_EDITION_HARMATTAN)
- static const int Width = 854.0f;
- static const int Height = 480.0f;
-#elif defined(Q_WS_MAEMO_5)
- static const int Width = 800.0f;
- static const int Height = 480.0f;
-#endif
-
explicit HostVideo(HostInput *hostInput,
Emu *emu,
EmuThread *thread,
@@ -52,23 +45,8 @@
QPoint convertCoordHostToEmu(const QPoint &hostPos);
- void setShader(const QString &shaderName);
- QString shader() const;
- QStringList shaderList() const;
-signals:
- void shaderChanged();
-protected:
- void paintEvent(QPaintEvent *);
- void paintGL();
-private slots:
- void updateRects();
-private:
- void paintEmuFrame();
- void paintFps(QPainter *painter);
- QString shaderDir() const;
- void setupProgramList();
- bool loadShaderProgram();
- bool configureShaderProgram(const char *vsh, const char *fsh);
+ void startRendering();
+ void stopRendering();
HostInput *m_hostInput;
Emu *m_emu;
@@ -84,18 +62,20 @@
bool m_keepAspectRatio;
- QGLShaderProgram *m_program;
- int m_u_pvmMatrixLocation;
- int m_u_displaySizeLocation;
- int m_a_vertexLocation;
- int m_a_texCoordLocation;
- int m_s_textureLocation;
- GLfloat m_vertexArray[8];
- GLfloat m_texCoordArray[8];
-
- int m_programIndex;
- bool m_programDirty;
- QStringList m_programList;
+ void updateFrame(QImage frame);
+signals:
+ void videoFrameChanged(QImage frame);
+
+protected:
+ void paintEvent(QPaintEvent *);
+ void resizeEvent(QResizeEvent *event);
+
+private slots:
+ void updateRects();
+
+private:
+ GLPainter glPainter;
+ QThread glThread;
};
inline QRectF HostVideo::dstRect() const
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/base/pathmanager.cpp
^
|
| @@ -36,7 +36,7 @@
m_installationDirPath = "/opt/emumaster";
m_userDataDirPath = QString("%1/.emumaster").arg(getenv("HOME"));
- m_diskDirBase = QString("%1/MyDocs/emumaster").arg(getenv("HOME"));
+ m_diskDirBase = QString("%1/emumaster").arg(getenv("HOME"));
}
/*! Creates subdirs for every emulation in the given \a dir. */
@@ -60,7 +60,6 @@
dir.cd("screenshot"); createEmusSubtree(dir); dir.cdUp();
dir = QDir(getenv("HOME"));
- dir.cd("MyDocs");
dir.mkdir("emumaster");
dir.cd("emumaster");
dir.mkdir("covers");
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/base/stateimageprovider.cpp
^
|
| @@ -18,7 +18,7 @@
#include <QPainter>
StateImageProvider::StateImageProvider(StateListModel *stateListModel) :
- QDeclarativeImageProvider(Image),
+ QQuickImageProvider(Image),
m_stateListModel(stateListModel)
{
}
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/base/stateimageprovider.h
^
|
| @@ -17,9 +17,9 @@
#define STATEIMAGEPROVIDER_H
class StateListModel;
-#include <QDeclarativeImageProvider>
+#include <QQuickImageProvider>
-class StateImageProvider : public QDeclarativeImageProvider
+class StateImageProvider : public QQuickImageProvider
{
public:
explicit StateImageProvider(StateListModel *stateListModel);
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/base/statelistmodel.cpp
^
|
| @@ -25,11 +25,9 @@
m_screenShotUpdateCounter(0)
{
// set role names
- QHash<int, QByteArray> roles;
- roles.insert(SlotRole, "slot");
- roles.insert(DateTimeRole, "saveDateTime");
- roles.insert(ScreenShotUpdateRole, "screenShotUpdate");
- setRoleNames(roles);
+ _roles.insert(SlotRole, "slot");
+ _roles.insert(DateTimeRole, "saveDateTime");
+ _roles.insert(ScreenShotUpdateRole, "screenShotUpdate");
// make path to a dir with states
QString diskTitle = QFileInfo(diskFileName).completeBaseName();
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/base/statelistmodel.h
^
|
| @@ -48,6 +48,8 @@
bool exists(int slot) const;
+ virtual QHash<int, QByteArray> roleNames() const { return _roles; }
+
Q_INVOKABLE bool saveState(int slot);
Q_INVOKABLE bool loadState(int slot);
Q_INVOKABLE void removeState(int slot);
@@ -64,6 +66,7 @@
QFileInfoList m_list;
int m_maxSlotIndex;
int m_screenShotUpdateCounter;
+ QHash<int, QByteArray> _roles;
};
#endif // STATELISTMODEL_H
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/base/touchinputdevice.cpp
^
|
| @@ -14,11 +14,11 @@
*/
#include "touchinputdevice.h"
-#include "hostvideo.h"
#include "pathmanager.h"
#include "emu.h"
#include <QTouchEvent>
#include <QPainter>
+#include <QDebug>
enum ButtonsInImage {
Button_Settings,
@@ -59,22 +59,23 @@
m_buttonsVisible(true),
m_psxButtonsEnable(false),
m_picoButtonsEnable(false),
- m_gbaButtonsEnable(false),
- m_hapticEffect(0),
- m_hostVideo(0)
+ m_gbaButtonsEnable(false)
{
setupEmuFunctionList();
QObject::connect(this, SIGNAL(emuFunctionChanged()), SLOT(onEmuFunctionChanged()));
m_buttonsImage.load(pathManager.installationDirPath()+"/data/buttons.png");
-}
-void TouchInputDevice::setHostVideo(HostVideo *hostVideo)
-{
- m_hostVideo = hostVideo;
+ m_width = 640;
+ m_height = 480;
}
+//void TouchInputDevice::setHostVideo(HostVideo *hostVideo)
+//{
+// m_hostVideo = hostVideo;
+//}
+
void TouchInputDevice::processTouch(QEvent *e)
{
m_numPoints = 0;
@@ -158,20 +159,20 @@
for (int i = 0; i < m_numPoints; i++) {
int x = m_points[i].x();
int y = m_points[i].y();
- if (y >= HostVideo::Height-m_areaSize) {
- y -= HostVideo::Height-m_areaSize;
+ if (y >= m_height-m_areaSize) {
+ y -= m_height-m_areaSize;
if (x < m_areaSize) {
// directions
m_buttons |= buttonsInDpad(x, y);
- } else if (x >= HostVideo::Width-m_areaSize) {
+ } else if (x >= m_width-m_areaSize) {
// a,b,x,y
- x -= HostVideo::Width-m_areaSize;
+ x -= m_width-m_areaSize;
m_buttons |= buttonsInDpad(x, y) << 4;
- } else if (x >= HostVideo::Width/2-ButtonWidth &&
- x < HostVideo::Width/2+ButtonWidth) {
+ } else if (x >= m_width/2-ButtonWidth &&
+ x < m_width/2+ButtonWidth) {
// select, start
if (y >= m_areaSize-ButtonHeight) {
- if (x < HostVideo::Width/2)
+ if (x < m_width/2)
m_buttons |= EmuPad::Button_Select;
else
m_buttons |= EmuPad::Button_Start;
@@ -183,17 +184,17 @@
m_buttons |= EmuPad::Button_L1;
else if (x < ButtonWidth*2)
m_buttons |= EmuPad::Button_L2;
- else if (x >= HostVideo::Width-ButtonWidth)
+ else if (x >= m_width-ButtonWidth)
m_buttons |= EmuPad::Button_R1;
- else if (x >= HostVideo::Width-ButtonWidth*2)
+ else if (x >= m_width-ButtonWidth*2)
m_buttons |= EmuPad::Button_R2;
}
}
- if (m_hapticEffect) {
+// if (m_hapticEffect) {
// start feedback when new button is pressed
- if ((m_buttons & oldButtons) != m_buttons)
- m_hapticEffect->start();
- }
+// if ((m_buttons & oldButtons) != m_buttons)
+// m_hapticEffect->start();
+// }
}
void TouchInputDevice::convertMouse()
@@ -206,8 +207,8 @@
for (int i = 0; i < m_numPoints; i++) {
int x = m_points[i].x();
int y = m_points[i].y();
- if (y >= HostVideo::Height-m_areaSize) {
- y -= HostVideo::Height-m_areaSize;
+ if (y >= m_height-m_areaSize) {
+ y -= m_height-m_areaSize;
if (x < m_areaSize) {
m_mouseX = x - m_areaSize/2;
m_mouseY = y - m_areaSize/2;
@@ -217,8 +218,8 @@
m_lastMouseY = m_mouseY;
}
newMoving = true;
- } else if (x >= HostVideo::Width-m_areaSize) {
- x -= HostVideo::Width-m_areaSize;
+ } else if (x >= m_width-m_areaSize) {
+ x -= m_width-m_areaSize;
int buttons = buttonsInDpad(x, y);
// swap bits
int left = (buttons & 2) >> 1;
@@ -235,8 +236,8 @@
{
if (m_numPoints <= 0)
m_touchPointInEmu = QPoint(-1, -1);
- else
- m_touchPointInEmu = m_hostVideo->convertCoordHostToEmu(m_points[0]);
+// else
+// m_touchPointInEmu = m_hostVideo->convertCoordHostToEmu(m_points[0]);
}
int TouchInputDevice::buttonsInDpad(int x, int y) const
@@ -293,16 +294,16 @@
void TouchInputDevice::setHapticFeedbackEnabled(bool on)
{
- if (on == (m_hapticEffect != 0))
- return;
- if (on) {
- m_hapticEffect = new QFeedbackHapticsEffect(this);
- m_hapticEffect->setIntensity(0.25f);
- m_hapticEffect->setDuration(30);
- } else {
- delete m_hapticEffect;
- m_hapticEffect = 0;
- }
+// if (on == (m_hapticEffect != 0))
+// return;
+// if (on) {
+// m_hapticEffect = new QFeedbackHapticsEffect(this);
+// m_hapticEffect->setIntensity(0.25f);
+// m_hapticEffect->setDuration(30);
+// } else {
+// delete m_hapticEffect;
+// m_hapticEffect = 0;
+// }
}
void TouchInputDevice::setLRVisible(bool on)
@@ -390,8 +391,8 @@
return;
// settings,exit
- addPaintedButton(Button_Settings, 0, QPointF(0, 0));
- addPaintedButton(Button_Exit, 0, QPointF(HostVideo::Width-PaintedButtonSize, 0));
+// addPaintedButton(Button_Settings, 0, QPointF(0, 0));
+// addPaintedButton(Button_Exit, 0, QPointF(m_width-PaintedButtonSize, 0));
if (emuFunction() <= 2)
addPaintedButtonsPad();
@@ -402,17 +403,17 @@
void TouchInputDevice::addPaintedButtonsPad()
{
// left dpad
- QPointF leftPos(10, HostVideo::Height-m_areaSize/2-PaintedButtonSize/2);
+ QPointF leftPos(10, m_height-m_areaSize/2-PaintedButtonSize/2);
addPaintedButton(Button_Left, EmuPad::Button_Left, leftPos);
QPointF rightPos(m_areaSize-PaintedButtonSize-10, leftPos.y());
addPaintedButton(Button_Right, EmuPad::Button_Right, rightPos);
QPointF upPos(m_areaSize/2-PaintedButtonSize/2,
- HostVideo::Height-m_areaSize+10);
+ m_height-m_areaSize+10);
addPaintedButton(Button_Up, EmuPad::Button_Up, upPos);
- QPointF downPos(upPos.x(), HostVideo::Height-PaintedButtonSize-10);
+ QPointF downPos(upPos.x(), m_height-PaintedButtonSize-10);
addPaintedButton(Button_Down, EmuPad::Button_Down, downPos);
// buttons at the right
- QPointF offset(HostVideo::Width-m_areaSize, 0);
+ QPointF offset(m_width-m_areaSize, 0);
if (!m_gbaButtonsEnable) {
if (!m_picoButtonsEnable) {
addPaintedButton(m_psxButtonsEnable ? Button_Square : Button_Y,
@@ -430,7 +431,7 @@
EmuPad::Button_B, downPos + offset);
// l1,r1,l2,r2
QPointF lPos(ButtonWidth/2-PaintedButtonSize/2, m_lrYPos);
- QPointF rPos = lPos + QPointF(HostVideo::Width-ButtonWidth, 0);
+ QPointF rPos = lPos + QPointF(m_width-ButtonWidth, 0);
QPointF l2Pos = lPos + QPointF(ButtonWidth, 0);
QPointF r2Pos = rPos - QPointF(ButtonWidth, 0);
if (m_lrVisible) {
@@ -450,8 +451,8 @@
}
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/base/touchinputdevice.h
^
|
| @@ -16,16 +16,15 @@
#ifndef TOUCHINPUTDEVICE_H
#define TOUCHINPUTDEVICE_H
-class HostVideo;
#include "hostinputdevice.h"
#include <QPoint>
#include <QImage>
-#include <QFeedbackHapticsEffect>
+//#include <QFeedbackHapticsEffect>
#include <QPainterPath>
#include <QColor>
class QPainter;
-QTM_USE_NAMESPACE
+//QTM_USE_NAMESPACE
class BASE_EXPORT TouchInputDevice : public HostInputDevice
{
@@ -37,7 +36,7 @@
Q_PROPERTY(bool buttonsVisible READ areButtonsVisible WRITE setButtonsVisible NOTIFY buttonsVisibleChanged)
public:
explicit TouchInputDevice(QObject *parent = 0);
- void setHostVideo(HostVideo *hostVideo);
+// void setHostVideo(HostVideo *hostVideo);
void sync(EmuInput *emuInput);
void processTouch(QEvent *e);
@@ -63,6 +62,17 @@
void setPsxButtonsEnabled(bool on);
void setPicoButtonsEnabled(bool on);
void setGbaButtonsEnabled(bool on);
+
+ void setHeight(int height) {
+ m_height = height;
+ updateGrid();
+ updatePaintedButtons();
+ };
+ void setWidth(int width) {
+ m_width = width;
+ updateGrid();
+ updatePaintedButtons();
+ };
signals:
void gridVisibleChanged();
void dpadAreaSizeChanged();
@@ -101,6 +111,9 @@
int m_lastMouseX;
int m_lastMouseY;
bool m_mouseMoving;
+
+ int m_height;
+ int m_width;
int m_areaSize;
int m_diagonalAreaSize;
@@ -127,9 +140,9 @@
QVector<PaintedButton> m_paintedButtons;
QImage m_buttonsImage;
- QFeedbackHapticsEffect *m_hapticEffect;
+// QFeedbackHapticsEffect *m_hapticEffect;
- HostVideo *m_hostVideo;
+// HostVideo *m_hostVideo;
};
inline bool TouchInputDevice::isGridVisible() const
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/diskgallery/diskgallery.cpp
^
|
| @@ -17,20 +17,21 @@
#include "diskgallery.h"
#include "disklistmodel.h"
#include "diskimageprovider.h"
-#include "touchinputview.h"
-#include <base/accelinputdevice.h>
+//#include "touchinputview.h"
+//#include <base/accelinputdevice.h>
#include <base/keybinputdevice.h>
#include <base/touchinputdevice.h>
#include <base/pathmanager.h>
#include <base/configuration.h>
-#include <QDeclarativeEngine>
-#include <QDeclarativeContext>
+#include <QQmlEngine>
+#include <QQmlContext>
#include <QFile>
#include <QProcess>
#include <QCoreApplication>
+#include <QDebug>
-DiskGallery::DiskGallery(QWidget *parent) :
- QDeclarativeView(parent)
+DiskGallery::DiskGallery(QWindow *parent) :
+ QQuickView(parent)
{
m_diskListModel = new DiskListModel(this);
setupQml();
@@ -38,11 +39,11 @@
m_sock.bind(QHostAddress::LocalHost, 5798);
QObject::connect(&m_sock, SIGNAL(readyRead()), SLOT(receiveDatagram()));
- m_usbMode = new MeeGo::QmUSBMode(this);
- QObject::connect(m_usbMode, SIGNAL(modeChanged(MeeGo::QmUSBMode::Mode)),
- SLOT(checkMassStorage()));
+// m_usbMode = new MeeGo::QmUSBMode(this);
+// QObject::connect(m_usbMode, SIGNAL(modeChanged(MeeGo::QmUSBMode::Mode)),
+// SLOT(checkMassStorage()));
- m_lastMode = m_usbMode->getMode();
+// m_lastMode = m_usbMode->getMode();
}
DiskGallery::~DiskGallery()
@@ -52,14 +53,14 @@
/** Configures QML window. */
void DiskGallery::setupQml()
{
- qmlRegisterType<TouchInputView>("EmuMaster", 1, 0, "TouchInputView");
+// qmlRegisterType<TouchInputView>("EmuMaster", 1, 0, "TouchInputView");
engine()->addImageProvider("disk", new DiskImageProvider());
- QDeclarativeContext *context = rootContext();
+ QQmlContext *context = rootContext();
context->setContextProperty("diskListModel", m_diskListModel);
context->setContextProperty("diskGallery", this);
context->setContextProperty("appVersion", QCoreApplication::applicationVersion());
- context->setContextProperty("accelInputDevice", new AccelInputDevice(this));
+// context->setContextProperty("accelInputDevice", new AccelInputDevice(this));
context->setContextProperty("keybInputDevice", new KeybInputDevice(this));
context->setContextProperty("touchInputDevice", new TouchInputDevice(this));
@@ -101,7 +102,10 @@
args << "-conf";
args << confStr;
}
+
+ qDebug() << "Starting with args: " << args;
#if defined(MEEGO_EDITION_HARMATTAN)
+ qDebug("Using single-instance.");
process.startDetached("/usr/bin/single-instance", args);
#elif defined(Q_WS_MAEMO_5)
QString app = args.takeFirst();
@@ -147,12 +151,12 @@
void DiskGallery::checkMassStorage()
{
- MeeGo::QmUSBMode::Mode mode = m_usbMode->getMode();
- if (m_lastMode == MeeGo::QmUSBMode::MassStorage ||
- mode == MeeGo::QmUSBMode::MassStorage) {
- emit massStorageInUseChanged();
- }
- m_lastMode = mode;
+// MeeGo::QmUSBMode::Mode mode = m_usbMode->getMode();
+// if (m_lastMode == MeeGo::QmUSBMode::MassStorage ||
+// mode == MeeGo::QmUSBMode::MassStorage) {
+// emit massStorageInUseChanged();
+// }
+// m_lastMode = mode;
}
/** Starts SixAxis Monitor app. */
@@ -178,5 +182,6 @@
bool DiskGallery::massStorageInUse() const
{
- return m_usbMode->getMode() == MeeGo::QmUSBMode::MassStorage;
+// return m_usbMode->getMode() == MeeGo::QmUSBMode::MassStorage;
+ return false;
}
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/diskgallery/diskgallery.desktop
^
|
| @@ -3,6 +3,6 @@
Type=Application
Terminal=false
Name=EmuMaster
-Exec=/usr/bin/invoker --type=e -s -S /opt/emumaster/data/splash.png -L /opt/emumaster/data/splash-l.png /opt/emumaster/bin/diskgallery
+Exec=/opt/emumaster/bin/diskgallery
Icon=/opt/emumaster/data/diskgallery.png
Categories=Game;Emulator;
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/diskgallery/diskgallery.h
^
|
| @@ -18,17 +18,17 @@
#define DISKGALLERY_H
class DiskListModel;
-#include <QDeclarativeView>
+#include <QQuickView>
#include <QUdpSocket>
#include <QSettings>
-#include <qmusbmode.h>
+//#include <qmusbmode.h>
-class DiskGallery : public QDeclarativeView
+class DiskGallery : public QQuickView
{
Q_OBJECT
Q_PROPERTY(bool massStorageInUse READ massStorageInUse NOTIFY massStorageInUseChanged)
public:
- explicit DiskGallery(QWidget *parent = 0);
+ explicit DiskGallery(QWindow *parent = 0);
~DiskGallery();
Q_INVOKABLE void launch(int index);
@@ -54,8 +54,8 @@
DiskListModel *m_diskListModel;
QUdpSocket m_sock;
QSettings m_settings;
- MeeGo::QmUSBMode *m_usbMode;
- MeeGo::QmUSBMode::Mode m_lastMode;
+// MeeGo::QmUSBMode *m_usbMode;
+// MeeGo::QmUSBMode::Mode m_lastMode;
};
#endif // DISKGALLERY_H
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/diskgallery/diskgallery.pro
^
|
| @@ -1,9 +1,9 @@
DESTDIR = ../../bin
INCLUDEPATH += ..
LIBS += -L../../lib -lbase
-QT += opengl declarative network
+QT += opengl qml quick network
CONFIG += mobility
-CONFIG += qmsystem2
+#CONFIG += qmsystem2
MOBILITY += sensors feedback systeminfo
SOURCES += \
@@ -12,16 +12,18 @@
diskimageprovider.cpp \
disklistmodel.cpp \
disklistmodel_fav.cpp \
- disklistmodel_icon.cpp \
- touchinputview.cpp
+ disklistmodel_icon.cpp
+
+# touchinputview.cpp
HEADERS += \
diskgallery.h \
diskimageprovider.h \
- disklistmodel.h \
- touchinputview.h
+ disklistmodel.h
+
+# touchinputview.h
-linux-g++-maemo {
+unix {
MEEGO_VERSION_MAJOR = 1
MEEGO_VERSION_MINOR = 2
MEEGO_VERSION_PATCH = 0
@@ -104,30 +106,3 @@
INSTALLS += desktopfile
}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/diskgallery/diskimageprovider.cpp
^
|
| @@ -21,7 +21,7 @@
#include <QFile>
DiskImageProvider::DiskImageProvider() :
- QDeclarativeImageProvider(Image),
+ QQuickImageProvider(Image),
m_noScreenShot(256, 256, QImage::Format_RGB32)
{
QPainter painter;
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/diskgallery/diskimageprovider.h
^
|
| @@ -17,9 +17,9 @@
#ifndef DISKIMAGEPROVIDER_H
#define DISKIMAGEPROVIDER_H
-#include <QDeclarativeImageProvider>
+#include <QQuickImageProvider>
-class DiskImageProvider : public QDeclarativeImageProvider
+class DiskImageProvider : public QQuickImageProvider
{
public:
DiskImageProvider();
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/diskgallery/disklistmodel.cpp
^
|
| @@ -28,14 +28,12 @@
QAbstractListModel(parent),
m_screenShotUpdateCounter(0)
{
- QHash<int, QByteArray> roles;
- roles.insert(TitleRole, "title");
- roles.insert(TitleElidedRole, "titleElided");
- roles.insert(EmuNameRole, "emuName");
- roles.insert(AlphabetRole, "alphabet");
- roles.insert(ImageSourceRole, "imageSource");
- roles.insert(ScreenShotUpdateRole, "screenShotUpdate");
- setRoleNames(roles);
+ _roles.insert(TitleRole, "title");
+ _roles.insert(TitleElidedRole, "titleElided");
+ _roles.insert(EmuNameRole, "emuName");
+ _roles.insert(AlphabetRole, "alphabet");
+ _roles.insert(ImageSourceRole, "imageSource");
+ _roles.insert(ScreenShotUpdateRole, "screenShotUpdate");
setupFilters();
loadFav();
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/diskgallery/disklistmodel.h
^
|
| @@ -66,6 +66,8 @@
Q_INVOKABLE bool addIconToHomeScreen(int index, qreal scale, int x, int y);
Q_INVOKABLE void removeIconFromHomeScreen(int index);
Q_INVOKABLE bool iconInHomeScreenExists(int index);
+
+ virtual QHash<int, QByteArray> roleNames() const { return _roles; }
signals:
void collectionChanged();
private:
@@ -100,6 +102,8 @@
int m_screenShotUpdateCounter;
+ QHash<int, QByteArray> _roles;
+
class DiskFilter {
public:
DiskFilter() { includeDirs = false; }
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/diskgallery/main.cpp
^
|
| @@ -18,25 +18,14 @@
#include <base/configuration.h>
#include <base/pathmanager.h>
#include <QApplication>
-#include <QSystemInfo>
-#include <QDeclarativeEngine>
-
-QTM_USE_NAMESPACE
+//#include <QSystemInfo>
+#include <QQmlEngine>
int main(int argc, char *argv[])
{
QApplication app(argc, argv);
- QSystemInfo sysInfo;
- if (sysInfo.version(QSystemInfo::Os) < QString("1.2")) {
- QDeclarativeView view;
- QObject::connect(view.engine(), SIGNAL(quit()), &view, SLOT(close()));
- QString qmlPath = QString("%1/qml/gallery/osVersionError.qml")
- .arg(pathManager.installationDirPath());
- view.setSource(QUrl::fromLocalFile(qmlPath));
- view.showFullScreen();
- return app.exec();
- }
+// QSystemInfo sysInfo;
Configuration::setupAppInfo();
pathManager.buildLocalDirTree();
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/diskgallery/touchinputview.cpp
^
|
| @@ -19,7 +19,7 @@
#include <QPainter>
TouchInputView::TouchInputView(QDeclarativeItem *parent) :
- QDeclarativeItem(parent)
+ QQuickItem(parent)
{
setFlag(ItemHasNoContents, false);
}
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/diskgallery/touchinputview.h
^
|
| @@ -17,15 +17,15 @@
#ifndef TOUCHINPUTVIEW_H
#define TOUCHINPUTVIEW_H
-#include <QDeclarativeItem>
+#include <QQuickItem>
class TouchInputDevice;
-class TouchInputView : public QDeclarativeItem
+class TouchInputView : public QQuickItem
{
Q_OBJECT
Q_PROPERTY(QObject *touchDevice READ touchDevice WRITE setTouchDevice NOTIFY touchDeviceChanged)
public:
- explicit TouchInputView(QDeclarativeItem *parent = 0);
+ explicit TouchInputView(QQuickItem *parent = 0);
void setTouchDevice(QObject *o);
QObject *touchDevice() const;
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/emu.pri
^
|
| @@ -1,7 +1,12 @@
DESTDIR = ../../bin
LIBS += -L../../lib -lbase
INCLUDEPATH += ..
-QT += opengl declarative
+
+#INCLUDEPATH += /usr/include/sailfishapp
+#CONFIG += link_pkgconfig
+#PKGCONFIG += sailfishapp
+
+QT += opengl qml quick
#contains(CONFIG,release) {
# QMAKE_CFLAGS_RELEASE -= -O2
@@ -19,7 +24,7 @@
# -falign-functions=32
#}
-linux-g++-maemo {
+unix {
MEEGO_VERSION_MAJOR = 1
MEEGO_VERSION_MINOR = 2
MEEGO_VERSION_PATCH = 0
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/emumaster.pro
^
|
| @@ -1,12 +1,11 @@
TEMPLATE = subdirs
SUBDIRS += \
- sixaxisclient \
base \
- nes gba snes psx amiga pico \
- diskgallery \
- sixaxismonitor
+ snes \
+ diskgallery
+# gba snes pico \
# nes gba snes psx amiga pico \
OTHER_FILES += \
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/gba/cheats.cpp
^
|
| @@ -411,11 +411,9 @@
GbaCheats::GbaCheats()
{
- QHash<int, QByteArray> roles;
- roles.insert(GroupRole, "codeList");
- roles.insert(DescriptionRole, "codeDescription");
- roles.insert(EnableRole, "codeEnabled");
- setRoleNames(roles);
+ _roles.insert(GroupRole, "codeList");
+ _roles.insert(DescriptionRole, "codeDescription");
+ _roles.insert(EnableRole, "codeEnabled");
}
int GbaCheats::rowCount(const QModelIndex &parent) const
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/gba/cheats.h
^
|
| @@ -94,6 +94,8 @@
Q_INVOKABLE bool checkIdcodeForGroup(int groupIndex, const QString &expected) const;
void sl();
+
+ virtual QHash<int, QByteArray> roleNames() const { return _roles; }
private:
void reloadCheats();
@@ -101,6 +103,7 @@
QList<int> m_generations;
QStringList m_descriptions;
QList<bool> m_enabled;
+ QHash<int, QByteArray> _roles;
};
extern GbaCheats gbaCheats;
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/gba/gba.cpp
^
|
| @@ -26,9 +26,12 @@
#include <base/pathmanager.h>
#include <QFile>
#include <QApplication>
-#include <qdeclarative.h>
+//#include <qdeclarative.h>
#include <QSemaphore>
+#include <QQuickView>
+#include <QtQml>
+
timer_type timer[4];
u32 cpu_ticks = 0;
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/gba/gba_game_config.txt
^
|
| @@ -125,25 +125,25 @@
vender_code = 08
idle_loop_eliminate_target = 080003da
-# Megaman Zero (U/E)
+# Megaman ZeroFlag (U/E)
game_name = MEGAMAN ZERO
game_code = AZCE
vender_code = 08
idle_loop_eliminate_target = 080004ee
-# Megaman Zero 2 (U)
+# Megaman ZeroFlag 2 (U)
game_name = MEGAMANZERO2
game_code = A62E
vender_code = 08
idle_loop_eliminate_target = 08000664
-# Megaman Zero 3 (U)
+# Megaman ZeroFlag 3 (U)
game_name = MEGAMANZERO3
game_code = BZ3E
vender_code = 08
idle_loop_eliminate_target = 08001a08
-# Megaman Zero 4 (U)
+# Megaman ZeroFlag 4 (U)
game_name = MEGAMANZERO4
game_code = B4ZP
vender_code = 08
@@ -448,7 +448,7 @@
vender_code = 01
flash_rom_type = 128KB
-# F-Zero: Climax (J)
+# F-ZeroFlag: Climax (J)
game_name = F-ZEROCLIMAX
game_code = BFTJ
vender_code = 01
@@ -638,25 +638,25 @@
vender_code = 01
idle_loop_eliminate_target = 080006c2
-# F-Zero - Maximum Velocity (U)
+# F-ZeroFlag - Maximum Velocity (U)
game_name = F-ZERO ADVAN
game_code = AFZE
vender_code = 01
idle_loop_eliminate_target = 08000c2e
-# Megaman Zero 2 (U)
+# Megaman ZeroFlag 2 (U)
game_name = MEGAMANZERO2
game_code = A62E
vender_code = 08
idle_loop_eliminate_target = 08000664
-# Megaman Zero 3 (U)
+# Megaman ZeroFlag 3 (U)
game_name = MEGAMANZERO3
game_code = BZ3E
vender_code = 08
idle_loop_eliminate_target = 08001a08
-# Megaman Zero 4 (U)
+# Megaman ZeroFlag 4 (U)
game_name = MEGAMANZERO4
game_code = B4ZE
vender_code = 08
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/gba/mem.cpp
^
|
| @@ -2814,9 +2814,9 @@
const char *titlePtr = (const char *)(gamepak_rom + 0xa0);
const char *codePtr = (const char *)(gamepak_rom + 0xac);
const char *makerPtr = (const char *)(gamepak_rom + 0xb0);
- gbaGamePackTitle = QString::fromAscii(titlePtr, qstrnlen(titlePtr, 12));
- gbaGamePackCode = QString::fromAscii(codePtr, qstrnlen(codePtr, 4));
- gbaGamePackMaker = QString::fromAscii(makerPtr, qstrnlen(makerPtr, 2));
+ gbaGamePackTitle = QString::fromLocal8Bit(titlePtr, qstrnlen(titlePtr, 12));
+ gbaGamePackCode = QString::fromLocal8Bit(codePtr, qstrnlen(codePtr, 4));
+ gbaGamePackMaker = QString::fromLocal8Bit(makerPtr, qstrnlen(makerPtr, 2));
loadConfig();
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/nes/cpubase.cpp
^
|
| @@ -82,35 +82,35 @@
const u8 NesCpuBase::addressingModeTable[256] =
{
-/* 0x00 */Impli, IndiX, Impli, IndiX, ZeroP, ZeroP, ZeroP, ZeroP,
+/* 0x00 */Impli, IndiX, Impli, IndiX, ZeroFlagP, ZeroFlagP, ZeroFlagP, ZeroFlagP,
/* 0x08 */Impli, Immed, Accum, Immed, Absol, Absol, Absol, Absol,
/* 0x10 */Relat, IndiY, Impli, IndiY, ZerPX, ZerPX, ZerPX, ZerPX,
/* 0x18 */Impli, AbsoY, Impli, AbsoY, AbsoX, AbsoX, AbsoX, AbsoX,
-/* 0x20 */Absol, IndiX, Impli, IndiX, ZeroP, ZeroP, ZeroP, ZeroP,
+/* 0x20 */Absol, IndiX, Impli, IndiX, ZeroFlagP, ZeroFlagP, ZeroFlagP, ZeroFlagP,
/* 0x28 */Impli, Immed, Accum, Immed, Absol, Absol, Absol, Absol,
/* 0x30 */Relat, IndiY, Impli, IndiY, ZerPX, ZerPX, ZerPX, ZerPX,
/* 0x38 */Impli, AbsoY, Impli, AbsoY, AbsoX, AbsoX, AbsoX, AbsoX,
-/* 0x40 */Impli, IndiX, Impli, IndiX, ZeroP, ZeroP, ZeroP, ZeroP,
+/* 0x40 */Impli, IndiX, Impli, IndiX, ZeroFlagP, ZeroFlagP, ZeroFlagP, ZeroFlagP,
/* 0x48 */Impli, Immed, Accum, Immed, Absol, Absol, Absol, Absol,
/* 0x50 */Relat, IndiY, Impli, IndiY, ZerPX, ZerPX, ZerPX, ZerPX,
/* 0x58 */Impli, AbsoY, Impli, AbsoY, AbsoX, AbsoX, AbsoX, AbsoX,
-/* 0x60 */Impli, IndiX, Impli, IndiX, ZeroP, ZeroP, ZeroP, ZeroP,
+/* 0x60 */Impli, IndiX, Impli, IndiX, ZeroFlagP, ZeroFlagP, ZeroFlagP, ZeroFlagP,
/* 0x68 */Impli, Immed, Accum, Immed, Indir, Absol, Absol, Absol,
/* 0x70 */Relat, IndiY, Impli, IndiY, ZerPX, ZerPX, ZerPX, ZerPX,
/* 0x78 */Impli, AbsoY, Impli, AbsoY, AbsoX, AbsoX, AbsoX, AbsoX,
-/* 0x80 */Immed, IndiX, Immed, IndiX, ZeroP, ZeroP, ZeroP, ZeroP,
+/* 0x80 */Immed, IndiX, Immed, IndiX, ZeroFlagP, ZeroFlagP, ZeroFlagP, ZeroFlagP,
/* 0x88 */Impli, Immed, Impli, Immed, Absol, Absol, Absol, Absol,
/* 0x90 */Relat, IndiY, Impli, IndiY, ZerPX, ZerPX, ZerPY, ZerPY,
/* 0x98 */Impli, AbsoY, Impli, AbsoY, AbsoX, AbsoX, AbsoY, AbsoY,
-/* 0xa0 */Immed, IndiX, Immed, IndiX, ZeroP, ZeroP, ZeroP, ZeroP,
+/* 0xa0 */Immed, IndiX, Immed, IndiX, ZeroFlagP, ZeroFlagP, ZeroFlagP, ZeroFlagP,
/* 0xa8 */Impli, Immed, Impli, Immed, Absol, Absol, Absol, Absol,
/* 0xb0 */Relat, IndiY, Impli, IndiY, ZerPX, ZerPX, ZerPY, ZerPY,
/* 0xb8 */Impli, AbsoY, Impli, AbsoY, AbsoX, AbsoX, AbsoY, AbsoY,
-/* 0xc0 */Immed, IndiX, Immed, IndiX, ZeroP, ZeroP, ZeroP, ZeroP,
+/* 0xc0 */Immed, IndiX, Immed, IndiX, ZeroFlagP, ZeroFlagP, ZeroFlagP, ZeroFlagP,
/* 0xc8 */Impli, Immed, Impli, Immed, Absol, Absol, Absol, Absol,
/* 0xd0 */Relat, IndiY, Impli, IndiY, ZerPX, ZerPX, ZerPX, ZerPX,
/* 0xd8 */Impli, AbsoY, Impli, AbsoY, AbsoX, AbsoX, AbsoX, AbsoX,
-/* 0xe0 */Immed, IndiX, Immed, IndiX, ZeroP, ZeroP, ZeroP, ZeroP,
+/* 0xe0 */Immed, IndiX, Immed, IndiX, ZeroFlagP, ZeroFlagP, ZeroFlagP, ZeroFlagP,
/* 0xe8 */Impli, Immed, Impli, Immed, Absol, Absol, Absol, Absol,
/* 0xf0 */Relat, IndiY, Impli, IndiY, ZerPX, ZerPX, ZerPX, ZerPX,
/* 0xf8 */Impli, AbsoY, Impli, AbsoY, AbsoX, AbsoX, AbsoX, AbsoX
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/nes/cpubase.h
^
|
| @@ -63,14 +63,14 @@
Indir,
IndiX,
IndiY,
- ZeroP,
+ ZeroFlagP,
ZerPX,
ZerPY
};
enum StatusFlag {
Carry = 0x01, // carry
- Zero = 0x02, // zero
+ ZeroFlag = 0x02, // zero
IrqDisable = 0x04, // irq disable
Decimal = 0x08, // decimal mode (not supported on the 2A03)
Break = 0x10, // break command (software interrupt)
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/nes/cpuint.cpp
^
|
| @@ -24,7 +24,7 @@
#endif
static const int C = NesCpuBase::Carry;
-static const int Z = NesCpuBase::Zero;
+static const int Z = NesCpuBase::ZeroFlag;
static const int I = NesCpuBase::IrqDisable;
static const int D = NesCpuBase::Decimal;
static const int B = NesCpuBase::Break;
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/nes/cpurec_flags.h
^
|
| @@ -40,7 +40,7 @@
inline void NesCpuTranslator::mSetExternalFlag(int flag, bool on)
{
Q_ASSERT(!(flag & (NesCpuBase::Negative|NesCpuBase::Overflow|
- NesCpuBase::Zero|NesCpuBase::Carry)));
+ NesCpuBase::ZeroFlag|NesCpuBase::Carry)));
if (on)
__ orr(mFlags, mFlags, Operand(flag));
else
@@ -66,7 +66,7 @@
__ mov(reg, mFlags);
__ orr(reg, reg, Operand(NesCpuBase::Negative), LeaveCC, mi);
__ orr(reg, reg, Operand(NesCpuBase::Overflow), LeaveCC, vs);
- __ orr(reg, reg, Operand(NesCpuBase::Zero), LeaveCC, eq);
+ __ orr(reg, reg, Operand(NesCpuBase::ZeroFlag), LeaveCC, eq);
__ orr(reg, reg, Operand(NesCpuBase::Carry), LeaveCC, cs);
}
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/nes/nes.pro
^
|
| @@ -129,7 +129,6 @@
SOURCES += \
ppu.cpp \
- ppu_neon.S \
mapper.cpp \
disk.cpp \
apu.cpp \
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/pico/mp3player.cpp
^
|
| @@ -30,7 +30,7 @@
{
if (!m_pipeline)
return;
- m_mp3Name = QString("file://%1").arg(fileName).toAscii();
+ m_mp3Name = QString("file://%1").arg(fileName).toLocal8Bit();
g_object_set(G_OBJECT(m_pipeline), "uri", m_mp3Name.constData(), NULL);
m_started = true;
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/psx/psx.cpp
^
|
| @@ -177,7 +177,7 @@
QString PsxEmu::setDisk(const QString &path) {
SetCdOpenCaseTime(time(0) + 2);
- SetIsoFile(path.toAscii().constData());
+ SetIsoFile(path.toLocal8Bit().constData());
if (!psxThread.isRunning()) {
if (CDR_open() < 0)
return tr("Could not open CD-ROM.");
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/psx/psx.pro
^
|
| @@ -1,5 +1,7 @@
include(../emu.pri)
+LIBS += -lz
+
HEADERS += \
ppf.h \
misc.h \
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/psx/sio.cpp
^
|
| @@ -412,9 +412,9 @@
ptr = memory + block * 128;
info.flags = *ptr;
ptr += 10;
- info.id = QString::fromAscii((const char *)ptr, 12);
+ info.id = QString::fromLocal8Bit((const char *)ptr, 12);
ptr += 12;
- info.name = QString::fromAscii((const char *)ptr, 16);
+ info.name = QString::fromLocal8Bit((const char *)ptr, 16);
ptr = memory + block * BlockSize + 4;
QTextCodec *codec = QTextCodec::codecForName("Shift-JIS");
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/snes/65c816.h
^
|
| @@ -58,7 +58,7 @@
#define PH P.B.h
#define Carry 1
-#define Zero 2
+#define ZeroFlag 2
#define IRQ 4
#define Decimal 8
#define IndexFlag 16
@@ -69,8 +69,8 @@
#define ClearCarry() (ICPU._Carry = 0)
#define SetCarry() (ICPU._Carry = 1)
-#define SetZero() (ICPU._Zero = 0)
-#define ClearZero() (ICPU._Zero = 1)
+#define SetZeroFlag() (ICPU._ZeroFlag = 0)
+#define ClearZeroFlag() (ICPU._ZeroFlag = 1)
#define SetIRQ() (Registers.PL |= IRQ)
#define ClearIRQ() (Registers.PL &= ~IRQ)
#define SetDecimal() (Registers.PL |= Decimal)
@@ -84,7 +84,7 @@
#define SetNegative() (ICPU._Negative = 0x80)
#define ClearNegative() (ICPU._Negative = 0)
-#define CheckZero() (ICPU._Zero == 0)
+#define CheckZeroFlag() (ICPU._ZeroFlag == 0)
#define CheckCarry() (ICPU._Carry)
#define CheckIRQ() (Registers.PL & IRQ)
#define CheckDecimal() (Registers.PL & Decimal)
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/snes/cpu.cpp
^
|
| @@ -128,7 +128,7 @@
S9xResetSuperFX ();
#endif
- ZeroMemory (Memory.FillRAM, 0x8000);
+ ZeroFlagMemory (Memory.FillRAM, 0x8000);
memset (Memory.VRAM, 0x00, 0x10000);
memset (Memory.RAM, 0x55, 0x20000);
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/snes/cpu.h
^
|
| @@ -64,7 +64,7 @@
#ifndef CPU_ASM
u8 *Speed;
u8 _Carry;
- u8 _Zero;
+ u8 _ZeroFlag;
u8 _Negative;
u8 _Overflow;
struct SOpcodes *S9xOpcodes;
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/snes/cpumacro.h
^
|
| @@ -43,13 +43,13 @@
STATIC inline void SetZN16 (uint16 Work)
{
- ICPU._Zero = Work != 0;
+ ICPU._ZeroFlag = Work != 0;
ICPU._Negative = (uint8) (Work >> 8);
}
STATIC inline void SetZN8 (uint8 Work)
{
- ICPU._Zero = Work;
+ ICPU._ZeroFlag = Work;
ICPU._Negative = Work;
}
@@ -241,7 +241,7 @@
Work16 = S9xGetWord (OpAddress);
ICPU._Overflow = (Work16 & 0x4000) != 0;
ICPU._Negative = (uint8) (Work16 >> 8);
- ICPU._Zero = (Work16 & Registers.A.W) != 0;
+ ICPU._ZeroFlag = (Work16 & Registers.A.W) != 0;
}
STATIC inline void BIT8 ()
@@ -249,7 +249,7 @@
Work8 = S9xGetByte (OpAddress);
ICPU._Overflow = (Work8 & 0x40) != 0;
ICPU._Negative = Work8;
- ICPU._Zero = Work8 & Registers.AL;
+ ICPU._ZeroFlag = Work8 & Registers.AL;
}
STATIC inline void CMP16 ()
@@ -780,7 +780,7 @@
CPU.Cycles += ONE_CYCLE;
#endif
Work16 = S9xGetWord (OpAddress);
- ICPU._Zero = (Work16 & Registers.A.W) != 0;
+ ICPU._ZeroFlag = (Work16 & Registers.A.W) != 0;
Work16 |= Registers.A.W;
S9xSetWord (Work16, OpAddress);
}
@@ -791,7 +791,7 @@
CPU.Cycles += ONE_CYCLE;
#endif
Work8 = S9xGetByte (OpAddress);
- ICPU._Zero = Work8 & Registers.AL;
+ ICPU._ZeroFlag = Work8 & Registers.AL;
Work8 |= Registers.AL;
S9xSetByte (Work8, OpAddress);
}
@@ -802,7 +802,7 @@
CPU.Cycles += ONE_CYCLE;
#endif
Work16 = S9xGetWord (OpAddress);
- ICPU._Zero = (Work16 & Registers.A.W) != 0;
+ ICPU._ZeroFlag = (Work16 & Registers.A.W) != 0;
Work16 &= ~Registers.A.W;
S9xSetWord (Work16, OpAddress);
}
@@ -813,7 +813,7 @@
CPU.Cycles += ONE_CYCLE;
#endif
Work8 = S9xGetByte (OpAddress);
- ICPU._Zero = Work8 & Registers.AL;
+ ICPU._ZeroFlag = Work8 & Registers.AL;
Work8 &= ~Registers.AL;
S9xSetByte (Work8, OpAddress);
}
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/snes/cpuops.cpp
^
|
| @@ -509,7 +509,7 @@
/* BIT *************************************************************************************** */
static void Op89M1 (void)
{
- ICPU._Zero = Registers.AL & *CPU.PC++;
+ ICPU._ZeroFlag = Registers.AL & *CPU.PC++;
#ifdef VAR_CYCLES
CPU.Cycles += CPU.MemSpeed;
#endif
@@ -518,9 +518,9 @@
static void Op89M0 (void)
{
#ifdef FAST_LSB_WORD_ACCESS
- ICPU._Zero = (Registers.A.W & *(uint16 *) CPU.PC) != 0;
+ ICPU._ZeroFlag = (Registers.A.W & *(uint16 *) CPU.PC) != 0;
#else
- ICPU._Zero = (Registers.A.W & (*CPU.PC + (*(CPU.PC + 1) << 8))) != 0;
+ ICPU._ZeroFlag = (Registers.A.W & (*CPU.PC + (*(CPU.PC + 1) << 8))) != 0;
#endif
#ifdef VAR_CYCLES
CPU.Cycles += CPU.MemSpeedx2;
@@ -2599,7 +2599,7 @@
{
Relative ();
BranchCheck2 ();
- if (CheckZero ())
+ if (CheckZeroFlag ())
{
CPU.PC = CPU.PCBase + OpAddress;
#ifdef VAR_CYCLES
@@ -2637,7 +2637,7 @@
{
Relative ();
BranchCheck1 ();
- if (!CheckZero ())
+ if (!CheckZeroFlag ())
{
CPU.PC = CPU.PCBase + OpAddress;
@@ -3772,7 +3772,7 @@
ICPU._Carry &= Work8;
ICPU._Overflow &= (Work8 >> 6);
ICPU._Negative &= Work8;
- ICPU._Zero |= ~Work8 & Zero;
+ ICPU._ZeroFlag |= ~Work8 & ZeroFlag;
#ifdef VAR_CYCLES
CPU.Cycles += CPU.MemSpeed + ONE_CYCLE;
@@ -3798,8 +3798,8 @@
ICPU._Carry |= Work8 & 1;
ICPU._Overflow |= (Work8 >> 6) & 1;
ICPU._Negative |= Work8;
- if (Work8 & Zero)
- ICPU._Zero = 0;
+ if (Work8 & ZeroFlag)
+ ICPU._ZeroFlag = 0;
#ifdef VAR_CYCLES
CPU.Cycles += CPU.MemSpeed + ONE_CYCLE;
#endif
@@ -4042,7 +4042,7 @@
return;
case 0xD0: //BNE
BranchCheck1 ();
- if (!CheckZero ()) {
+ if (!CheckZeroFlag ()) {
CPU.PC = CPU.PCBase + OpAddress;
#ifdef VAR_CYCLES
CPU.Cycles += ONE_CYCLE;
@@ -4056,7 +4056,7 @@
return;
case 0xF0: //BEQ
BranchCheck2 ();
- if (CheckZero ()) {
+ if (CheckZeroFlag ()) {
CPU.PC = CPU.PCBase + OpAddress;
#ifdef VAR_CYCLES
CPU.Cycles += ONE_CYCLE;
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/snes/dsp1emu.c
^
|
| @@ -291,7 +291,7 @@
void DSP1_Inverse(short Coefficient, short Exponent, short *iCoefficient, short *iExponent)
{
- // Step One: Division by Zero
+ // Step One: Division by ZeroFlag
if (Coefficient == 0x0000)
{
*iCoefficient = 0x7fff;
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/snes/fxemu.cpp
^
|
| @@ -261,7 +261,7 @@
GSU.vCacheBaseReg |= ((u32)p[GSU_CBR+1]) << 8;
/* Update status register variables */
- GSU.vZero = !(GSU.vStatusReg & FLG_Z);
+ GSU.vZeroFlag = !(GSU.vStatusReg & FLG_Z);
GSU.vSign = (GSU.vStatusReg & FLG_S) << 12;
GSU.vOverflow = (GSU.vStatusReg & FLG_OV) << 16;
GSU.vCarry = (GSU.vStatusReg & FLG_CY) >> 2;
@@ -450,7 +450,7 @@
}
/* Update status register */
- if( USEX16(GSU.vZero) == 0 ) SF(Z);
+ if( USEX16(GSU.vZeroFlag) == 0 ) SF(Z);
else CF(Z);
if( GSU.vSign & 0x8000 ) SF(S);
else CF(S);
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/snes/fxinst.cpp
^
|
| @@ -172,7 +172,7 @@
v = USEX16(SREG) >> 1;
R15++; DREG = v;
GSU.vSign = v;
- GSU.vZero = v;
+ GSU.vZeroFlag = v;
TESTR14;
CLRFLAGS;
}
@@ -184,7 +184,7 @@
GSU.vCarry = (SREG >> 15) & 1;
R15++; DREG = v;
GSU.vSign = v;
- GSU.vZero = v;
+ GSU.vZeroFlag = v;
TESTR14;
CLRFLAGS;
}
@@ -196,7 +196,7 @@
#define BRA_COND(cond) u8 v = PIPE; R15++; FETCHPIPE; if(cond) R15 += SEX8(v); else R15++;
#define TEST_S (GSU.vSign & 0x8000)
-#define TEST_Z (USEX16(GSU.vZero) == 0)
+#define TEST_Z (USEX16(GSU.vZeroFlag) == 0)
#define TEST_OV (GSU.vOverflow >= 0x8000 || GSU.vOverflow < -0x8000)
#define TEST_CY (GSU.vCarry & 1)
@@ -317,7 +317,7 @@
/* 3c - loop - decrement loop counter, and branch on not zero */
static void fx_loop()
{
- GSU.vSign = GSU.vZero = --R12;
+ GSU.vSign = GSU.vZeroFlag = --R12;
if( (u16) R12 != 0 )
R15 = R13;
else
@@ -584,7 +584,7 @@
u32 v = (((u32)c)<<8)|((u32)d);
R15++; DREG = v;
GSU.vSign = v;
- GSU.vZero = v;
+ GSU.vZeroFlag = v;
TESTR14;
CLRFLAGS;
}
@@ -630,7 +630,7 @@
u32 v = ~SREG;
R15++; DREG = v;
GSU.vSign = v;
- GSU.vZero = v;
+ GSU.vZeroFlag = v;
TESTR14;
CLRFLAGS;
}
@@ -641,7 +641,7 @@
GSU.vCarry = s >= 0x10000; \
GSU.vOverflow = ~(SREG ^ GSU.avReg[reg]) & (GSU.avReg[reg] ^ s) & 0x8000; \
GSU.vSign = s; \
-GSU.vZero = s; \
+GSU.vZeroFlag = s; \
R15++; DREG = s; \
TESTR14; \
CLRFLAGS
@@ -668,7 +668,7 @@
GSU.vCarry = s >= 0x10000; \
GSU.vOverflow = ~(SREG ^ GSU.avReg[reg]) & (GSU.avReg[reg] ^ s) & 0x8000; \
GSU.vSign = s; \
-GSU.vZero = s; \
+GSU.vZeroFlag = s; \
R15++; DREG = s; \
TESTR14; \
CLRFLAGS
@@ -695,7 +695,7 @@
GSU.vCarry = s >= 0x10000; \
GSU.vOverflow = ~(SREG ^ imm) & (imm ^ s) & 0x8000; \
GSU.vSign = s; \
-GSU.vZero = s; \
+GSU.vZeroFlag = s; \
R15++; DREG = s; \
TESTR14; \
CLRFLAGS
@@ -722,7 +722,7 @@
GSU.vCarry = s >= 0x10000; \
GSU.vOverflow = ~(SREG ^ imm) & (imm ^ s) & 0x8000; \
GSU.vSign = s; \
-GSU.vZero = s; \
+GSU.vZeroFlag = s; \
R15++; DREG = s; \
TESTR14; \
CLRFLAGS
@@ -749,7 +749,7 @@
GSU.vCarry = s >= 0; \
GSU.vOverflow = (SREG ^ GSU.avReg[reg]) & (SREG ^ s) & 0x8000; \
GSU.vSign = s; \
-GSU.vZero = s; \
+GSU.vZeroFlag = s; \
R15++; DREG = s; \
TESTR14; \
CLRFLAGS
@@ -776,7 +776,7 @@
GSU.vCarry = s >= 0; \
GSU.vOverflow = (SREG ^ GSU.avReg[reg]) & (SREG ^ s) & 0x8000; \
GSU.vSign = s; \
-GSU.vZero = s; \
+GSU.vZeroFlag = s; \
R15++; DREG = s; \
TESTR14; \
CLRFLAGS
@@ -803,7 +803,7 @@
GSU.vCarry = s >= 0; \
GSU.vOverflow = (SREG ^ imm) & (SREG ^ s) & 0x8000; \
GSU.vSign = s; \
-GSU.vZero = s; \
+GSU.vZeroFlag = s; \
R15++; DREG = s; \
TESTR14; \
CLRFLAGS
@@ -830,7 +830,7 @@
GSU.vCarry = s >= 0; \
GSU.vOverflow = (SREG ^ GSU.avReg[reg]) & (SREG ^ s) & 0x8000; \
GSU.vSign = s; \
-GSU.vZero = s; \
+GSU.vZeroFlag = s; \
R15++; \
CLRFLAGS;
static void fx_cmp_r0() { FX_CMP(0); }
@@ -856,7 +856,7 @@
u32 v = (R7&0xff00) | ((R8&0xff00)>>8);
R15++; DREG = v;
GSU.vOverflow = (v & 0xc0c0) << 16;
- GSU.vZero = !(v & 0xf0f0);
+ GSU.vZeroFlag = !(v & 0xf0f0);
GSU.vSign = ((v | (v<<8)) & 0x8000);
GSU.vCarry = (v & 0xe0e0) != 0;
TESTR14;
@@ -868,7 +868,7 @@
u32 v = SREG & GSU.avReg[reg]; \
R15++; DREG = v; \
GSU.vSign = v; \
-GSU.vZero = v; \
+GSU.vZeroFlag = v; \
TESTR14; \
CLRFLAGS;
static void fx_and_r1() { FX_AND(1); }
@@ -892,7 +892,7 @@
u32 v = SREG & ~GSU.avReg[reg]; \
R15++; DREG = v; \
GSU.vSign = v; \
-GSU.vZero = v; \
+GSU.vZeroFlag = v; \
TESTR14; \
CLRFLAGS;
static void fx_bic_r1() { FX_AND(1); }
@@ -916,7 +916,7 @@
u32 v = SREG & imm; \
R15++; DREG = v; \
GSU.vSign = v; \
-GSU.vZero = v; \
+GSU.vZeroFlag = v; \
TESTR14; \
CLRFLAGS;
static void fx_and_i1() { FX_AND_I(1); }
@@ -940,7 +940,7 @@
u32 v = SREG & ~imm; \
R15++; DREG = v; \
GSU.vSign = v; \
-GSU.vZero = v; \
+GSU.vZeroFlag = v; \
TESTR14; \
CLRFLAGS;
static void fx_bic_i1() { FX_BIC_I(1); }
@@ -964,7 +964,7 @@
u32 v = (u32)(SEX8(SREG) * SEX8(GSU.avReg[reg])); \
R15++; DREG = v; \
GSU.vSign = v; \
-GSU.vZero = v; \
+GSU.vZeroFlag = v; \
TESTR14; \
CLRFLAGS;
static void fx_mult_r0() { FX_MULT(0); }
@@ -989,7 +989,7 @@
u32 v = USEX8(SREG) * USEX8(GSU.avReg[reg]); \
R15++; DREG = v; \
GSU.vSign = v; \
-GSU.vZero = v; \
+GSU.vZeroFlag = v; \
TESTR14; \
CLRFLAGS;
static void fx_umult_r0() { FX_UMULT(0); }
@@ -1014,7 +1014,7 @@
u32 v = (u32) (SEX8(SREG) * ((s32)imm)); \
R15++; DREG = v; \
GSU.vSign = v; \
-GSU.vZero = v; \
+GSU.vZeroFlag = v; \
TESTR14; \
CLRFLAGS;
static void fx_mult_i0() { FX_MULT_I(0); }
@@ -1039,7 +1039,7 @@
u32 v = USEX8(SREG) * ((u32)imm); \
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/snes/fxinst.h
^
|
| @@ -136,7 +136,7 @@
*
* SFR status flag register bits:
* 0 -
- * 1 Z Zero flag
+ * 1 Z ZeroFlag flag
* 2 CY Carry flag
* 3 S Sign flag
* 4 OV Overflow flag
@@ -237,7 +237,7 @@
/* status register optimization stuff */
u32 vSign; /* v & 0x8000 */
- u32 vZero; /* v == 0 */
+ u32 vZeroFlag; /* v == 0 */
u32 vCarry; /* a value of 1 or 0 */
s32 vOverflow; /* (v >= 0x8000 || v < -0x8000) */
@@ -351,7 +351,7 @@
#define SUSEX16(a) ((s32)((u16)(a)))
-/* Set/Clr Sign and Zero flag */
+/* Set/Clr Sign and ZeroFlag flag */
#define TSZ(num) TS(S, (num & 0x8000)); TS(Z, (!USEX16(num)) )
/* Clear flags */
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/snes/gfx.cpp
^
|
| @@ -386,8 +386,8 @@
}
}
}
- ZeroMemory (GFX.ZERO, 0x10000 * sizeof (u16));
- ZeroMemory (GFX.ZERO_OR_X2, 0x10000 * sizeof (u16));
+ ZeroFlagMemory (GFX.ZERO, 0x10000 * sizeof (u16));
+ ZeroFlagMemory (GFX.ZERO_OR_X2, 0x10000 * sizeof (u16));
// Build a lookup table that if the top bit of the color value is zero
// then the value is zero, otherwise multiply the value by 2. Used by
// the color subtraction code.
@@ -3084,9 +3084,9 @@
for (u32 y = starty; y <= endy; y++)
{
- ZeroMemory (GFX.SubZBuffer + y * GFX.ZPitch,
+ ZeroFlagMemory (GFX.SubZBuffer + y * GFX.ZPitch,
IPPU.RenderedScreenWidth);
- ZeroMemory (GFX.ZBuffer + y * GFX.ZPitch,
+ ZeroFlagMemory (GFX.ZBuffer + y * GFX.ZPitch,
IPPU.RenderedScreenWidth);
if (IPPU.Clip [0].Count [5])
@@ -3174,7 +3174,7 @@
{
for (u32 y = starty; y <= endy; y++)
{
- ZeroMemory (GFX.ZBuffer + y * GFX.ZPitch,
+ ZeroFlagMemory (GFX.ZBuffer + y * GFX.ZPitch,
IPPU.RenderedScreenWidth);
memset (GFX.SubZBuffer + y * GFX.ZPitch, 1,
IPPU.RenderedScreenWidth);
@@ -3661,12 +3661,12 @@
else // Settings.SixteenBit == false
{
// because we are in 8 bit we can just use 0 to clear the screen
- // this means we can use the Zero Memory function
+ // this means we can use the ZeroFlag Memory function
// Loop through all lines being updated and clear the pixels to 0
for (u32 y = starty; y <= endy; y++)
{
- ZeroMemory (GFX.Screen + y * GFX.Pitch2,
+ ZeroFlagMemory (GFX.Screen + y * GFX.Pitch2,
IPPU.RenderedScreenWidth);
}
}
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/snes/mem.cpp
^
|
| @@ -199,9 +199,9 @@
SuperFX.nRomBanks = (2 * 1024 * 1024) / (32 * 1024);
SuperFX.pvRom = (u8 *) ROM;
- ZeroMemory (IPPU.TileCached [TILE_2BIT], MAX_2BIT_TILES);
- ZeroMemory (IPPU.TileCached [TILE_4BIT], MAX_4BIT_TILES);
- ZeroMemory (IPPU.TileCached [TILE_8BIT], MAX_8BIT_TILES);
+ ZeroFlagMemory (IPPU.TileCached [TILE_2BIT], MAX_2BIT_TILES);
+ ZeroFlagMemory (IPPU.TileCached [TILE_4BIT], MAX_4BIT_TILES);
+ ZeroFlagMemory (IPPU.TileCached [TILE_8BIT], MAX_8BIT_TILES);
SDD1Data = NULL;
SDD1Index = NULL;
@@ -438,7 +438,7 @@
}
CalculatedSize = (TotalFileSize / 0x2000) * 0x2000;
- ZeroMemory (ROM + CalculatedSize, MAX_ROM_SIZE - CalculatedSize);
+ ZeroFlagMemory (ROM + CalculatedSize, MAX_ROM_SIZE - CalculatedSize);
// Check for cherryroms.com DAIKAIJYUMONOGATARI2
@@ -535,7 +535,7 @@
}
LoROM = TRUE;
HiROM = FALSE;
- ZeroMemory (ROM + CalculatedSize, MAX_ROM_SIZE - CalculatedSize);
+ ZeroFlagMemory (ROM + CalculatedSize, MAX_ROM_SIZE - CalculatedSize);
}
}
@@ -712,8 +712,8 @@
Settings.SDD1 = FALSE;
Settings.SRTC = FALSE;
- ZeroMemory (BlockIsRAM, MEMMAP_NUM_BLOCKS);
- ZeroMemory (BlockIsROM, MEMMAP_NUM_BLOCKS);
+ ZeroFlagMemory (BlockIsRAM, MEMMAP_NUM_BLOCKS);
+ ZeroFlagMemory (BlockIsROM, MEMMAP_NUM_BLOCKS);
::SRAM = SRAM;
memset (ROMId, 0, 5);
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/snes/os9x_65c816.S
^
|
| @@ -46,7 +46,7 @@
/*
.equ Carry 1
-.equ Zero 2
+.equ ZeroFlag 2
.equ IRQ 4
.equ Decimal 8
.equ IndexFlag 16
@@ -701,7 +701,7 @@
B asmS9xSetWord
MOV R0,R0
.endm
-.macro S9xSetWordZero
+.macro S9xSetWordZeroFlag
@ in : rscratch=address (0x00hhmmll)
MOV R1,#0
STMFD R13!,{PC} @ Push return address
@@ -734,7 +734,7 @@
LOAD_REGS
.endm
*/
-.macro S9xSetByteZero
+.macro S9xSetByteZeroFlag
@ in : rscratch=address (0x00hhmmll)
MOV R1,#0
STMFD R13!,{PC} @ Push return address
@@ -2045,15 +2045,15 @@
ORRCS rstatus, rstatus, #MASK_CARRY @ 1 : OR mask 00000100000 : set C to one
.endm
.macro UPDATE_Z
- @ NE : ARM Zero Clear
+ @ NE : ARM ZeroFlag Clear
BICNE rstatus, rstatus, #MASK_ZERO @ 0 : AND mask 11111011111 : set Z to zero
- @ EQ : ARM Zero Set
+ @ EQ : ARM ZeroFlag Set
ORREQ rstatus, rstatus, #MASK_ZERO @ 1 : OR mask 00000100000 : set Z to one
.endm
.macro UPDATE_ZN
- @ NE : ARM Zero Clear
+ @ NE : ARM ZeroFlag Clear
BICNE rstatus, rstatus, #MASK_ZERO @ 0 : AND mask 11111011111 : set Z to zero
- @ EQ : ARM Zero Set
+ @ EQ : ARM ZeroFlag Set
ORREQ rstatus, rstatus, #MASK_ZERO @ 1 : OR mask 00000100000 : set Z to one
@ PL : ARM Neg Clear
BICPL rstatus, rstatus, #MASK_NEG @ 0 : AND mask 11111011111 : set N to zero
@@ -2286,7 +2286,7 @@
ORRMI rstatus, rstatus, #MASK_OVERFLOW @ 1 : OR mask 00000100000 : set N to one
@ Now do a real AND with A register
- @ Set Zero Flag, bit test
+ @ Set ZeroFlag Flag, bit test
ANDS rscratch2, reg_a, rscratch
BICNE rstatus, rstatus, #MASK_ZERO @ 0 : AND mask 11111011111 : set Z to zero
ORREQ rstatus, rstatus, #MASK_ZERO @ 1 : OR mask 00000100000 : set Z to one
@@ -2304,7 +2304,7 @@
BICPL rstatus, rstatus, #MASK_OVERFLOW @ 0 : AND mask 11111011111 : set V to zero
ORRMI rstatus, rstatus, #MASK_OVERFLOW @ 1 : OR mask 00000100000 : set V to one
@ Now do a real AND with A register
- @ Set Zero Flag, bit test
+ @ Set ZeroFlag Flag, bit test
ANDS rscratch2, reg_a, rscratch
@ Bit set ->Z=0->xxxNE Clear flag
BICNE rstatus, rstatus, #MASK_ZERO @ 0 : AND mask 11111011111 : set Z to zero
@@ -2457,7 +2457,7 @@
.macro A_LSR16
BIC rstatus, rstatus, #MASK_NEG @ 0 : AND mask 11111011111 : set N to zero
MOVS reg_a, reg_a, LSR #17 @ hhhhhhhh llllllll 00000000 00000000 -> 00000000 00000000 0hhhhhhh hlllllll
- @ Update Zero
+ @ Update ZeroFlag
BICNE rstatus, rstatus, #MASK_ZERO @ 0 : AND mask 11111011111 : set Z to zero
MOV reg_a, reg_a, LSL #16 @ -> 0lllllll 00000000 00000000 00000000
ORREQ rstatus, rstatus, #MASK_ZERO @ 1 : OR mask 00000100000 : set Z to one
@@ -2469,7 +2469,7 @@
.macro A_LSR8
BIC rstatus, rstatus, #MASK_NEG @ 0 : AND mask 11111011111 : set N to zero
MOVS reg_a, reg_a, LSR #25 @ llllllll 00000000 00000000 00000000 -> 00000000 00000000 00000000 0lllllll
- @ Update Zero
+ @ Update ZeroFlag
BICNE rstatus, rstatus, #MASK_ZERO @ 0 : AND mask 11111011111 : set Z to zero
MOV reg_a, reg_a, LSL #24 @ -> 00000000 00000000 00000000 0lllllll
ORREQ rstatus, rstatus, #MASK_ZERO @ 1 : OR mask 00000100000 : set Z to one
@@ -2486,7 +2486,7 @@
@ Update Carry
BICCC rstatus, rstatus, #MASK_CARRY @ 0 : AND mask 11111011111 : set C to zero
ORRCS rstatus, rstatus, #MASK_CARRY @ 1 : OR mask 00000100000 : set C to one
- @ Update Zero
+ @ Update ZeroFlag
BICNE rstatus, rstatus, #MASK_ZERO @ 0 : AND mask 11111011111 : set Z to zero
ORREQ rstatus, rstatus, #MASK_ZERO @ 1 : OR mask 00000100000 : set Z to one
S9xSetWordLow rscratch2
@@ -2500,7 +2500,7 @@
@ Update Carry
BICCC rstatus, rstatus, #MASK_CARRY @ 0 : AND mask 11111011111 : set C to zero
ORRCS rstatus, rstatus, #MASK_CARRY @ 1 : OR mask 00000100000 : set C to one
- @ Update Zero
+ @ Update ZeroFlag
BICNE rstatus, rstatus, #MASK_ZERO @ 0 : AND mask 11111011111 : set Z to zero
ORREQ rstatus, rstatus, #MASK_ZERO @ 1 : OR mask 00000100000 : set Z to one
S9xSetByteLow rscratch2
@@ -2782,10 +2782,10 @@
S9xSetByte reg_y
.endm
.macro STZ16
- S9xSetWordZero
+ S9xSetWordZeroFlag
.endm
.macro STZ8
- S9xSetByteZero
+ S9xSetByteZeroFlag
.endm
.macro TSB16
S9xGetWordRegNS rscratch2
@@ -4536,7 +4536,7 @@
BEQ CPUFlagsIRQ_PENDING_FLAG_cleared
LDR rscratch2,[reg_cpu_var,#IRQCycleCount_ofs]
MOVS rscratch2,rscratch2
- BNE CPUIRQCycleCount_NotZero
+ BNE CPUIRQCycleCount_NotZeroFlag
LDRB rscratch2,[reg_cpu_var,#WaitingForInterrupt_ofs]
MOVS rscratch2,rscratch2
BEQ NotCPUaitingForInterruptIRQ
@@ -4556,7 +4556,7 @@
BIC rscratch,rscratch,#IRQ_PENDING_FLAG
STR rscratch,[reg_cpu_var,#Flags_ofs]
B CPUFlagsIRQ_PENDING_FLAG_cleared
-CPUIRQCycleCount_NotZero:
+CPUIRQCycleCount_NotZeroFlag:
SUB rscratch2,rscratch2,#1
STR rscratch2,[reg_cpu_var,#IRQCycleCount_ofs]
CPUFlagsIRQ_PENDING_FLAG_cleared:
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/snes/port.h
^
|
| @@ -103,7 +103,7 @@
#define _MAX_PATH PATH_MAX
-#define ZeroMemory(a,b) memset((a),0,(b))
+#define ZeroFlagMemory(a,b) memset((a),0,(b))
#define SLASH_STR "\\"
#define SLASH_CHAR '\\'
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/snes/ppu.cpp
^
|
| @@ -2306,7 +2306,7 @@
PPU.OBJNameBase = 0;
PPU.OBJAddition = FALSE;
PPU.OAMReadFlip = 0;
- ZeroMemory (PPU.OAMData, 512 + 32);
+ ZeroFlagMemory (PPU.OAMData, 512 + 32);
PPU.VTimerEnabled = FALSE;
PPU.HTimerEnabled = FALSE;
@@ -2337,9 +2337,9 @@
IPPU.FrameCount = 0;
IPPU.RenderedFramesCount = 0;
IPPU.DisplayedRenderedFrameCount = 0;
- ZeroMemory(IPPU.TileCached[TILE_2BIT], MAX_2BIT_TILES);
- ZeroMemory(IPPU.TileCached[TILE_4BIT], MAX_4BIT_TILES);
- ZeroMemory(IPPU.TileCached[TILE_8BIT], MAX_8BIT_TILES);
+ ZeroFlagMemory(IPPU.TileCached[TILE_2BIT], MAX_2BIT_TILES);
+ ZeroFlagMemory(IPPU.TileCached[TILE_4BIT], MAX_4BIT_TILES);
+ ZeroFlagMemory(IPPU.TileCached[TILE_8BIT], MAX_8BIT_TILES);
IPPU.FirstVRAMRead = FALSE;
IPPU.LatchedInterlace = FALSE;
IPPU.DoubleWidthPixels = FALSE;
@@ -2374,11 +2374,11 @@
for (c = 0; c < 0x8000; c += 0x100)
memset (&Memory.FillRAM [c], c >> 8, 0x100);
- ZeroMemory (&Memory.FillRAM [0x2100], 0x100);
- ZeroMemory (&Memory.FillRAM [0x4200], 0x100);
- ZeroMemory (&Memory.FillRAM [0x4000], 0x100);
+ ZeroFlagMemory (&Memory.FillRAM [0x2100], 0x100);
+ ZeroFlagMemory (&Memory.FillRAM [0x4200], 0x100);
+ ZeroFlagMemory (&Memory.FillRAM [0x4000], 0x100);
// For BS Suttehakkun 2...
- ZeroMemory (&Memory.FillRAM [0x1000], 0x1000);
+ ZeroFlagMemory (&Memory.FillRAM [0x1000], 0x1000);
}
void S9xProcessMouse (int which1)
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/snes/sa1.h
^
|
| @@ -58,7 +58,7 @@
struct SSA1 {
struct SOpcodes *S9xOpcodes;
u8 _Carry;
- u8 _Zero;
+ u8 _ZeroFlag;
u8 _Negative;
u8 _Overflow;
bool8 CPUExecuting;
@@ -101,7 +101,7 @@
#ifdef USE_SA1
-#define SA1CheckZero() (SA1._Zero == 0)
+#define SA1CheckZeroFlag() (SA1._ZeroFlag == 0)
#define SA1CheckCarry() (SA1._Carry)
#define SA1CheckIRQ() (SA1Registers.PL & IRQ)
#define SA1CheckDecimal() (SA1Registers.PL & Decimal)
@@ -142,7 +142,7 @@
STATIC inline void S9xSA1UnpackStatus()
{
- SA1._Zero = (SA1Registers.PL & Zero) == 0;
+ SA1._ZeroFlag = (SA1Registers.PL & ZeroFlag) == 0;
SA1._Negative = (SA1Registers.PL & Negative);
SA1._Carry = (SA1Registers.PL & Carry);
SA1._Overflow = (SA1Registers.PL & Overflow) >> 6;
@@ -150,8 +150,8 @@
STATIC inline void S9xSA1PackStatus()
{
- SA1Registers.PL &= ~(Zero | Negative | Carry | Overflow);
- SA1Registers.PL |= SA1._Carry | ((SA1._Zero == 0) << 1) |
+ SA1Registers.PL &= ~(ZeroFlag | Negative | Carry | Overflow);
+ SA1Registers.PL |= SA1._Carry | ((SA1._ZeroFlag == 0) << 1) |
(SA1._Negative & 0x80) | (SA1._Overflow << 6);
}
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/snes/snes.cpp
^
|
| @@ -8,7 +8,9 @@
#include "dma.h"
#include "sdd1.h"
#include <base/emuview.h>
-#include <QApplication>
+#include <QGuiApplication>
+//#include <QQuickView>
+//#include <sailfishapp.h>
// TODO set sound enabled
@@ -24,7 +26,7 @@
void setDefaultSettings() {
// try to start emu
- ZeroMemory (&Settings, sizeof (Settings));
+ ZeroFlagMemory (&Settings, sizeof (Settings));
Settings.CyclesPercentage = 100;
Settings.DisableSoundEcho = FALSE;
@@ -207,7 +209,7 @@
}
QString SnesEmu::setDisk(const QString &path) {
- if (!Memory.LoadROM(path.toAscii().constData()))
+ if (!Memory.LoadROM(path.toLocal8Bit().constData()))
return tr("Load disk failed.");
Memory.ROMFramesPerSecond = Settings.PAL ? 50 : 60;
setFrameRate(Memory.ROMFramesPerSecond);
@@ -294,7 +296,13 @@
int main(int argc, char *argv[]) {
if (argc < 2)
return -1;
- QApplication app(argc, argv);
- EmuView view(&snesEmu, argv[1]);
- return app.exec();
+// QCoreApplication::setAttribute(Qt::AA_X11InitThreads);
+// QApplication app(argc, argv);
+// QGuiApplication *app = SailfishApp::application(argc, argv);
+// QQuickView *view = SailfishApp::createView();
+ QGuiApplication *app = new QGuiApplication(argc, argv);
+ QQuickView *view = new QQuickView();
+
+ EmuView emuView(&snesEmu, argv[1], view);
+ return app->exec();
}
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/snes/spc700.cpp
^
|
| @@ -248,10 +248,10 @@
#endif
#define APUSetZN8(b)\
- IAPU._Zero = (b);
+ IAPU._ZeroFlag = (b);
#define APUSetZN16(w)\
- IAPU._Zero = ((w) != 0) | ((w) >> 8);
+ IAPU._ZeroFlag = ((w) != 0) | ((w) >> 8);
void STOP (char *s)
{
@@ -1072,7 +1072,7 @@
{
// BNE
Relative ();
- if (!APUCheckZero ())
+ if (!APUCheckZeroFlag ())
{
IAPU.PC = IAPU.RAM + (u16) Int16;
CPU.APU_Cycles += IAPU.TwoCycles;
@@ -1086,7 +1086,7 @@
{
// BEQ
Relative ();
- if (APUCheckZero ())
+ if (APUCheckZeroFlag ())
{
IAPU.PC = IAPU.RAM + (u16) Int16;
CPU.APU_Cycles += IAPU.TwoCycles;
@@ -2184,7 +2184,7 @@
IAPU.YA.B.Y = IAPU.YA.W % IAPU.X;
IAPU.YA.B.A = Work8;
}
-// XXX How should Overflow, Half Carry, Zero and Negative flags be set??
+// XXX How should Overflow, Half Carry, ZeroFlag and Negative flags be set??
// APUSetZN16 (IAPU.YA.W);
APUSetZN8 (IAPU.YA.B.A);
IAPU.PC++;
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/snes/spc700.h
^
|
| @@ -53,7 +53,7 @@
#define Carry 1
-#define Zero 2
+#define ZeroFlag 2
#define Interrupt 4
#define HalfCarry 8
#define BreakFlag 16
@@ -74,14 +74,14 @@
#define APUSetOverflow() (IAPU._Overflow = 1)
#define APUClearOverflow() (IAPU._Overflow = 0)
-#define APUCheckZero() (IAPU._Zero == 0)
+#define APUCheckZeroFlag() (IAPU._ZeroFlag == 0)
#define APUCheckCarry() (IAPU._Carry)
#define APUCheckInterrupt() (IAPU.P & Interrupt)
#define APUCheckHalfCarry() (IAPU.P & HalfCarry)
#define APUCheckBreak() (IAPU.P & BreakFlag)
#define APUCheckDirectPage() (IAPU.P & DirectPageFlag)
#define APUCheckOverflow() (IAPU._Overflow)
-#define APUCheckNegative() (IAPU._Zero & 0x80)
+#define APUCheckNegative() (IAPU._ZeroFlag & 0x80)
//#define APUClearFlags(f) (IAPU.P &= ~(f))
//#define APUSetFlags(f) (IAPU.P |= (f))
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/snes/spc700/debug/apu.h
^
|
| @@ -75,7 +75,7 @@
uint8 P; // 0x3C flags: NODBHIZC
uint8 pad1;
uint8 pad2;
- uint8 _Zero; // 0x3F Z=0, when this!=0; also stores neg flag in &0x80
+ uint8 _ZeroFlag; // 0x3F Z=0, when this!=0; also stores neg flag in &0x80
uint8 X; // 0x40
uint8 S; // 0x41 stack pointer, default: 0xff
uint16 pad3;
@@ -114,18 +114,18 @@
STATIC inline void S9xAPUUnpackStatus()
{
- IAPU._Zero =((IAPU.P & Zero) == 0) | (IAPU.P & Negative);
+ IAPU._ZeroFlag =((IAPU.P & ZeroFlag) == 0) | (IAPU.P & Negative);
IAPU._Carry = (IAPU.P & Carry);
IAPU._Overflow = (IAPU.P & Overflow);
}
STATIC inline void S9xAPUPackStatus()
{
- IAPU.P &= ~(Zero | Negative | Carry | Overflow);
+ IAPU.P &= ~(ZeroFlag | Negative | Carry | Overflow);
if(IAPU._Carry) IAPU.P |= Carry;
- if(!IAPU._Zero) IAPU.P |= Zero;
+ if(!IAPU._ZeroFlag) IAPU.P |= ZeroFlag;
if(IAPU._Overflow) IAPU.P |= Overflow;
- if(IAPU._Zero & 0x80) IAPU.P |= Negative;
+ if(IAPU._ZeroFlag & 0x80) IAPU.P |= Negative;
}
START_EXTERN_C
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/snes/spc700/debug/port.h
^
|
| @@ -110,7 +110,7 @@
#define _MAX_PATH PATH_MAX
-#define ZeroMemory(a,b) memset((a),0,(b))
+#define ZeroFlagMemory(a,b) memset((a),0,(b))
EXTERN_C void S9xGenerateSound ();
@@ -394,7 +394,7 @@
#define _MAX_EXT PATH_MAX
#define _MAX_PATH PATH_MAX
-#define ZeroMemory(a,b) memset((a),0,(b))
+#define ZeroFlagMemory(a,b) memset((a),0,(b))
#ifndef __WIN32__
void _makepath (char *path, const char *drive, const char *dir, const char *fname, const char *ext);
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/snes/spc700/debug/spc700.cpp
^
|
| @@ -106,10 +106,10 @@
#endif
#define APUSetZN8(b)\
- pIAPU->_Zero = (b);
+ pIAPU->_ZeroFlag = (b);
#define APUSetZN16(w)\
- pIAPU->_Zero = ((w) != 0) | ((w) >> 8);
+ pIAPU->_ZeroFlag = ((w) != 0) | ((w) >> 8);
void STOP (char *s)
{
@@ -930,7 +930,7 @@
{
// BNE
Relative ();
- if (!APUCheckZero ())
+ if (!APUCheckZeroFlag ())
{
pIAPU->PC = pIAPU->RAM + (uint16) Int16;
CPU.APU_Cycles += pIAPU->TwoCycles;
@@ -944,7 +944,7 @@
{
// BEQ
Relative ();
- if (APUCheckZero ())
+ if (APUCheckZeroFlag ())
{
pIAPU->PC = pIAPU->RAM + (uint16) Int16;
CPU.APU_Cycles += pIAPU->TwoCycles;
@@ -2042,7 +2042,7 @@
pIAPU->YA.B.Y = pIAPU->YA.W % pIAPU->X;
pIAPU->YA.B.A = Work8;
}
-// XXX How should Overflow, Half Carry, Zero and Negative flags be set??
+// XXX How should Overflow, Half Carry, ZeroFlag and Negative flags be set??
// APUSetZN16 (pIAPU->YA.W);
APUSetZN8 (pIAPU->YA.B.A);
pIAPU->PC++;
@@ -2566,13 +2566,13 @@
exit(1);
}
- if((IAPU._Zero == 0) != (IAPU2._Zero == 0)) {
- dprintf("!%02X %5i _Zero %02X vs %02X", IAPU.opcode, IAPU.icount, IAPU._Zero, IAPU2._Zero);
+ if((IAPU._ZeroFlag == 0) != (IAPU2._ZeroFlag == 0)) {
+ dprintf("!%02X %5i _ZeroFlag %02X vs %02X", IAPU.opcode, IAPU.icount, IAPU._ZeroFlag, IAPU2._ZeroFlag);
exit(1);
}
- if((IAPU._Zero & 0x80) != (IAPU2._Zero & 0x80)) {
- dprintf("!%02X %5i _Zero(n) %02X vs %02X", IAPU.opcode, IAPU.icount, IAPU._Zero, IAPU2._Zero);
+ if((IAPU._ZeroFlag & 0x80) != (IAPU2._ZeroFlag & 0x80)) {
+ dprintf("!%02X %5i _ZeroFlag(n) %02X vs %02X", IAPU.opcode, IAPU.icount, IAPU._ZeroFlag, IAPU2._ZeroFlag);
exit(1);
}
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/snes/spc700/debug/spc700.h
^
|
| @@ -50,7 +50,7 @@
#define Carry 1
-#define Zero 2
+#define ZeroFlag 2
#define Interrupt 4
#define HalfCarry 8
#define BreakFlag 16
@@ -71,14 +71,14 @@
#define APUSetOverflow() (pIAPU->_Overflow = 1)
#define APUClearOverflow() (pIAPU->_Overflow = 0)
-#define APUCheckZero() (pIAPU->_Zero == 0)
+#define APUCheckZeroFlag() (pIAPU->_ZeroFlag == 0)
#define APUCheckCarry() (pIAPU->_Carry)
#define APUCheckInterrupt() (pIAPU->P & Interrupt)
#define APUCheckHalfCarry() (pIAPU->P & HalfCarry)
#define APUCheckBreak() (pIAPU->P & BreakFlag)
#define APUCheckDirectPage() (pIAPU->P & DirectPageFlag)
#define APUCheckOverflow() (pIAPU->_Overflow)
-#define APUCheckNegative() (pIAPU->_Zero & 0x80)
+#define APUCheckNegative() (pIAPU->_ZeroFlag & 0x80)
//#define APUClearFlags(f) (IAPU.P &= ~(f))
//#define APUSetFlags(f) (IAPU.P |= (f))
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/snes/spu.cpp
^
|
| @@ -414,8 +414,8 @@
memset (IAPU.RAM, Settings.APURAMInitialValue, 0x10000);
//memset (IAPU.ShadowRAM, Settings.APURAMInitialValue, 0x10000);
- //ZeroMemory (IAPU.CachedSamples, 0x40000);
- ZeroMemory (APU.OutPorts, 4);
+ //ZeroFlagMemory (IAPU.CachedSamples, 0x40000);
+ ZeroFlagMemory (APU.OutPorts, 4);
IAPU.DirectPage = IAPU.RAM;
memmove (&IAPU.RAM [0xffc0], APUROM, sizeof (APUROM));
memmove (APU.ExtraRAM, APUROM, sizeof (APUROM));
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/snes/spu.h
^
|
| @@ -71,7 +71,7 @@
u8 P; // 0x3C flags: NODBHIZC
u8 pad1;
u8 pad2;
- u8 _Zero; // 0x3F Z=0, when this!=0; also stores neg flag in &0x80
+ u8 _ZeroFlag; // 0x3F Z=0, when this!=0; also stores neg flag in &0x80
u8 X; // 0x40
u8 S; // 0x41 stack pointer, default: 0xff
u16 pad3;
@@ -100,7 +100,7 @@
STATIC inline void S9xAPUUnpackStatus()
{
- IAPU._Zero =((IAPU.P & Zero) == 0) | (IAPU.P & Negative);
+ IAPU._ZeroFlag =((IAPU.P & ZeroFlag) == 0) | (IAPU.P & Negative);
#ifndef ASM_SPC700
IAPU._Carry = (IAPU.P & Carry);
@@ -111,15 +111,15 @@
STATIC inline void S9xAPUPackStatus()
{
#ifdef ASM_SPC700
- IAPU.P &= ~(Zero | Negative);
- if(!IAPU._Zero) IAPU.P |= Zero;
- if(IAPU._Zero & 0x80) IAPU.P |= Negative;
+ IAPU.P &= ~(ZeroFlag | Negative);
+ if(!IAPU._ZeroFlag) IAPU.P |= ZeroFlag;
+ if(IAPU._ZeroFlag & 0x80) IAPU.P |= Negative;
#else
- IAPU.P &= ~(Zero | Negative | Carry | Overflow);
+ IAPU.P &= ~(ZeroFlag | Negative | Carry | Overflow);
if(IAPU._Carry) IAPU.P |= Carry;
- if(!IAPU._Zero) IAPU.P |= Zero;
+ if(!IAPU._ZeroFlag) IAPU.P |= ZeroFlag;
if(IAPU._Overflow) IAPU.P |= Overflow;
- if(IAPU._Zero & 0x80) IAPU.P |= Negative;
+ if(IAPU._ZeroFlag & 0x80) IAPU.P |= Negative;
#endif
}
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/snes/srtc.cpp
^
|
| @@ -101,7 +101,7 @@
void S9xHardResetSRTC ()
{
- ZeroMemory (&rtc, sizeof (rtc));
+ ZeroFlagMemory (&rtc, sizeof (rtc));
rtc.index = -1;
rtc.mode = MODE_READ;
rtc.count_enable = FALSE;
@@ -398,7 +398,7 @@
// Disable RTC counter
rtc.count_enable = FALSE;
- ZeroMemory (rtc.data, MAX_RTC_INDEX+1);
+ ZeroFlagMemory (rtc.data, MAX_RTC_INDEX+1);
rtc.index = -1;
rtc.mode = MODE_COMMAND_DONE;
break;
|
