summaryrefslogtreecommitdiff
path: root/solaris
diff options
context:
space:
mode:
authorsletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>2011-12-15 11:11:56 +0000
committersletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>2011-12-15 11:11:56 +0000
commit83428666076402f5551871ded74fe68b8a53f569 (patch)
treed1ee8e69291b5bae18fdd4400320a83310d38fed /solaris
parent866f001cdc3562fb78fbc9625833c8e2826c8722 (diff)
downloadjack2-83428666076402f5551871ded74fe68b8a53f569.tar.gz
Update JackOSSDriver.
git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4647 0c269be4-1314-0410-8aa9-9f06e86f4224
Diffstat (limited to 'solaris')
-rw-r--r--solaris/oss/JackOSSDriver.cpp2
-rw-r--r--solaris/oss/JackOSSDriver.h16
2 files changed, 9 insertions, 9 deletions
diff --git a/solaris/oss/JackOSSDriver.cpp b/solaris/oss/JackOSSDriver.cpp
index be0b7bba..931cd809 100644
--- a/solaris/oss/JackOSSDriver.cpp
+++ b/solaris/oss/JackOSSDriver.cpp
@@ -713,7 +713,7 @@ int JackOSSDriver::ProcessSync()
if (fIsMaster) {
ProcessGraphSync();
} else {
- fGraphManager->ResumeRefNum(&fClientControl, fSynchroTable);
+ ResumeRefNum();
}
// Write output buffers for the current cycle
diff --git a/solaris/oss/JackOSSDriver.h b/solaris/oss/JackOSSDriver.h
index c286528a..32758d40 100644
--- a/solaris/oss/JackOSSDriver.h
+++ b/solaris/oss/JackOSSDriver.h
@@ -46,10 +46,10 @@ class JackOSSDriver : public JackAudioDriver
enum { kRead = 1, kWrite = 2, kReadWrite = 3 };
private:
-
+
int fInFD;
int fOutFD;
-
+
int fBits;
int fSampleFormat;
int fNperiods;
@@ -57,15 +57,15 @@ class JackOSSDriver : public JackAudioDriver
int fRWMode;
bool fExcl;
bool fIgnoreHW;
-
+
unsigned int fInputBufferSize;
unsigned int fOutputBufferSize;
-
+
void* fInputBuffer;
void* fOutputBuffer;
-
+
bool fFirstCycle;
-
+
int OpenInput();
int OpenOutput();
int OpenAux();
@@ -80,7 +80,7 @@ class JackOSSDriver : public JackAudioDriver
JackOSSDriver(const char* name, const char* alias, JackLockedEngine* engine, JackSynchro* table)
: JackAudioDriver(name, alias, engine, table),
- fInFD(-1), fOutFD(-1), fBits(0),
+ fInFD(-1), fOutFD(-1), fBits(0),
fSampleFormat(0), fNperiods(0), fRWMode(0), fExcl(false), fIgnoreHW(true),
fInputBufferSize(0), fOutputBufferSize(0),
fInputBuffer(NULL), fOutputBuffer(NULL), fFirstCycle(true)
@@ -90,7 +90,7 @@ class JackOSSDriver : public JackAudioDriver
{}
int Open(jack_nframes_t frames_per_cycle,
- int user_nperiods,
+ int user_nperiods,
jack_nframes_t rate,
bool capturing,
bool playing,