| @@ -1,5 +1,5 @@
diff --git a/src/base/emuview.cpp b/src/base/emuview.cpp
-index dc46602..4a74ddb 100644
+index dc46602..eea1d5a 100644
--- a/src/base/emuview.cpp
+++ b/src/base/emuview.cpp
@@ -30,10 +30,8 @@
@@ -18,7 +18,7 @@
SIGNAL(inputDevicesChanged()));
// QObject::connect(m_hostVideo, SIGNAL(shaderChanged()),
// SLOT(hostVideoShaderChanged()));
-+ connect(m_view, SIGNAL(closing(QCloseEvent)), this, SLOT(closeEvent(QCloseEvent)));
++ QObject::connect(m_view, SIGNAL(sceneGraphInvalidated()), SLOT(close()));
m_stateListModel = new StateListModel(m_emu, m_diskFileName);
@@ -43,53 +43,8 @@
}
void EmuView::changeEvent(QEvent *e)
-diff --git a/src/base/hostaudio.cpp b/src/base/hostaudio.cpp
-index 7be42cc..4030cf0 100644
---- a/src/base/hostaudio.cpp
-+++ b/src/base/hostaudio.cpp
-@@ -39,6 +39,10 @@ static void contextStreamCallback(pa_context *context, void *userdata)
- }
- }
-
-+static void uncorkCallback(pa_stream *s, int success, void *userdata) {
-+ qDebug("Uncork callback reported: %i", success);
-+}
-+
- /*!
- \class HostAudio
- HostAudio class controls audio streaming to the host device.
-@@ -150,19 +154,28 @@ void HostAudio::sendFrame()
- if (!m_stream)
- return;
-
-+ qDebug() << "corked?: " << pa_stream_is_corked(m_stream);
-+ qDebug() << "suspended?: " << pa_stream_is_suspended(m_stream);
-+ if (pa_stream_is_corked(m_stream) == 1) {
-+ qDebug("Stream is corked.");
-+ pa_stream_cork(m_stream, 0, uncorkCallback, NULL);
-+ }
-+
- pa_threaded_mainloop_lock(m_mainloop);
- void *data;
- #if defined(MEEGO_EDITION_HARMATTAN)
- size_t size = -1;
- pa_stream_begin_write(m_stream, &data, &size);
-+ qDebug() << "size: " << size;
- #elif defined(Q_WS_MAEMO_5)
- size_t size = 4096;
- static char buf[4096];
- data = buf;
- #endif
-- size = qMin(size, pa_stream_writable_size(m_stream));
-+// size = qMin(size, pa_stream_writable_size(m_stream));
- if (size)
- size = m_emu->fillAudioBuffer(reinterpret_cast<char *>(data), size);
-+ qDebug() << "foo size: " << size;
- if (size)
- pa_stream_write(m_stream, data, size, 0, 0, PA_SEEK_RELATIVE);
- #if defined(MEEGO_EDITION_HARMATTAN)
diff --git a/src/snes/snes.cpp b/src/snes/snes.cpp
-index 51adb16..354a4aa 100644
+index 51adb16..fc1e29d 100644
--- a/src/snes/snes.cpp
+++ b/src/snes/snes.cpp
@@ -301,8 +301,10 @@ int main(int argc, char *argv[]) {
@@ -101,6 +56,6 @@
EmuView emuView(&snesEmu, argv[1], view);
- return app->exec();
-+ int ret = app-> exec();
++ int ret = app->exec();
+ return ret;
}
|
