From d852697190e617c43930723bbb446375394b4194 Mon Sep 17 00:00:00 2001
From: Steve Kondik <shade@chemlab.org>
Date: Wed, 6 Feb 2013 06:49:41 -0800
Subject: stagefright: Fix tunnel mode ifdefs

 * Was breaking on 8660 due to previous commit.

Change-Id: Ia9f5c45552cc933db336a66b6d1214b65e810488
---
 media/libstagefright/AwesomePlayer.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'media/libstagefright')

diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp
index 4b14baa..7d077f5 100644
--- a/media/libstagefright/AwesomePlayer.cpp
+++ b/media/libstagefright/AwesomePlayer.cpp
@@ -229,7 +229,7 @@ AwesomePlayer::AwesomePlayer()
     mAudioStatusEventPending = false;
 
     reset();
-#ifdef QCOM_ENHANCED_AUDIO
+#ifdef USE_TUNNEL_MODE
     mIsTunnelAudio = false;
 #endif
 }
@@ -241,7 +241,7 @@ AwesomePlayer::~AwesomePlayer() {
 
     reset();
 
-#ifdef QCOM_ENHANCED_AUDIO
+#ifdef USE_TUNNEL_MODE
     // Disable Tunnel Mode Audio
     if (mIsTunnelAudio) {
         if(mTunnelAliveAP > 0) {
@@ -1039,7 +1039,7 @@ status_t AwesomePlayer::play_l() {
             // We don't want to post an error notification at this point,
             // the error returned from MediaPlayer::start() will suffice.
             bool sendErrorNotification = false;
-#ifdef QCOM_ENHANCED_AUDIO
+#ifdef IS_TUNNEL_MODE
             if(mIsTunnelAudio) {
                 // For tunnel Audio error has to be posted to the client
                 sendErrorNotification = true;
@@ -1542,7 +1542,7 @@ status_t AwesomePlayer::initAudioDecoder() {
     }
     ALOGV("nchannels %d;LPA will be skipped if nchannels is > 2 or nchannels == 0",
            nchannels);
-
+#endif
 #ifdef USE_TUNNEL_MODE
     char tunnelDecode[PROPERTY_VALUE_MAX];
     property_get("tunnel.decode",tunnelDecode,"0");
@@ -1575,7 +1575,6 @@ status_t AwesomePlayer::initAudioDecoder() {
     }
     else
        ALOGD("Normal Audio Playback");
-#endif
 
     if (isStreamingHTTP()) {
       ALOGV("Streaming, force disable tunnel mode playback");
-- 
cgit v1.1