Merge branch 'add_effect_engine' of https://github.com/tvdzwan/hyperion.git into add_effect_engine

Former-commit-id: 34587c803308d43d2fabf3eed5e19727acf18901

bin/update_hyperion.sh

@@ -1,41 +0,0 @@
-#!/bin/sh
-
-# Script for downloading and installing the latest Hyperion release
-
-# Find out if we are on XBian
-IS_XBIAN=`cat /etc/issue | grep XBian | wc -l`
-
-# Make sure that the boblight daemon is no longer running
-BOBLIGHT_PROCNR=$(ps -e | grep "boblight" | wc -l)
-if [ $BOBLIGHT_PROCNR -eq 1 ];
-then
-	echo 'Found running instance of boblight. Please stop boblight via XBMC menu before installing hyperion'
-	exit
-fi
-
-# Stop hyperion daemon if it is running
-/sbin/initctl stop hyperion
-
-# Get the Hyperion executable
-wget -N https://raw.github.com/tvdzwan/hyperion/master/deploy/hyperiond -P /usr/bin/
-chmod +x /usr/bin/hyperiond
-
-# Get the Hyperion command line utility
-wget -N https://raw.github.com/tvdzwan/hyperion/master/deploy/hyperion-remote -P /usr/bin/
-chmod +x /usr/bin/hyperion-remote
-
-# Copy the gpio changer (gpio->spi) to the /usr/bin
-if [ $IS_XBIAN -eq 0 ]; then
-	wget -N https://raw.github.com/tvdzwan/hyperion/master/deploy/gpio2spi -P /usr/bin/
-	chmod +x /usr/bin/gpio2spi
-fi
-
-# Copy the service control configuration to /etc/int
-if [ $IS_XBIAN -eq 0 ]; then
-	wget -N https://raw.github.com/tvdzwan/hyperion/master/deploy/hyperion.conf -P /etc/init/
-else
-	wget -N https://raw.github.com/tvdzwan/hyperion/master/deploy/hyperion.xbian.conf -P /etc/init/ -O hyperion.conf
-fi
-
-# Start the hyperion daemon
-/sbin/initctl start hyperion

deploy/HyperCon.jar.REMOVED.git-id

@@ -1 +1 @@
-a7a90d7ac31f76d56191446cd28fa7088e47199b
+0e33a5994203b58676a56efa2addf362a276c219

deploy/hyperion.tar.gz.REMOVED.git-id

@@ -0,0 +1 @@
+e7d6f548d20e8a1dd817e4200fbedff8f7b042f9

include/effectengine/EffectEngine.h

@@ -35,9 +35,6 @@ public slots:
 	/// Run the specified effect on the given priority channel and optionally specify a timeout
 	int runEffect(const std::string &effectName, const Json::Value & args, int priority, int timeout = -1);
 
-	/// Run the specified effect on the given priority channel and optionally specify a timeout
-	int runEffectScript(const std::string &script, const Json::Value & args, int priority, int timeout = -1);
-
 	/// Clear any effect running on the provided channel
 	void channelCleared(int priority);
 
@@ -47,6 +44,10 @@ public slots:
 private slots:
 	void effectFinished(Effect * effect);
 
+private:
+	/// Run the specified effect on the given priority channel and optionally specify a timeout
+	int runEffectScript(const std::string &script, const Json::Value & args, int priority, int timeout = -1);
+
 private:
 	Hyperion * _hyperion;
 

include/hyperion/Hyperion.h

@@ -157,13 +157,6 @@ public slots:
 	/// @param timout The timeout of the effect (after the timout, the effect will be cleared)
 	int setEffect(const std::string & effectName, const Json::Value & args, int priority, int timeout = -1);
 
-	/// Run the specified effect script on the given priority channel and optionally specify a timeout
-	/// @param script path of the effect script
-	/// @param args arguments of the effect script
-	///	@param priority The priority channel of the effect
-	/// @param timout The timeout of the effect (after the timout, the effect will be cleared)
-	int setEffectScript(const std::string &script, const Json::Value &args, int priority, int timeout);
-
 public:
 	static LedDevice * createDevice(const Json::Value & deviceConfig);
 	static ColorOrder createColorOrder(const Json::Value & deviceConfig);

libsrc/hyperion/Hyperion.cpp

@@ -510,11 +510,6 @@ int Hyperion::setEffect(const std::string &effectName, const Json::Value &args,
 	return _effectEngine->runEffect(effectName, args, priority, timeout);
 }
 
-int Hyperion::setEffectScript(const std::string &script, const Json::Value &args, int priority, int timeout)
-{
-	return _effectEngine->runEffectScript(script, args, priority, timeout);
-}
-
 void Hyperion::update()
 {
 	// Update the muxer, cleaning obsolete priorities

src/config-tool/ConfigTool/src/org/hyperion/hypercon/gui/ColorTransformPanel.java

@@ -101,7 +101,7 @@ public class ColorTransformPanel extends JPanel {
 			mIndexPanel.add(mIndexLabel, BorderLayout.WEST);
 			
 			mIndexField = new JTextField(mColorConfig.mLedIndexString);
-			mIndexField.setToolTipText("Comma seperated indices or index ranges (eg '1-10, 13, 14, 17-19')");
+			mIndexField.setToolTipText("Comma seperated indices or index ranges (eg '1-10, 13, 14, 17-19'); Special case '*', which means all leds");
 			mIndexField.getDocument().addDocumentListener(mDocumentListener);
 			mIndexPanel.add(mIndexField, BorderLayout.CENTER);
 		}

src/config-tool/ConfigTool/src/org/hyperion/hypercon/spec/TransformConfig.java

@@ -7,7 +7,7 @@ public class TransformConfig {
 	public String mId = "default";
 	
 	/** The indices to which this transform applies */
-	public String mLedIndexString = "0-49";
+	public String mLedIndexString = "*";
 	
 	/** The saturation gain (in HSV space) */
 	public double mSaturationGain = 1.0;