summaryrefslogtreecommitdiffstats
path: root/services/audioflinger/AudioFlinger.cpp
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2013-02-04 17:05:30 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-02-04 17:05:30 +0000
commit59686720182dcaa1a1a4757964df38c16f1a5246 (patch)
tree83c8de9fcaf2149d9a41be8ea866cec2ee2d0f4f /services/audioflinger/AudioFlinger.cpp
parent685ef09bcaf5de6abf2064d552296f70eaec6761 (diff)
parentd3922f72601d82c6fc067a98916fda0bd1291c5f (diff)
downloadframeworks_av-59686720182dcaa1a1a4757964df38c16f1a5246.zip
frameworks_av-59686720182dcaa1a1a4757964df38c16f1a5246.tar.gz
frameworks_av-59686720182dcaa1a1a4757964df38c16f1a5246.tar.bz2
Merge "AudioFlinger: fix RecordThread initial device"
Diffstat (limited to 'services/audioflinger/AudioFlinger.cpp')
-rw-r--r--services/audioflinger/AudioFlinger.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index 1270825..47c2772 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -1650,14 +1650,14 @@ audio_io_handle_t AudioFlinger::openInput(audio_module_handle_t module,
// Start record thread
// RecorThread require both input and output device indication to forward to audio
// pre processing modules
- audio_devices_t device = (*pDevices) | primaryOutputDevice_l();
-
thread = new RecordThread(this,
input,
reqSamplingRate,
reqChannels,
id,
- device, teeSink);
+ primaryOutputDevice_l(),
+ *pDevices,
+ teeSink);
mRecordThreads.add(id, thread);
ALOGV("openInput() created record thread: ID %d thread %p", id, thread);
if (pSamplingRate != NULL) *pSamplingRate = reqSamplingRate;