diff --git a/common/JackNetDriver.cpp b/common/JackNetDriver.cpp index 0bcf94d2..954a2bba 100644 --- a/common/JackNetDriver.cpp +++ b/common/JackNetDriver.cpp @@ -35,7 +35,7 @@ using namespace std; namespace Jack { #ifdef JACK_MONITOR - uint JackNetDriver::fMeasureCnt = 64; + uint JackNetDriver::fMeasureCnt = 2048; uint JackNetDriver::fMeasurePoints = 5; uint JackNetDriver::fMonitorPlotOptionsCnt = 2; string JackNetDriver::fMonitorPlotOptions[] = @@ -104,6 +104,14 @@ namespace Jack return res; } +#ifdef JACK_MONITOR + int JackNetDriver::Close() + { + fMonitor->Save(); + return JackDriver::Close(); + } +#endif + int JackNetDriver::Attach() { return 0; @@ -330,8 +338,8 @@ namespace Jack //monitor #ifdef JACK_MONITOR string plot_name = string ( fParams.fName ); - plot_name += string ( "_slave_" ); - plot_name += ( fEngineControl->fSyncMode ) ? string ( "sync" ) : string ( "async" ); + plot_name += string ( "_slave" ); + plot_name += ( fEngineControl->fSyncMode ) ? string ( "_sync" ) : string ( "_async" ); fMonitor = new JackGnuPlotMonitor ( JackNetDriver::fMeasureCnt, JackNetDriver::fMeasurePoints, plot_name ); fMeasure = new float[JackNetDriver::fMeasurePoints]; fMonitor->SetPlotFile ( JackNetDriver::fMonitorPlotOptions, JackNetDriver::fMonitorPlotOptionsCnt, diff --git a/common/JackNetDriver.h b/common/JackNetDriver.h index 1c643eb2..8aeb93f0 100644 --- a/common/JackNetDriver.h +++ b/common/JackNetDriver.h @@ -102,6 +102,10 @@ namespace Jack int inchannels, int outchannels, bool monitor, const char* capture_driver_name, const char* playback_driver_name, jack_nframes_t capture_latency, jack_nframes_t playback_latency ); +#ifdef JACK_MONITOR + int Close(); +#endif + int Attach(); int Detach(); diff --git a/common/JackNetManager.cpp b/common/JackNetManager.cpp index 5c3935f0..776e97c1 100644 --- a/common/JackNetManager.cpp +++ b/common/JackNetManager.cpp @@ -32,7 +32,7 @@ namespace Jack { //JackNetMaster****************************************************************************************************** #ifdef JACK_MONITOR - uint JackNetMaster::fMeasureCnt = 50; + uint JackNetMaster::fMeasureCnt = 2048; uint JackNetMaster::fMeasurePoints = 5; uint JackNetMaster::fMonitorPlotOptionsCnt = 2; string JackNetMaster::fMonitorPlotOptions[] = diff --git a/common/JackTools.h b/common/JackTools.h index 434a8da1..e4fea756 100644 --- a/common/JackTools.h +++ b/common/JackTools.h @@ -200,7 +200,7 @@ namespace Jack { jack_log ( "JackGnuPlotMonitor::SetPlotFile - Add plot : file '%s' row '%d' title '%s' field '%s'", data_filename.c_str(), row, name.c_str(), field_names[row-1].c_str() ); - file << "\"" << data_filename << "\" using " << row << " title \"" << title << " : " << field_names[row-1] << "\" with lines"; + file << "\"" << data_filename << "\" using " << row << " title \"" << field_names[row-1] << "\" with lines"; file << ( ( row < field_number ) ? ", " : "\n" ); }