From 514725fb3253239ed29aebd6a5fadf2076c70547 Mon Sep 17 00:00:00 2001 From: moret Date: Thu, 24 Jul 2008 16:31:56 +0000 Subject: [PATCH] Fix NetDriver git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2734 0c269be4-1314-0410-8aa9-9f06e86f4224 --- common/JackNetDriver.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/common/JackNetDriver.cpp b/common/JackNetDriver.cpp index cde318f4..42eab180 100644 --- a/common/JackNetDriver.cpp +++ b/common/JackNetDriver.cpp @@ -66,6 +66,8 @@ namespace Jack strcpy ( fParams.fName, net_name ); fSocket.GetName ( fParams.fSlaveNetName ); fParams.fTransportSync = transport_sync; + fMonitor = NULL; + fMeasure = NULL; } JackNetDriver::~JackNetDriver() @@ -82,7 +84,6 @@ namespace Jack delete[] fMidiCapturePortList; delete[] fMidiPlaybackPortList; #ifdef JACK_MONITOR - fMonitor->Save(); delete[] fMeasure; delete fMonitor; #endif @@ -106,7 +107,8 @@ namespace Jack #ifdef JACK_MONITOR int JackNetDriver::Close() { - fMonitor->Save(); + if ( fMonitor ) + fMonitor->Save(); return JackDriver::Close(); } #endif @@ -298,7 +300,7 @@ namespace Jack strcpy ( fTxHeader.fPacketType, "header" ); fTxHeader.fDataStream = 'r'; fTxHeader.fID = fParams.fID; - fTxHeader.fCycle = 0; + fTxHeader.fCycle = 1; fTxHeader.fSubCycle = 0; fTxHeader.fMidiDataSize = 0; fTxHeader.fBitdepth = fParams.fBitdepth;