Commit 4d1f3e81 authored by sletz's avatar sletz
Browse files

Cleanup(2).

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4649 0c269be4-1314-0410-8aa9-9f06e86f4224
parent 3e3fb604
......@@ -102,37 +102,38 @@ namespace Jack
public:
JackAudioAdapterInterface(jack_nframes_t buffer_size, jack_nframes_t sample_rate, jack_nframes_t ring_buffer_size = DEFAULT_ADAPTATIVE_SIZE):
fCaptureChannels(0),
fPlaybackChannels(0),
fHostBufferSize(buffer_size),
fHostSampleRate(sample_rate),
fAdaptedBufferSize(buffer_size),
fAdaptedSampleRate(sample_rate),
fPIControler(sample_rate / sample_rate, 256),
fCaptureRingBuffer(NULL), fPlaybackRingBuffer(NULL),
fQuality(0),
fRingbufferCurSize(ring_buffer_size),
fPullAndPushTime(0),
fRunning(false),
fAdaptative(true)
fCaptureChannels(0),
fPlaybackChannels(0),
fHostBufferSize(buffer_size),
fHostSampleRate(sample_rate),
fAdaptedBufferSize(buffer_size),
fAdaptedSampleRate(sample_rate),
fPIControler(sample_rate / sample_rate, 256),
fCaptureRingBuffer(NULL), fPlaybackRingBuffer(NULL),
fQuality(0),
fRingbufferCurSize(ring_buffer_size),
fPullAndPushTime(0),
fRunning(false),
fAdaptative(true)
{}
JackAudioAdapterInterface(jack_nframes_t host_buffer_size,
jack_nframes_t host_sample_rate,
jack_nframes_t adapted_buffer_size,
jack_nframes_t adapted_sample_rate,
jack_nframes_t ring_buffer_size = DEFAULT_ADAPTATIVE_SIZE) :
fCaptureChannels(0),
fPlaybackChannels(0),
fHostBufferSize(host_buffer_size),
fHostSampleRate(host_sample_rate),
fAdaptedBufferSize(adapted_buffer_size),
fAdaptedSampleRate(adapted_sample_rate),
fPIControler(host_sample_rate / host_sample_rate, 256),
fQuality(0),
fRingbufferCurSize(ring_buffer_size),
fPullAndPushTime(0),
fRunning(false),
fAdaptative(true)
jack_nframes_t host_sample_rate,
jack_nframes_t adapted_buffer_size,
jack_nframes_t adapted_sample_rate,
jack_nframes_t ring_buffer_size = DEFAULT_ADAPTATIVE_SIZE) :
fCaptureChannels(0),
fPlaybackChannels(0),
fHostBufferSize(host_buffer_size),
fHostSampleRate(host_sample_rate),
fAdaptedBufferSize(adapted_buffer_size),
fAdaptedSampleRate(adapted_sample_rate),
fPIControler(host_sample_rate / host_sample_rate, 256),
fQuality(0),
fRingbufferCurSize(ring_buffer_size),
fPullAndPushTime(0),
fRunning(false),
fAdaptative(true)
{}
virtual ~JackAudioAdapterInterface()
......
......@@ -31,6 +31,7 @@
#define JACK_PORT_NAME_SIZE 256
#define JACK_PORT_TYPE_SIZE 32
#define JACK_SERVER_CONTROL_NAME_SIZE 64
#define JACK_CLIENT_NAME_SIZE 64
#define JACK_MESSAGE_SIZE 256
#define JACK_UUID_SIZE 32
......
......@@ -13,7 +13,7 @@ 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
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
......@@ -63,7 +63,7 @@ struct SERVER_EXPORT JackEngineControl : public JackShmMem
int fServerPriority;
int fClientPriority;
int fMaxClientPriority;
char fServerName[64];
char fServerName[JACK_SERVER_CONTROL_NAME_SIZE];
JackTransportEngine fTransport;
jack_timer_type_t fClockSource;
int fDriverNum;
......@@ -87,10 +87,10 @@ struct SERVER_EXPORT JackEngineControl : public JackShmMem
// Timer
JackFrameTimer fFrameTimer;
#ifdef JACK_MONITOR
JackEngineProfiling fProfiler;
#endif
#endif
JackEngineControl(bool sync, bool temporary, long timeout, bool rt, long priority, bool verbose, jack_timer_type_t clock, const char* server_name)
{
......@@ -121,7 +121,7 @@ struct SERVER_EXPORT JackEngineControl : public JackShmMem
fClockSource = clock;
fDriverNum = 0;
}
~JackEngineControl()
{}
......@@ -161,7 +161,7 @@ struct SERVER_EXPORT JackEngineControl : public JackShmMem
{
fFrameTimer.ReadFrameTime(timer);
}
// XRun
void NotifyXRun(jack_time_t callback_usecs, float delayed_usecs);
void ResetXRun()
......
......@@ -78,7 +78,7 @@ class JackWinNamedPipeServerChannel : public JackRunnableInterface
JackWinNamedPipeServer fRequestListenPipe; // Pipe to create request socket for the client
JackServer* fServer;
JackThread fThread; // Thread to execute the event loop
char fServerName[64];
char fServerName[JACK_SERVER_CONTROL_NAME_SIZE];
std::list<JackClientPipeThread*> fClientList;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment