Merge change 23438 into eclair (9f29120f) · Commits · e / devices / smdk4412 / android_frameworks_native

libs/audioflinger/AudioFlinger.cpp

+4 −1

Original line number	Diff line number	Diff line
		@@ -1449,6 +1449,8 @@ void AudioFlinger::MixerThread::putTracks(
		int j = activeTracks.indexOf(t);
		if (j >= 0) {
		mActiveTracks.add(t);
		// force buffer refilling and no ramp volume when the track is mixed for the first time
		t->mFillingUpStatus = Track::FS_FILLING;
		}
		}
		}
		@@ -3512,10 +3514,11 @@ status_t AudioFlinger::setStreamOutput(uint32_t stream, int output)
		if (tracks.size()) {
		dstThread->putTracks(tracks, activeTracks);
		}
		dstThread->sendConfigEvent(AudioSystem::STREAM_CONFIG_CHANGED, stream);
		}
		}

		dstThread->sendConfigEvent(AudioSystem::STREAM_CONFIG_CHANGED, stream);

		return NO_ERROR;
		}