From 892a7e690519905794acd155806c1b4b7c070f51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20Ple=C3=9F?= <lucas@xleave.de>
Date: Fri, 25 May 2012 18:02:59 +0200
Subject: [PATCH] working on ethersex stuff

---
 .../de/ctdo/bunti/ethersex/EthersexMixerImpl.java | 15 +++++++++++++++
 .../de/ctdo/bunti/ethersex/SimpleECMDSender.java  |  2 ++
 2 files changed, 17 insertions(+)

diff --git a/src/main/java/de/ctdo/bunti/ethersex/EthersexMixerImpl.java b/src/main/java/de/ctdo/bunti/ethersex/EthersexMixerImpl.java
index 4a55ce1..66610ea 100644
--- a/src/main/java/de/ctdo/bunti/ethersex/EthersexMixerImpl.java
+++ b/src/main/java/de/ctdo/bunti/ethersex/EthersexMixerImpl.java
@@ -5,13 +5,22 @@ import de.ctdo.bunti.model.BuntiEthersexDevice;
 import de.ctdo.bunti.model.BuntiDevice;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationListener;
+import org.springframework.stereotype.Component;
 
 import java.util.Map;
 
+@Component
 public class EthersexMixerImpl implements  EthersexMixer, ApplicationListener<DeviceChangedEvent> {
     private static final Logger LOGGER = LoggerFactory.getLogger(EthersexMixerImpl.class);
 //    private boolean hasDataChanged = true;
+    ECMDSender sender;
+
+    @Autowired
+    public void setECMDSender(ECMDSender sender) {
+        this.sender = sender;
+    }
 
     @Override
     public final boolean updateDevice(BuntiDevice device, Map<String, Object> options) {
@@ -19,6 +28,12 @@ public class EthersexMixerImpl implements  EthersexMixer, ApplicationListener<De
             return false;
         }
 
+        BuntiEthersexDevice edev = (BuntiEthersexDevice) device;
+
+
+
+
+
 //        BuntiDMXDevice dmxDev = (BuntiDMXDevice) device;
 //
 //        if (dmxDev.setValuesFromOptions(options)) {
diff --git a/src/main/java/de/ctdo/bunti/ethersex/SimpleECMDSender.java b/src/main/java/de/ctdo/bunti/ethersex/SimpleECMDSender.java
index 6cda7ea..6b50c98 100644
--- a/src/main/java/de/ctdo/bunti/ethersex/SimpleECMDSender.java
+++ b/src/main/java/de/ctdo/bunti/ethersex/SimpleECMDSender.java
@@ -24,6 +24,8 @@ public class SimpleECMDSender implements ECMDSender {
 
         try {
             Socket client = new Socket(dest, ECMD_TCP_PORT);
+            client.setSoTimeout(2000);
+
 
             DataOutputStream outToServer = new DataOutputStream(client.getOutputStream());
             BufferedReader inFromServer = new BufferedReader(new InputStreamReader(client.getInputStream()));