From 04bff4cde274165d359a4e7dec0d6770361fd0c7 Mon Sep 17 00:00:00 2001 From: Harry van Haaren Date: Wed, 11 Dec 2013 18:22:12 +0000 Subject: [PATCH] -Fixed ClipSelector clear name, fixed looperclip playing on load bug --- CHANGELOG | 3 +++ src/avtk/clipselector.cxx | 5 +++++ src/looperclip.cxx | 6 ++++++ 3 files changed, 14 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 94d61b2..5015610 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,7 @@ +-AudioEditor shows green / red based on BPM analysis of the sample +-Clearing clips bug fixed +-Loading bug re-trigger bug fixed 1.0: Tuesday, 10th December 2013 diff --git a/src/avtk/clipselector.cxx b/src/avtk/clipselector.cxx index 5be12ec..47449aa 100644 --- a/src/avtk/clipselector.cxx +++ b/src/avtk/clipselector.cxx @@ -72,6 +72,11 @@ void ClipSelector::setState( int clipNum, GridLogic::State s ) //cout << "ClipSelector::setState() t = " << ID << " clipNum = " << clipNum << " state = " << s << endl; #endif clips[clipNum].setState( s ); + if ( s == GridLogic::STATE_EMPTY ) + { + clips[clipNum].setName(""); + } + redraw(); } diff --git a/src/looperclip.cxx b/src/looperclip.cxx index b6b5c6a..80ca535 100644 --- a/src/looperclip.cxx +++ b/src/looperclip.cxx @@ -111,6 +111,11 @@ void LooperClip::load( AudioBuffer* ab ) { _loaded = true; _recording = false; + _playing = false; + + _queuePlay = false; + _queueStop = false; + _queueRecord= false; if ( _buffer ) { @@ -121,6 +126,7 @@ void LooperClip::load( AudioBuffer* ab ) _buffer = ab; _playhead = 0; + jack->getControllerUpdater()->setTrackSceneProgress(track, scene, 0 ); // set the endpoint to the buffer's size _recordhead = _buffer->getData().size();