add soft volume

Author: liuwenlong

apps/player/MedaiPlayerService.cpp

@@ -519,6 +519,23 @@ namespace particle
 	}
 
 
+	bool MediaPlayerService::setAudioVolume(int volume)
+	{
+		if (mPlayer)
+			mPlayer->setAudioVolume(volume);
+	}
+
+
+	int  MediaPlayerService::getAudioVolume()
+	{
+		if (mPlayer)
+			return mPlayer->getAudioVolume();
+		else
+			return -1;
+	}
+
+
+
 	bool MediaPlayerService::mediaInit(const char * filename)
 	{
 		XADataSource		audioSource;

apps/player/MediaPlayerInterface.cpp

@@ -184,5 +184,16 @@ namespace particle
 		return -1;
 	}
 
+	bool MediaPlayerInterface::setAudioVolume(int volume)
+	{
+		return 0;
+	}
+
+	int  MediaPlayerInterface::getAudioVolume()
+	{
+		return -1;
+	}
+
+
 
 };

apps/player/MediaPlayerInterface.h

@@ -100,6 +100,9 @@ namespace particle
 		virtual bool selectAudioChunnel(int chunnel);
 		virtual int  getAudioChunnel();
 
+		virtual bool setAudioVolume(int volume);
+		virtual int  getAudioVolume();
+
 	};
 
 	extern MediaServiceData*   gMediaServiceData;

apps/player/MediaPlayerService.h

@@ -76,6 +76,9 @@ namespace particle
 		bool selectAudioChunnel(int chunnel);
 		int  getAudioChunnel();
 
+		bool setAudioVolume(int volume);
+		int  getAudioVolume();
+
 	public:
 		static void playerCallback(XAPlayItf caller, void * pContext, XAuint32 eventId);
 		void playerCallbackProc(XAPlayItf caller, void * pContext, XAuint32 eventId);

apps/player/player.cpp

@@ -52,8 +52,9 @@ namespace mango
 		initialize();
 		gSettingProvider.initialize();
 		initSettings();
-		
-		//spdifProbe();
+#if CODEC_VOLUME		
+		setHardwareVolume(255);
+#endif
 		gmediaprovider.initialize();
 
 		mPlayinglist = new Playinglist();
@@ -475,7 +476,7 @@ namespace mango
 
 	int  Player::getVolume(void)
 	{
-#ifndef WIN32
+#if CODEC_VOLUME
 		FILE* file = NULL;
 		char buffer[20]={0};
 		int currentVolume;
@@ -499,13 +500,19 @@ namespace mango
 		fclose(file);
 		//log_i("Player::getVolume currentVolume=%d",currentVolume);
 		return currentVolume;
+#else
+		if(mPlayinglist)
+			if(mPlayinglist->mParticleplayer)
+				return mPlayinglist->mParticleplayer->getAudioVolume();
+		return mPlayerVolume;
 #endif
 		return 0;
 	}
 
 
 	void Player::setVolume(int volume)
 	{
+#if CODEC_VOLUME	
 		FILE* file = NULL;
 		char buffer[20]={0};
 		int ret;
@@ -524,6 +531,32 @@ namespace mango
 		}
 
 		volumeMutex.unlock();
+#else
+	if(mPlayinglist)
+		if(mPlayinglist->mParticleplayer)
+			mPlayinglist->mParticleplayer->setAudioVolume(volume);
+		mPlayerVolume = volume;
+#endif
+	}
+	void Player::setHardwareVolume(int volume){
+		FILE* file = NULL;
+		char buffer[20]={0};
+		int ret;
+		
+		volumeMutex.lock();
+
+		if(FileAttr::FileExist("/dev/codec_volume"))
+			file  = fopen("/dev/codec_volume", "w");
+		else if(FileAttr::FileExist(ES9018_VOLUME))
+			file  = fopen(ES9018_VOLUME, "w");
+			
+		if (file != NULL) {
+			sprintf(buffer, "%d", volume);
+			ret = fwrite(buffer, 1, strlen(buffer) + 1, file);	
+			fclose(file);
+		}
+		
+		volumeMutex.unlock();		
 	}
 	void Player::ioctrlBrightness(int cmd,int* brightness){
 		int fd=0;

apps/player/player.h

@@ -47,6 +47,7 @@
 #define ARRAY_LIST_NUM 100
 #define CONVERT_UTF8
 #define ES9018_VOLUME "/sys/class/codec/es9018_volume"
+#define CODEC_VOLUME	0
 
 namespace mango
 {	
@@ -213,6 +214,7 @@ namespace mango
 		void dismissView(View *view);
 		int  getVolume(void);
 		void setVolume(int volume);
+		void setHardwareVolume(int volume);
 		void setPowerState();
 		void ioctrlBrightness(int cmd,int* brightness);
 		int holdKeyProbe();
@@ -260,6 +262,7 @@ namespace mango
 		PlayerSwitch *mSpdifSwitch;
 		PlayerSwitch *mHeadestSwitch;
 
+		int mPlayerVolume;
 		bool volumeInitFail;
 		int mBoardType;//-1-unknow,0-rk2926,1-rk3026.
 		int mCodecType;//-1-unknow,0-wm8740,1-es9018.

apps/player/playinglist.cpp

@@ -537,7 +537,7 @@ static const char *PlayerLock = "playerlock";
 
 					if(needStart)
 						if(mParticleplayer->start()){log_i("start() success!");}else{log_i("start() fail!");goto Exit;}
-					
+					mParticleplayer->setAudioVolume(gPlayer.mPlayerVolume);
 					if(getPlayingItem()->isCue)
 					{
 						if(getPlayingItem()->cueStart>1000){
@@ -784,9 +784,11 @@ static const char *PlayerLock = "playerlock";
 			gSettingProvider.query(SETTING_GAPLESS_ID,&gaplessEn);
 			gSettingProvider.query(SETTING_EQMODE_ID,&eqMode);
 			gSettingProvider.EqQuery(eqMode,EqValue);
-
-			log_i("PlayerInit eqOpen=%d,gaplessEn=%d",eqOpen,gaplessEn);
-			
+#if CODEC_VOLUME
+			;
+#else
+			mParticleplayer->setAudioVolume(gPlayer.mPlayerVolume);
+#endif
 			mParticleplayer->audioEqualizerEnable(eqOpen);
 			mParticleplayer->setGaplessDuration(GaplessValue[gaplessEn]);
 			setEq(EqValue);

base/view/SeekBar.cpp

@@ -96,7 +96,7 @@ namespace mango
 		if(mBkgImage>0)
 			canvas.drawImageResource(mBkgImage, mBkgX, mBkgY);
 		if(mSeekImage>0)
-			canvas.drawImageResource(mSeekImage, mSeekX, mSeekY,mSeekWidth,10);
+			canvas.drawImageResource(mSeekImage, mSeekX, mSeekY,mSeekWidth,4);
 #endif		
 		return 0;
 	}