1.usb播放时增加开关 mute操作，解决切歌切歌时声音由小到大

2.增加ADC连接状态变量，ADC连接是不会自动关机

Author: liuwenlong

apps/player/PowerManager.cpp

@@ -84,7 +84,7 @@ namespace mango
 		}
 
 		if(gPlayer.mPlayingView != NULL && 
-			(gPlayer.mPlayingView->isUsmCon || gPlayer.mPlayingView->isMediaScanning)){
+			(gPlayer.mPlayingView->isUsmCon || gPlayer.mPlayingView->isMediaScanning || gPlayer.mPlayingView->isUsbAudioConnect)){
 			atuoPoweroffCount = 0;
 		}
 

apps/player/audiousb.cpp

@@ -6,14 +6,18 @@
 #include <cutils/sockets.h>
 #include <poll.h>
 #include <sys/un.h>  
+
 #define LOG_TAG "AudioUSB"
+typedef void* (*PTHREAD_START_ROUTINE)(void*);
 
 #if 1
 #define logi(...) __android_log_print(ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__)
 #define LOGI(...) __android_log_print(ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__)
 #else
 #define logi(...)
 #endif
+void openOrCloseWm8740Mute(bool enable);
+void startCloseCodecMute();
 	int gRun = 1;		
 	//volatile
 	typedef struct tagRingBufferContext
@@ -459,7 +463,6 @@ void sendAudioMsg(int rate,int bit){
 		return 0;
 	}
 
-
 	//ringBufferContext = (HifiRingBufferContext*)mRingBufferMemory;
 	//ringBufferContext->mSize = HIFI_HIFI_BUFFER_SIZE;
 
@@ -612,9 +615,9 @@ void writePcm(unsigned char* buf,int size){
 
 			gPacketType = packet->mType;
 			memcpy(&gHiFiHeader, packet, sizeof(HIFI_PACKET_HEADER));
-
+			openOrCloseWm8740Mute(true);
 			mHiFiOut = hifi_pcm_open(flags, gHiFiHeader.mChannels, gHiFiHeader.mSamplingRate, gHiFiHeader.mBitPerSample);
-
+			startCloseCodecMute();
 			if (!hifi_pcm_ready(mHiFiOut)) 
 			{
 			//	logn_e("can't open hifi device");
@@ -648,7 +651,31 @@ void writePcm(unsigned char* buf,int size){
 
 		return 0;
 	} 
-typedef void* (*PTHREAD_START_ROUTINE)(void*);
+void openOrCloseWm8740Mute(bool enable){
+	int fd=0,state,volume;
+	char* path = "/sys/class/codec/wm8740_mute";
+	char rbuf;
+		
+	log_i("openOrCloseMute enable=%d",enable);
+			
+	fd = open(path,O_RDWR, 0);
+		
+	rbuf = enable?1:0;
+		
+	write(fd,&rbuf,1);
+		
+	close(fd);
+}
+unsigned int CloseCodecMute(void *parameter)
+{
+	usleep(1000 * 300);
+	openOrCloseWm8740Mute(false);		
+}
+void startCloseCodecMute(){
+	pthread_t		threadId;
+	pthread_create(&threadId,NULL,(PTHREAD_START_ROUTINE)CloseCodecMute,NULL);
+}
+
 int main (int argc, char* argv[])
 {
 		int n = 10;
@@ -662,15 +689,11 @@ int main (int argc, char* argv[])
 		//pthread_join(readThreadId,NULL);
 
 		pthread_create(&sendThreadId, NULL, (PTHREAD_START_ROUTINE)USBHiFiSending, (void*)(&n));
-		//pthread_join(sendThreadId,NULL);
+		pthread_join(sendThreadId,NULL);
 
 		//pthread_create(&sendThreadId, NULL, (PTHREAD_START_ROUTINE)USBConnectDetect, (void*)(&n));
 
 		LOGI("usbhifi init end-.");
-		while(1){
-			usleep(1000 * 1000);
-			gReadingTouchCount++;
-		}
 
 		return 0;
 }

apps/player/playingView.cpp

@@ -15,6 +15,7 @@ namespace mango
 		mMSkBitmap = new MSkBitmap();
 		isNeedFreshOld = 0;
 		isUsmCon = 0;
+		isUsbAudioConnect = 0;
 		isMediaScanning = 0;
 		isSdcardShare = 0;
 	}
@@ -719,19 +720,13 @@ namespace mango
 		}else if(code == USBHIFI_AUDIO_MSG){
 			mPlayinglist->stopPlayer();
 			Environment::openMute();
-			gPlayer.openWm8740Mute();
-			gPlayer.closeWm8740Mute();
 			gPlayer.showUSBAudioConnectView();
-			//if(gPlayer.mCodecType==1)	
-			//	gPlayer.setHardwareVolume(200);
+			isUsbAudioConnect = 1;
 		}else if(code == USBHIFI_AUDIO_STOP){
 			system("stop usbd");
 			gPlayer.dismissView(gPlayer.mUSBAudioConnectView);
 			system("start usbd");
-			//if(gPlayer.mCodecType==1)	
-			//	gPlayer.setHardwareVolume(255);
-			
-			log_i("----------USBHIFI_AUDIO_STOP");
+			isUsbAudioConnect = 0;
 		}
 		return 0;
 	}

apps/player/playingView.h

@@ -144,6 +144,7 @@ class KeyCount{
 	public:
 		KeyCount mKeyCount;
 		int isUsmCon;
+		int isUsbAudioConnect;
 		int isMediaScanning;
 		int isSdcardShare;//这个变量用来判断，有sd卡存在时，flash share->mount 不去check playinglist，到sdcard share->mount时再check
 	};