summaryrefslogtreecommitdiff
path: root/muse2/muse/audio.h
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2011-12-14 15:08:02 +0000
committerFlorian Jung <flo@windfisch.org>2011-12-14 15:08:02 +0000
commitc36a5508aa42e596b005425208054af9a60734b4 (patch)
treefde0504e0c25b8f39ed6f5f7f7332943e4a95c7f /muse2/muse/audio.h
parent42126f3b398802eb24c8d9acd2591ef4dbe7257d (diff)
pulled fixes from release into trunk
Diffstat (limited to 'muse2/muse/audio.h')
-rw-r--r--muse2/muse/audio.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/muse2/muse/audio.h b/muse2/muse/audio.h
index 8d89be78..3c4eb17d 100644
--- a/muse2/muse/audio.h
+++ b/muse2/muse/audio.h
@@ -166,7 +166,9 @@ class Audio {
int fromThreadFdw, fromThreadFdr; // message pipe
int sigFd; // pipe fd for messages to gui
-
+ //QSocketNotifier* _socketNotifier;
+ int sigFdr;
+
// record values:
Pos startRecordPos;
Pos endRecordPos;
@@ -189,8 +191,12 @@ class Audio {
public:
Audio();
- virtual ~Audio() {}
+ virtual ~Audio() { }
+ // Access to message pipe (like from gui namespace), otherwise audio would need to depend on gui.
+ int getFromThreadFdw() { return sigFd; }
+ int getFromThreadFdr() { return sigFdr; }
+
void process(unsigned frames);
bool sync(int state, unsigned frame);
void shutdown();