IPSComponent - Added IPSComponentCam_XeomaVideoSurveillanceSoftware

IPSLibrary/app/core/IPSComponent/IPSComponentAVControl/IPSComponentAVControl_AudioMax.class.php

@@ -10,21 +10,21 @@
 	IPSUtils_Include ('IPSComponentAVControl.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentAVControl');
 	IPSUtils_Include ("AudioMax.inc.php",                'IPSLibrary::app::hardware::AudioMax');
 
-   /**
-    * @class IPSComponentAVControl_AudioMax
-    *
-    * Definiert ein IPSComponentAVControl_AudioMax Object, das ein IPSComponentAVControl Object mit Hilfe der
+	/**
+	 * @class IPSComponentAVControl_AudioMax
+	 *
+	 * Definiert ein IPSComponentAVControl_AudioMax Object, das ein IPSComponentAVControl Object mit Hilfe der
 	 * AudioMax MultiRoom Steuerung e-Service Online implementiert
-    *
-    * @author Andreas Brauneis
-    * @version
-    * Version 2.50.1, 31.01.2012<br/>
-    */
+	 *
+	 * @author Andreas Brauneis
+	 * @version
+	 * Version 2.50.1, 31.01.2012<br/>
+	 */
 
 	class IPSComponentAVControl_AudioMax extends IPSComponentAVControl{
 
 		private $instanceId;
-	
+
 		/**
 		 * @public
 		 *
@@ -34,8 +34,8 @@ class IPSComponentAVControl_AudioMax extends IPSComponentAVControl{
 		 */
 		public function __construct($instanceId) {
 			$this->instanceId = (int)$instanceId;
-		   if ($this->instanceId==null) {
-		   	$this->instanceId = IPSUtil_ObjectIDByPath('Program.IPSLibrary.data.hardware.AudioMax.AudioMax_Server');
+			if ($this->instanceId==null) {
+				$this->instanceId = IPSUtil_ObjectIDByPath('Program.IPSLibrary.data.hardware.AudioMax.AudioMax_Server');
 			}
 		}
 
@@ -49,7 +49,7 @@ public function __construct($instanceId) {
 		 * @return string Parameter String des IPSComponent Object
 		 */
 		public function GetComponentParams() {
-			return get_class(this).','.$this->instanceId;
+			return get_class($this).','.$this->instanceId;
 		}
 
 
@@ -75,10 +75,16 @@ public function HandleEvent($variable, $value, IPSModuleAVControl $module) {
 			switch($command) {
 				case AM_CMD_POWER:
 				case AM_CMD_ROOM:
-				   for ($roomId=0;$roomId<AM_CONFIG_ROOM_COUNT;$roomId++) {
-					   $status = AudioMax_GetMainPower($this->instanceId) and AudioMax_GetRoomPower($this->instanceId, $roomId);
+					if (!AudioMax_GetMainPower($this->instanceId) and $command==AM_CMD_ROOM) {
+						break;
+					}
+					for ($roomId=0;$roomId<AM_CONFIG_ROOM_COUNT;$roomId++) {
+						$status = '0';
+						if (AudioMax_GetMainPower($this->instanceId) and AudioMax_GetRoomPower($this->instanceId, $roomId)) {
+							$status='1';
+						}
 						$module->SyncPower($status, $roomId, $this);
-				   }
+					}
 					break;
 				case AM_CMD_AUDIO:
 					if (count($parameters)<6) return;
@@ -87,22 +93,25 @@ public function HandleEvent($variable, $value, IPSModuleAVControl $module) {
 					$value    = $parameters[5];
 					switch($function) {
 						case AM_FNC_BALANCE:
-						   $module->SyncBalance($value, $roomId, $this);
+							$module->SyncBalance($value * 100 / AM_VAL_BALANCE_MAX, $roomId, $this);
 							break;
 						case AM_FNC_VOLUME:
-						   $module->SyncVolume($value, $roomId, $this);
+							$module->SyncVolume($value * 100 / AM_VAL_VOLUME_MAX, $roomId, $this);
+							break;
+						case AM_FNC_MUTE:
+							$module->SyncMute($value, $roomId, $this);
 							break;
 						case AM_FNC_TREBLE:
-						   $module->SyncTreble($value, $roomId, $this);
+							$module->SyncTreble($value * 100 / AM_VAL_TREBLE_MAX, $roomId, $this);
 							break;
 						case AM_FNC_MIDDLE:
-						   $module->SyncMiddle($value, $roomId, $this);
+							$module->SyncMiddle($value * 100 / AM_VAL_MIDDLE_MAX, $roomId, $this);
 							break;
 						case AM_FNC_BASS:
-						   $module->SyncBass($value, $roomId, $this);
+							$module->SyncBass($value * 100 / AM_VAL_BASS_MAX, $roomId, $this);
 							break;
 						case AM_FNC_INPUTSELECT:
-						   $module->SyncSource($value, $roomId, $this);
+							$module->SyncSource($value, $roomId, $this);
 							break;
 						case AM_FNC_INPUTGAIN:
 							break;
@@ -115,6 +124,13 @@ public function HandleEvent($variable, $value, IPSModuleAVControl $module) {
 			}
 		}
 
+		private function HandleError($result) {
+			if ($result==false) {
+				$errorMessage = GetValue(IPS_GetObjectIDByIdent(AM_VAR_LASTERROR, $this->instanceId));
+				trigger_error($errorMessage);
+			}
+		}
+
 		/**
 		 * @public
 		 *
@@ -124,18 +140,20 @@ public function HandleEvent($variable, $value, IPSModuleAVControl $module) {
 		 * @param boolean $value Wert f�r Power (Wertebereich false=Off, true=On)
 		 */
 		public function SetPower($outputId, $value) {
-		   AudioMax_SetRoomPower($this->instanceId, $outputId, $value);
+			$result = AudioMax_SetRoomPower($this->instanceId, $outputId, $value);
+			$this->HandleError($result);
 			if ($value) {
-		   	AudioMax_SetMainPower($this->instanceId, $value);
+				$result = AudioMax_SetMainPower($this->instanceId, $value);
 			} else {
-			   $allRoomesOff = true;
+				$allRoomesOff = true;
 				for ($roomId=0;$roomId<AM_CONFIG_ROOM_COUNT;$roomId++) {
-					$allRoomesOff = $allRoomesOff and !AudioMax_GetRoomPower($this->instanceId, $roomId);
+					$allRoomesOff = ($allRoomesOff and !AudioMax_GetRoomPower($this->instanceId, $roomId));
 				}
 				if ($allRoomesOff) {
-			   	AudioMax_SetMainPower($this->instanceId, $value);
+					$result = AudioMax_SetMainPower($this->instanceId, $value);
 				}
 			}
+			$this->HandleError($result);
 		}
 
 		/**
@@ -161,7 +179,7 @@ public function GetPower($outputId) {
 		 * @param integer $value Eingang der gesetzt werden soll (Wertebereich 0 - x)
 		 */
 		public function SetSource($outputId, $value) {
-			AudioMax_SetRoomPower($this->instanceId, $outputId, $value);
+			$this->HandleError(AudioMax_SetInputSelect($this->instanceId, $outputId, $value));
 		}
 
 		/**
@@ -173,7 +191,7 @@ public function SetSource($outputId, $value) {
 		 * @return integer Eingang der gerade gew�hlt ist (Wertebereich 0 - x)
 		 */
 		public function GetSource($outputId) {
-			return AudioMax_SetRoomPower($this->instanceId, $outputId);
+			return AudioMax_GetInputSelect($this->instanceId, $outputId);
 		}
 
 		/**
@@ -185,7 +203,7 @@ public function GetSource($outputId) {
 		 * @param integer $value Wert der Lautst�rke (Wertebereich 0 - 100)
 		 */
 		public function SetVolume($outputId, $value) {
-		   AudioMax_SetVolume($this->instanceId, $outputId, $value * AM_VAL_VOLUME_MAX / 100);
+			$this->HandleError(AudioMax_SetVolume($this->instanceId, $outputId, $value * AM_VAL_VOLUME_MAX / 100));
 		}
 
 		/**
@@ -197,7 +215,7 @@ public function SetVolume($outputId, $value) {
 		 * @return integer Wert der Lautst�rke (Wertebereich 0 - 100)
 		 */
 		public function GetVolume($outputId) {
-		   return AudioMax_GetVolume($this->instanceId, $outputId) * 100 / AM_VAL_VOLUME_MAX;
+			return AudioMax_GetVolume($this->instanceId, $outputId) * 100 / AM_VAL_VOLUME_MAX;
 		}
 
 		/**
@@ -209,7 +227,18 @@ public function GetVolume($outputId) {
 		 * @param boolean $value Wert f�r Muting (Wertebereich true oder false)
 		 */
 		public function SetMute($outputId, $value) {
-		   return AudioMax_SetMute($this->instanceId, $outputId, $value);
+			$this->HandleError(AudioMax_SetMute($this->instanceId, $outputId, $value));
+		}
+
+		/**
+		 * @public
+		 *
+		 * Setzen des Mutings f�r einen Ausgang
+		 *
+		 * @param integer $outputId Ausgang der ge�ndert werden soll (Wertebereich 0 - x)
+		 */
+		public function ToggleMute($outputId) {
+			$this->HandleError(AudioMax_SetMute($this->instanceId, $outputId, !AudioMax_GetMute($this->instanceId)));
 		}
 
 		/**
@@ -221,7 +250,7 @@ public function SetMute($outputId, $value) {
 		 * @return boolean Wert f�r Muting (Wertebereich true oder false)
 		 */
 		public function GetMute($outputId) {
-		   return AudioMax_GetMute($this->instanceId, $outputId);
+			return AudioMax_GetMute($this->instanceId, $outputId);
 		}
 
 		/**
@@ -233,7 +262,7 @@ public function GetMute($outputId) {
 		 * @param integer $value Wert f�r Balance (Wertebereich: Links 0 - 50 , 51 - 100 Rechts)
 		 */
 		public function SetBalance($outputId, $value) {
-		   AudioMax_SetBalance($this->instanceId, $outputId, $value * AM_VAL_BALANCE_MAX / 100);
+			$this->HandleError(AudioMax_SetBalance($this->instanceId, $outputId, $value * AM_VAL_BALANCE_MAX / 100));
 		}
 
 		/**
@@ -245,7 +274,7 @@ public function SetBalance($outputId, $value) {
 		 * @return integer Wert f�r Balance (Wertebereich: Links 0 - 50 , 51 - 100 Rechts)
 		 */
 		public function GetBalance($outputId) {
-		   return AudioMax_GetBalance($this->instanceId, $outputId) * 100 / AM_VAL_BALANCE_MAX;
+			return AudioMax_GetBalance($this->instanceId, $outputId) * 100 / AM_VAL_BALANCE_MAX;
 		}
 
 		/**
@@ -257,7 +286,7 @@ public function GetBalance($outputId) {
 		 * @param integer $value Wert f�r H�hen (Wertebereich 0 - 100)
 		 */
 		public function SetTreble($outputId, $value) {
-		   AudioMax_SetTreble($this->instanceId, $outputId, $value * AM_VAL_TREBLE_MAX / 100);
+			$this->HandleError(AudioMax_SetTreble($this->instanceId, $outputId, $value * AM_VAL_TREBLE_MAX / 100));
 		}
 
 		/**
@@ -269,7 +298,7 @@ public function SetTreble($outputId, $value) {
 		 * @return integer Wert der H�hen (Wertebereich 0 -100)
 		 */
 		public function GetTreble($outputId) {
-		   return AudioMax_GetTreble($this->instanceId, $outputId) * 100 / AM_VAL_TREBLE_MAX;
+			return AudioMax_GetTreble($this->instanceId, $outputId) * 100 / AM_VAL_TREBLE_MAX;
 		}
 
 		/**
@@ -281,7 +310,7 @@ public function GetTreble($outputId) {
 		 * @param integer $value Wert f�r Mitten (Wertebereich 0 - 100)
 		 */
 		public function SetMiddle($outputId, $value) {
-		   AudioMax_SetMiddle($this->instanceId, $outputId, $value * AM_VAL_MIDDLE_MAX / 100);
+			$this->HandleError(AudioMax_SetMiddle($this->instanceId, $outputId, $value * AM_VAL_MIDDLE_MAX / 100));
 		}
 
 		/**
@@ -293,7 +322,7 @@ public function SetMiddle($outputId, $value) {
 		 * @return integer Wert der Mitten (Wertebereich 0 -100)
 		 */
 		public function GetMiddle($outputId) {
-		   return AudioMax_GetMiddle($this->instanceId, $outputId) * 100 / AM_VAL_MIDDLE_MAX;
+			return AudioMax_GetMiddle($this->instanceId, $outputId) * 100 / AM_VAL_MIDDLE_MAX;
 		}
 
 		/**
@@ -305,7 +334,7 @@ public function GetMiddle($outputId) {
 		 * @param integer $value Wert f�r B�sse (Wertebereich 0 - 100)
 		 */
 		public function SetBass($outputId, $value) {
-		   AudioMax_SetBass($this->instanceId, $outputId, $value * AM_VAL_BASS_MAX / 100);
+			$this->HandleError(AudioMax_SetBass($this->instanceId, $outputId, $value * AM_VAL_BASS_MAX / 100));
 		}
 
 		/**
@@ -317,7 +346,7 @@ public function SetBass($outputId, $value) {
 		 * @return integer Wert der B�sse (Wertebereich 0 -100)
 		 */
 		public function GetBass($outputId) {
-		   return AudioMax_GetBass($this->instanceId, $outputId) * 100 / AM_VAL_BASS_MAX;
+			return AudioMax_GetBass($this->instanceId, $outputId) * 100 / AM_VAL_BASS_MAX;
 		}
 
 	}

IPSLibrary/app/core/IPSComponent/IPSComponentAVControl/IPSModuleAVControl_Entertainment.class.php

@@ -7,7 +7,7 @@
 	 *
 	 */
 
-	IPSUtils_Include ("Entertainment_InterfaceIPSComponent.inc.php", "IPSLibrary::app::modules::Entertainment");
+	IPSUtils_Include ("Entertainment_InterfaceIPSComponentAVControl.inc.php", "IPSLibrary::app::modules::Entertainment");
 	IPSUtils_Include ('IPSModuleAVControl.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentAVControl');
 
 	/**
@@ -41,7 +41,7 @@ public function __construct() {
 		 * @param IPSComponentAVControl $component Component Object das einen Werte synchronisieren will
 		 */
 		public function SyncPower($value, $outputId, IPSComponentAVControl $component) {
-		   Entertainment_IPSComponent_ReceiveData($component->GetComponentParams(), 'SetPower', $output, $value);
+		   Entertainment_IPSComponent_ReceiveData($component->GetComponentParams(), 'SetPower', $outputId, $value);
 		}
 
 		/**
@@ -54,7 +54,7 @@ public function SyncPower($value, $outputId, IPSComponentAVControl $component) {
 		 * @param IPSComponentAVControl $component Component Object das einen Werte synchronisieren will
 		 */
 		public function SyncVolume($value, $outputId, IPSComponentAVControl $component) {
-		   Entertainment_IPSComponent_ReceiveData($component->GetComponentParams(), 'SetVolume', $output, $value);
+		   Entertainment_IPSComponent_ReceiveData($component->GetComponentParams(), 'SetVolume', $outputId, $value);
 		}
 
 		/**
@@ -67,7 +67,7 @@ public function SyncVolume($value, $outputId, IPSComponentAVControl $component)
 		 * @param IPSComponentAVControl $component Component Object das einen Werte synchronisieren will
 		 */
 		public function SyncMute($value, $outputId, IPSComponentAVControl $component) {
-		   Entertainment_IPSComponent_ReceiveData($component->GetComponentParams(), 'SetMute', $output, $value);
+			Entertainment_IPSComponent_ReceiveData($component->GetComponentParams(), 'SetMute', $outputId, $value);
 		}
 
 		/**
@@ -80,7 +80,7 @@ public function SyncMute($value, $outputId, IPSComponentAVControl $component) {
 		 * @param IPSComponentAVControl $component Component Object das einen Werte synchronisieren will
 		 */
 		public function SyncBalance($value, $outputId, IPSComponentAVControl $component) {
-		   Entertainment_IPSComponent_ReceiveData($component->GetComponentParams(), 'SetBalance', $output, $value);
+		   Entertainment_IPSComponent_ReceiveData($component->GetComponentParams(), 'SetBalance', $outputId, $value);
 		}
 
 		/**
@@ -93,7 +93,7 @@ public function SyncBalance($value, $outputId, IPSComponentAVControl $component)
 		 * @param IPSComponentAVControl $component Component Object das einen Werte synchronisieren will
 		 */
 		public function SyncSource($value, $outputId, IPSComponentAVControl $component) {
-		   Entertainment_IPSComponent_ReceiveData($component->GetComponentParams(), 'SetSource', $output, $value);
+		   Entertainment_IPSComponent_ReceiveData($component->GetComponentParams(), 'SetSource', $outputId, $value);
 		}
 
 		/**
@@ -106,7 +106,7 @@ public function SyncSource($value, $outputId, IPSComponentAVControl $component)
 		 * @param IPSComponentAVControl $component Component Object das einen Werte synchronisieren will
 		 */
 		public function SyncTreble($value, $outputId, IPSComponentAVControl $component) {
-		   Entertainment_IPSComponent_ReceiveData($component->GetComponentParams(), 'SetTreble', $output, $value);
+		   Entertainment_IPSComponent_ReceiveData($component->GetComponentParams(), 'SetTreble', $outputId, $value);
 		}
 
 		/**
@@ -119,7 +119,7 @@ public function SyncTreble($value, $outputId, IPSComponentAVControl $component)
 		 * @param IPSComponentAVControl $component Component Object das einen Werte synchronisieren will
 		 */
 		public function SyncMiddle($value, $outputId, IPSComponentAVControl $component) {
-		   Entertainment_IPSComponent_ReceiveData($component->GetComponentParams(), 'SetMiddle', $output, $value);
+		   Entertainment_IPSComponent_ReceiveData($component->GetComponentParams(), 'SetMiddle', $outputId, $value);
 		}
 
 		/**
@@ -132,7 +132,7 @@ public function SyncMiddle($value, $outputId, IPSComponentAVControl $component)
 		 * @param IPSComponentAVControl $component Component Object das einen Werte synchronisieren will
 		 */
 		public function SyncBass($value, $outputId, IPSComponentAVControl $component) {
-		   Entertainment_IPSComponent_ReceiveData($component->GetComponentParams(), 'SetBass', $output, $value);
+		   Entertainment_IPSComponent_ReceiveData($component->GetComponentParams(), 'SetBass', $outputId, $value);
 		}