1.修改软件音量和硬件音量，用宏区分

2.修改开机写入pcm空数据的持续时间，彻底解决开机声音又小到大的问题

Author: liuwenlong

apps/player/USBHiFi.cpp

@@ -546,7 +546,7 @@ void PcmWrite::start(){
 		return;
 	}
 	log_i("PcmWrite start-.");
-	for(i=0;i<30;i++)
+	for(i=0;i<50;i++)
 		pcm_write(mHiFiOut, data, HIFI_PACKET_SIZE - 4);
 
 	hifi_pcm_close(mHiFiOut);

apps/player/player.cpp

@@ -59,14 +59,14 @@ namespace mango
 		mPlayinglist = new Playinglist();
 		//mPlayinglist->initPlayintList();		
 		mPlayinglist->cursorInit();
-		mPlayinglist->startSlient();
+		
 		//mango::Thread::sleep(1000 * 3);
 
 		mSpdifSwitch = new PlayerSwitch();
 		mHeadestSwitch = new PlayerSwitch();
 		mPlayerEventInterface = new PlayerEventInterface();
 		gSession.setUseEventInterface((UseEventInterface*)mPlayerEventInterface);
-
+		mPlayinglist->startSlient();
 		showPlayingView();
 
 		gPowerManager = new PowerManager();
@@ -92,6 +92,7 @@ namespace mango
 		log_i("end");
 		//mUSBHiFi = new USBHiFi(TEXT("Playing"), NULL, NULL, 0, SW_NORMAL);
 		//mUSBHiFi->onCreate();
+		
 		openOrCloseMute(true);
 		Environment::openMute();
 
@@ -495,7 +496,7 @@ namespace mango
 
 	int  Player::getVolume(void)
 	{
-if(gPlayer.mCodecType==0){
+#if CODEC_VOLUME
 		FILE* file = NULL;
 		char buffer[20]={0};
 		int currentVolume;
@@ -519,20 +520,19 @@ if(gPlayer.mCodecType==0){
 		fclose(file);
 		//log_i("Player::getVolume currentVolume=%d",currentVolume);
 		return currentVolume;
-}
-else if(gPlayer.mCodecType==1){
+#else
+
 		if(mPlayinglist)
 			if(mPlayinglist->mParticleplayer)
 				return mPlayinglist->mParticleplayer->getAudioVolume();
 		return mPlayerVolume;
-}
-		return 0;
+#endif
 	}
 
 
 	void Player::setVolume(int volume)
 	{
-if(gPlayer.mCodecType==0){
+#if CODEC_VOLUME
 		FILE* file = NULL;
 		char buffer[20]={0};
 		int ret;
@@ -551,14 +551,12 @@ if(gPlayer.mCodecType==0){
 		}
 
 		volumeMutex.unlock();
-}
-else if(gPlayer.mCodecType==1){
-
+#else
 	if(mPlayinglist)
 		if(mPlayinglist->mParticleplayer)
 			mPlayinglist->mParticleplayer->setAudioVolume(volume);
 		mPlayerVolume = volume;
-}
+#endif
 	}
 	void Player::setHardwareVolume(int volume){
 		FILE* file = NULL;

apps/player/playinglist.cpp

@@ -19,7 +19,7 @@ static const char *PlayerLock = "playerlock";
 void Playinglist::startSlient(){
 #if 0
 	particle::MediaPlayerInterface*  mtemp = particle::createMediaPlayer();
-	const char* etc = "/system/etc/T SN(LR).mp3";
+	const char* etc = "/system/etc/test.mp3";
 
 	if(FileAttr::FileExist(etc)){
 		log_i("enter play slient.");
@@ -810,11 +810,13 @@ void Playinglist::startSlient(){
 			gSettingProvider.query(SETTING_GAPLESS_ID,&gaplessEn);
 			gSettingProvider.query(SETTING_EQMODE_ID,&eqMode);
 			gSettingProvider.EqQuery(eqMode,EqValue);
-if(gPlayer.mCodecType==0){
-			;
-}else if(gPlayer.mCodecType==1){
+#if CODEC_VOLUME
+			mParticleplayer->setAudioVolume(255);
+			log_i("codec volume,setAudioVolume(255)");
+#else
 			mParticleplayer->setAudioVolume(gPlayer.mPlayerVolume);
-}
+			log_i("AudioVolume,init mPlayerVolume=%d",gPlayer.mPlayerVolume);
+#endif
 			mParticleplayer->audioEqualizerEnable(eqOpen);
 			mParticleplayer->setGaplessDuration(GaplessValue[gaplessEn]);
 			setEq(EqValue);