summaryrefslogtreecommitdiff
path: root/src/luascript.h
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2014-09-05 19:57:14 +0200
committerBent Bisballe Nyeng <deva@aasimon.org>2014-09-05 19:57:14 +0200
commit4ae6300717a10c7fa850b800f18a730aee1d3e07 (patch)
tree455ae17634f5bbd8b18ce3a256db2647853bd600 /src/luascript.h
parentf4b015398462fff1a64d70b632390b4f06fe3bbe (diff)
Internal code editor. Sound system.
Diffstat (limited to 'src/luascript.h')
-rw-r--r--src/luascript.h14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/luascript.h b/src/luascript.h
index 6516611..93478df 100644
--- a/src/luascript.h
+++ b/src/luascript.h
@@ -36,6 +36,7 @@
#include <vector>
#include "outputwindow.h"
+#include "soundplayer.h"
#include <QThread>
@@ -59,13 +60,20 @@ public:
OutputWindow *out;
- void stopScript();
+ void lineChange(int lineno);
+
+ void playSound(QString file);
volatile bool lua_stop;
volatile bool lua_stopped;
+ QString file;
+
+public slots:
+ void stopScript();
signals:
void reset();
+ void lineChanged(int lineno);
protected:
lua_State *L;
@@ -76,9 +84,9 @@ private:
int top;
- QString file;
-
bool running;
+
+ SoundPlayer player;
};