Projects >> MicDroid >>77419efb0d19361c2f02828e820c5bacffddc14f

Chunk
Conflicting content
    	float smooth = PreferenceHelper.getCorrectionSmoothness(Mic.this);
    	float mix = PreferenceHelper.getMix(Mic.this);
    	
<<<<<<< HEAD
    	pitchCorrector = new PitchCorrector(Constants.PITCH_CORRECTOR_AUTOTALENT, PreferenceHelper.getSampleRate(Mic.this));
    	pitchCorrector.initialize(CONCERT_A, key, fixedPitch, fixedPull, 
=======
    	AutoTalent.instantiateAutoTalent(PreferenceHelper.getSampleRate(Mic.this));
    	AutoTalent.initializeAutoTalent(CONCERT_A, key, DEFAULT_FIXED_PITCH, fixedPull, 
>>>>>>> 8619d5f647179c0b7d3e5417b930c34185194505
    			strength, smooth, pitchShift, DEFAULT_SCALE_ROTATE, 
    			DEFAULT_LFO_DEPTH, DEFAULT_LFO_RATE, DEFAULT_LFO_SHAPE, DEFAULT_LFO_SYM, DEFAULT_LFO_QUANT, 
    			DEFAULT_FORM_CORR, DEFAULT_FORM_WARP, mix);
Solution content
    	float smooth = PreferenceHelper.getCorrectionSmoothness(Mic.this);
    	float mix = PreferenceHelper.getMix(Mic.this);
    	
    	pitchCorrector = new PitchCorrector(Constants.PITCH_CORRECTOR_AUTOTALENT, PreferenceHelper.getSampleRate(Mic.this));
    	pitchCorrector.initialize(CONCERT_A, key, DEFAULT_FIXED_PITCH, fixedPull, 
    			strength, smooth, pitchShift, DEFAULT_SCALE_ROTATE, 
    			DEFAULT_LFO_DEPTH, DEFAULT_LFO_RATE, DEFAULT_LFO_SHAPE, DEFAULT_LFO_SYM, DEFAULT_LFO_QUANT, 
    			DEFAULT_FORM_CORR, DEFAULT_FORM_WARP, mix);
File
Mic.java
Developer's decision
Manual
Kind of conflict
Attribute
Method invocation