Add support to change the player volume.

3 files changed, 35 insertions, 21 deletions

diff --git a/play.cpp b/play.cpp
index ef58924..c47d87e 100644
--- a/play.cpp
+++ b/play.cpp
@@ -187,13 +187,11 @@ extern "C" void DrawText(int x, int y, const char *s, uint32_t fg, uint32_t bg,
 //////////////////////////////////////////////////////////////////////////////
 
 static char DvdNav;			///< dvdnav active
-static int PlayerVolume = -1;		///< volume 0 - 100
 static char PlayerPaused;		///< player paused
 static char PlayerSpeed;		///< player playback speed
 
 #define PlayerSendQuit()
 #define PlayerSendPause()
-#define PlayerSendVolume()
 #define PlayerSendSetSpeed(x)
 #define PlayerSendSeek(x)
 #define SendCommand(x)
@@ -228,8 +226,8 @@ cMyPlayer::cMyPlayer(const char *filename)
 {
     dsyslog("[play]%s: '%s'\n", __FUNCTION__, filename);
 
-    PlayerVolume = cDevice::CurrentVolume();
-    dsyslog("{play]: initial volume %d\n", PlayerVolume);
+    PlayerSetVolume(cDevice::CurrentVolume());
+    dsyslog("[play]: initial volume %d\n", cDevice::CurrentVolume());
 
     FileName = strdup(filename);
     if (ConfigDisableRemote) {
@@ -242,7 +240,7 @@ cMyPlayer::cMyPlayer(const char *filename)
 */
 cMyPlayer::~cMyPlayer()
 {
-    dsyslog("{play]%s: end\n", __FUNCTION__);
+    dsyslog("[play]%s: end\n", __FUNCTION__);
 
     PlayerStop();
     free(FileName);
@@ -280,18 +278,23 @@ bool cMyPlayer::GetReplayMode(bool & play, bool & forward, int &speed)
 //	cStatus
 //////////////////////////////////////////////////////////////////////////////
 
+/**
+**	Status class.
+**
+**	To get volume changes.
+*/
 class cMyStatus:public cStatus
 {
+  private:
+    int Volume;				///< current volume
+
   public:
-    cMyStatus(void);
+    cMyStatus(void);			///< my status constructor
 
   protected:
     virtual void SetVolume(int, bool);	///< volume changed
-
-    //bool GetVolume(int &, bool &);
 };
 
-static int Volume;			///< current volume
 cMyStatus *Status;			///< status monitor for volume
 
 /**
@@ -315,18 +318,8 @@ void cMyStatus::SetVolume(int volume, bool absolute)
 	Volume += volume;
     }
 
-    if (Volume != PlayerVolume) {
-	PlayerVolume = Volume;
-	PlayerSendVolume();
-    }
-}
-
-/**
-**	Get volume.
-bool cMyStatus::GetVolume(int &volume, bool &mute)
-{
+    PlayerSetVolume(Volume);
 }
-*/
 
 //////////////////////////////////////////////////////////////////////////////
 //	cControl
diff --git a/player.c b/player.c
index 33af937..fac99be 100644
--- a/player.c
+++ b/player.c
@@ -141,7 +141,7 @@ static char PlayerSpeed;		///< player playback speed
 /**
 **	Parse player output.
 **
-**	@param data	line pointer
+**	@param data	line pointer (\0 terminated)
 **	@param size	line length
 */
 static void PlayerParseLine(const char *data, int size)
@@ -416,6 +416,7 @@ static void PlayerForkAndExec(const char *filename)
 	return;
     }
     PlayerPid = pid;			// parent
+    setpgid(pid, 0);
 
     if (ConfigUseSlave) {
 	close(PlayerPipeIn[0]);
@@ -651,6 +652,23 @@ int PlayerIsRunning(void)
     return 0;
 }
 
+/**
+**	Set player volume.
+**
+**	@param volume	new volume (0..255)
+*/
+void PlayerSetVolume(int volume)
+{
+    Debug(3, "player: set volume=%d\n", volume);
+
+    if (PlayerVolume != volume) {
+	PlayerVolume = volume;
+	if (PlayerPid) {
+	    PlayerSendVolume();
+	}
+    }
+}
+
 //////////////////////////////////////////////////////////////////////////////
 //	Device/Plugin C part
 //////////////////////////////////////////////////////////////////////////////
diff --git a/player.h b/player.h
index cce0265..620f84a 100644
--- a/player.h
+++ b/player.h
@@ -108,6 +108,9 @@ extern "C"
     /// Is external player still running
     extern int PlayerIsRunning(void);
 
+    /// Set player volume
+    extern void PlayerSetVolume(int);
+
 #ifdef __cplusplus
 }
 #endif