From e94c8ad782d93bb0e40259f5f56fc56c71bd975f Mon Sep 17 00:00:00 2001 From: Harry van Haaren Date: Thu, 15 Aug 2013 22:45:05 +0100 Subject: [PATCH] -Changed wscript, added valgrindSuppression file, changed buffer writing jack.cxx --- src/jack.cxx | 13 ++-- src/trackoutput.cxx | 7 +- valgrindSuppression | 151 ++++++++++++++++++++++++++++++++++++++++++++ wscript | 2 +- 4 files changed, 162 insertions(+), 11 deletions(-) create mode 100644 valgrindSuppression diff --git a/src/jack.cxx b/src/jack.cxx index ae38344..e2f27a8 100644 --- a/src/jack.cxx +++ b/src/jack.cxx @@ -134,7 +134,7 @@ void Jack::activate() int Jack::process (jack_nframes_t nframes) { - /* + /// get buffers buffers.audio[Buffers::MASTER_INPUT] = (float*)jack_port_get_buffer( masterInput , nframes ); buffers.audio[Buffers::JACK_MASTER_OUT_L] = (float*)jack_port_get_buffer( masterOutputL , nframes ); @@ -152,18 +152,14 @@ int Jack::process (jack_nframes_t nframes) memset( buffers.audio[Buffers::POST_SIDECHAIN] , 0, sizeof(float) * nframes ); jack_midi_clear_buffer( buffers.midi[Buffers::APC_OUTPUT] ); - */ /// do events from the ringbuffer handleDspEvents(); - /* - /// process incoming MIDI jack_midi_event_t in_event; int masterMidiInputIndex = 0; int event_count = (int) jack_midi_get_event_count( buffers.midi[Buffers::MASTER_MIDI_INPUT] ); - while ( masterMidiInputIndex < event_count ) { jack_midi_event_get(&in_event, buffers.midi[Buffers::MASTER_MIDI_INPUT], masterMidiInputIndex); @@ -181,7 +177,6 @@ int Jack::process (jack_nframes_t nframes) masterMidiInputIndex++; } - */ /// process each track, starting at output and working up signal path for(unsigned int i = 0; i < NTRACKS; i++) @@ -190,7 +185,7 @@ int Jack::process (jack_nframes_t nframes) } - metronome->process( nframes, &buffers ); + //metronome->process( nframes, &buffers ); /* if ( reverb->getActive() ) @@ -240,8 +235,8 @@ int Jack::process (jack_nframes_t nframes) } */ - //buffers.audio[Buffers::JACK_MASTER_OUT_L][i] = master; - //buffers.audio[Buffers::JACK_MASTER_OUT_R][i] = master; + buffers.audio[Buffers::JACK_MASTER_OUT_L][i] = master; + buffers.audio[Buffers::JACK_MASTER_OUT_R][i] = master; } /* diff --git a/src/trackoutput.cxx b/src/trackoutput.cxx index f9fa25f..6563ce3 100644 --- a/src/trackoutput.cxx +++ b/src/trackoutput.cxx @@ -1,6 +1,10 @@ #include "trackoutput.hxx" +// valgrind no access code +//#include +//VALGRIND_MAKE_MEM_NOACCESS( &_trackBuffer[0] , MAX_BUFFER_SIZE ); + TrackOutput::TrackOutput(int t, AudioProcessor* ap) : AudioProcessor(), track(t), @@ -10,7 +14,8 @@ TrackOutput::TrackOutput(int t, AudioProcessor* ap) : //printf("trackOutput ID: %i, ap = ", track ); //std::cout << ap << std::endl; - //_trackBuffer.resize( MAX_BUFFER_SIZE ); + _trackBuffer.resize( MAX_BUFFER_SIZE ); + // UI update uiUpdateConstant = 44100 / 30; diff --git a/valgrindSuppression b/valgrindSuppression new file mode 100644 index 0000000..8741d9c --- /dev/null +++ b/valgrindSuppression @@ -0,0 +1,151 @@ +{ + name + Memcheck:Leak + fun:*alloc + obj:/usr/lib/*.so.* +} +{ + name + Memcheck:Leak + fun:*alloc + obj:/usr/lib/*-linux-gnu/*.so.* +} +{ + name + Memcheck:Cond + fun:* + obj:/usr/lib/*.so.* +} +{ + name + Memcheck:Cond + fun:* + obj:/lib/*-linux-gnu/*.so.* +} +{ + name + Memcheck:Cond + fun:* + obj:/usr/lib/*-linux-gnu/*.so.* +} +{ + name + Memcheck:Cond + obj:/usr/lib/*-linux-gnu/*.so.* + obj:* +} +{ + name + Memcheck:Value4 + fun:* + obj:/lib/*.so.* +} +{ + name + Memcheck:Value4 + fun:* + obj:/usr/lib/*.so.* +} +{ + name + Memcheck:Value4 + obj:/usr/lib/*-linux-gnu/*.so.* +} +{ + name + Memcheck:Value4 + fun:* + obj:/lib/*-linux-gnu/*.so.* +} +{ + name + Memcheck:Value8 + fun:* + obj:/lib/*.so.* +} +{ + name + Memcheck:Value8 + fun:* + obj:/lib/*-linux-gnu/*.so.* +} +{ + name + Memcheck:Value8 + obj:/usr/lib/*-linux-gnu/*.so.* +} +{ + name + Memcheck:Addr4 + obj:/lib/*-linux-gnu/*.so.* +} +{ + name + Memcheck:Addr4 + obj:/usr/lib/*-linux-gnu/*.so.* +} +{ + name + Memcheck:Addr8 + obj:/lib/*-linux-gnu/*.so.* +} +{ + name + Memcheck:Addr8 + obj:/usr/lib/*-linux-gnu/*.so.* +} +{ + name + Memcheck:Param + write(buf) + obj:/lib/*-linux-gnu/i686/cmov/libpthread-2.13.so + obj:/usr/lib/*-linux-gnu/libjack.so.0.1.0 + fun:* +} +{ + + Memcheck:Cond + fun:apply_queued_setting + fun:gtk_rc_parse_any + fun:gtk_rc_context_parse_one_file + fun:gtk_rc_context_parse_file + fun:gtk_rc_parse +} +{ + + Memcheck:Leak + fun:malloc + fun:standard_malloc + fun:g_malloc + fun:g_strdup + fun:gtk_label_set_text +} +{ + + Memcheck:Leak + fun:malloc + fun:standard_malloc + fun:g_try_malloc + fun:gdk_pixbuf_new +} +{ + + Memcheck:Leak + fun:* + fun:ladspa_descriptor + fun:* +} +{ + + Memcheck:Addr8 + fun:wcslen + fun:wcscoll_l + fun:* +} +{ + + Memcheck:Addr8 + fun:wcslen + fun:wcsxfrm_l + fun:* +} diff --git a/wscript b/wscript index 7a6a298..df9760d 100644 --- a/wscript +++ b/wscript @@ -12,7 +12,7 @@ def options(opt): def configure(conf): conf.load('compiler_cxx') #conf.env.append_value('CXXFLAGS', ['-g', '-Wall','-Werror','-Wextra']) #'-O2' - conf.env.append_value('CXXFLAGS', ['-g', '-Wall','-march=native','-msse','-mfpmath=sse','-ffast-math']) #'-O2','-Werror' + conf.env.append_value('CXXFLAGS', ['-g', '-Wall']) #,'-march=native','-msse','-mfpmath=sse','-ffast-math']) #'-O2','-Werror' conf.check_cfg(package='ntk',at_least_version='1.3',args='--cflags --libs',uselib_store='NTK') conf.check_cfg(package='jack',at_least_version='0.118',args='--cflags --libs',uselib_store='JACK') #conf.check_cfg(package='lilv-0',at_least_version='1.0',args='--cflags --libs',uselib_store='LILV')