Merge branch '0.0.12'

patrickse · Nov 20, 2018 · cf791b6 · cf791b6
2 parents dd5d668 + 6fcfc6f
commit cf791b6
Show file tree

Hide file tree

Showing 24 changed files with 858 additions and 811 deletions.
diff --git a/.classpath b/.classpath
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry exported="true" kind="lib" path="lib/socket.io-client-0.8.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/engine.io-client-0.8.1.jar"/>

diff --git a/.settings/org.eclipse.jdt.apt.core.prefs b/.settings/org.eclipse.jdt.apt.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.apt.aptEnabled=false
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
@@ -5,4 +5,5 @@ org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.processAnnotations=disabled
 org.eclipse.jdt.core.compiler.source=1.8
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "java.configuration.updateBuildConfiguration": "interactive"
+}
diff --git a/ESH-INF/binding/binding.xml b/ESH-INF/binding/binding.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <binding:binding id="volumio2"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xmlns:binding="http://eclipse.org/smarthome/schemas/binding/v1.0.0"
-        xsi:schemaLocation="http://eclipse.org/smarthome/schemas/binding/v1.0.0 http://eclipse.org/smarthome/schemas/binding-1.0.0.xsd">
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xmlns:binding="http://eclipse.org/smarthome/schemas/binding/v1.0.0"
+		xsi:schemaLocation="http://eclipse.org/smarthome/schemas/binding/v1.0.0 http://eclipse.org/smarthome/schemas/binding-1.0.0.xsd">
 
-    <name>Volumio2 Binding</name>
-    <description>This is the binding for Volumio2 devices</description>
-    <author>Patrick Sernetz</author>
+	<name>Volumio2 Binding</name>
+	<description>This is the binding for Volumio2 devices</description>
+	<author>Patrick Sernetz</author>
 
-    <config-description>
-        <parameter name="callbackUrl" type="text">
-            <label>Callback URL</label>
-            <description>URL to use for playing notification sounds, e.g. http://192.168.0.2:8080</description>
-            <required>false</required>
-        </parameter>
-    </config-description>
+	<config-description>
+		<parameter name="callbackUrl" type="text">
+			<label>Callback URL</label>
+			<description>URL to use for playing notification sounds, e.g. http://192.168.0.2:8080</description>
+			<required>false</required>
+		</parameter>
+	</config-description>
 
-</binding:binding>
+</binding:binding>
diff --git a/ESH-INF/thing/thing-types.xml b/ESH-INF/thing/thing-types.xml
@@ -1,150 +1,150 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <thing:thing-descriptions bindingId="volumio2"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xmlns:thing="http://eclipse.org/smarthome/schemas/thing-description/v1.0.0"
-        xsi:schemaLocation="http://eclipse.org/smarthome/schemas/thing-description/v1.0.0 http://eclipse.org/smarthome/schemas/thing-description-1.0.0.xsd">
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xmlns:thing="http://eclipse.org/smarthome/schemas/thing-description/v1.0.0"
+		xsi:schemaLocation="http://eclipse.org/smarthome/schemas/thing-description/v1.0.0 http://eclipse.org/smarthome/schemas/thing-description-1.0.0.xsd">
 
-    <!-- Volumio Thing Type -->
-    <thing-type id="player">
-        <label>Volumio2 Player</label>
-        <description>A Volumio2 Player</description>
+	<!-- Volumio Thing Type -->
+	<thing-type id="player">
+		<label>Volumio2 Player</label>
+		<description>A Volumio2 Player</description>
 
-        <channels>
-            <channel id="title" typeId="title"/>
-            <channel id="artist" typeId="artist"/>
-            <channel id="album" typeId="album"/>
-            <channel id="volume" typeId="volume"/>
-            <channel id="player" typeId="player"/>
+		<channels>
+			<channel id="title" typeId="title"/>
+			<channel id="artist" typeId="artist"/>
+			<channel id="album" typeId="album"/>
+			<channel id="volume" typeId="volume"/>
+			<channel id="player" typeId="player"/>
 <!--             <channel id="albumArt" typeId="albumArt"/> -->
-            <channel id="trackType" typeId="trackType"/>
-            <channel id="playRadioStream" typeId="playRadioStream"/>
-            <channel id="playPlaylist" typeId="playPlaylist"/>
-            <channel id="clearQueue" typeId="clearQueue"/>
-            <channel id="playURI" typeId="playURI"/>
-            <channel id="playFile" typeId="playFile"/>
-            <channel id="random" typeId="playRandom"/>
-            <channel id="repeat" typeId="playRepeat"/>
-        </channels>
-        
-        <config-description>
-            <parameter name="hostname" type="text" required="true">
-                <label>Hostname</label>
-                <description>The hostname of your volumio2 device</description>
-            </parameter>
-            <parameter name="port" type="integer" required="true">
-                <label>Port</label>
-                <description>The port of your volumio2 device (default is 3000)</description>
-                <default>3000</default>
-            </parameter>
-            <parameter name="protocol" type="text" required="true">
-                <label>Protocol</label>
-                <description>The protocol of your volumio2 device (default is http)</description>
-                <limitToOptions>true</limitToOptions>
-                <options>
-                    <option value="http">http</option>
-                    <option value="https">https</option>
-                </options>
-            </parameter>
-            <parameter name="timeout" type="integer" required="true">
-                <label>Timeout</label>
-                <description>Connection-Timeout in ms</description>
-                <default>5000</default>
-                <advanced>true</advanced>
-            </parameter>
-        </config-description>
-        
-    </thing-type>
+			<channel id="trackType" typeId="trackType"/>
+			<channel id="playRadioStream" typeId="playRadioStream"/>
+			<channel id="playPlaylist" typeId="playPlaylist"/>
+			<channel id="clearQueue" typeId="clearQueue"/>
+			<channel id="playURI" typeId="playURI"/>
+			<channel id="playFile" typeId="playFile"/>
+			<channel id="random" typeId="playRandom"/>
+			<channel id="repeat" typeId="playRepeat"/>
+		</channels>
+		
+		<config-description>
+			<parameter name="hostname" type="text" required="true">
+				<label>Hostname</label>
+				<description>The hostname of your volumio2 device</description>
+			</parameter>
+			<parameter name="port" type="integer" required="true">
+				<label>Port</label>
+				<description>The port of your volumio2 device (default is 3000)</description>
+				<default>3000</default>
+			</parameter>
+			<parameter name="protocol" type="text" required="true">
+				<label>Protocol</label>
+				<description>The protocol of your volumio2 device (default is http)</description>
+				<limitToOptions>true</limitToOptions>
+				<options>
+					<option value="http">http</option>
+					<option value="https">https</option>
+				</options>
+			</parameter>
+			<parameter name="timeout" type="integer" required="true">
+				<label>Timeout</label>
+				<description>Connection-Timeout in ms</description>
+				<default>5000</default>
+				<advanced>true</advanced>
+			</parameter>
+		</config-description>
+		
+	</thing-type>
 
-    <channel-type id="title">
-        <item-type>String</item-type>
-        <label>Current Title</label>
-        <description>Title of the song currently playing</description>
-        <state readOnly="true"/>
-    </channel-type>
-    
-    <channel-type id="artist">
-        <item-type>String</item-type>
-        <label>Current Artist</label>
-        <description>Name of the artist currently playing</description>
-        <state readOnly="true"/>
-    </channel-type>
-    
-    <channel-type id="album">
-        <item-type>String</item-type>
-        <label>Current Album</label>
-        <description>Name of the album currently playing</description>
-        <state readOnly="true"/>
-    </channel-type>
-    
-    <channel-type id="volume">
-        <item-type>Dimmer</item-type>
-        <label>Volume</label>
-        <description>Set or get the master volume</description>
-        <category>SoundVolume</category>
-        <state max="100" min="0" step="10"/>
-    </channel-type>
-    
-    <channel-type id="player">
-        <item-type>Player</item-type>
-        <label>State</label>
-        <description>The State channel contains state of the Volumio2 Player</description>
-        <category>Player</category>
-    </channel-type>
+	<channel-type id="title">
+		<item-type>String</item-type>
+		<label>Current Title</label>
+		<description>Title of the song currently playing</description>
+		<state readOnly="true"/>
+	</channel-type>
+	
+	<channel-type id="artist">
+		<item-type>String</item-type>
+		<label>Current Artist</label>
+		<description>Name of the artist currently playing</description>
+		<state readOnly="true"/>
+	</channel-type>
+	
+	<channel-type id="album">
+		<item-type>String</item-type>
+		<label>Current Album</label>
+		<description>Name of the album currently playing</description>
+		<state readOnly="true"/>
+	</channel-type>
+	
+	<channel-type id="volume">
+		<item-type>Dimmer</item-type>
+		<label>Volume</label>
+		<description>Set or get the master volume</description>
+		<category>SoundVolume</category>
+		<state max="100" min="0" step="10"/>
+	</channel-type>
+	
+	<channel-type id="player">
+		<item-type>Player</item-type>
+		<label>State</label>
+		<description>The State channel contains state of the Volumio2 Player</description>
+		<category>Player</category>
+	</channel-type>
 
-    <channel-type id="albumArt" advanced="true">
-        <item-type>Image</item-type>
-        <label>Cover Art</label>
-        <description>Cover Art for the currently played track</description>
-        <state readOnly="true"/>
-    </channel-type>
-    
-    <channel-type id="trackType" advanced="true">
-        <item-type>String</item-type>
-        <label>trackType</label>
-        <description>Tracktype of the currently played track</description>
-        <state readOnly="true"/>
-    </channel-type>
+	<channel-type id="albumArt" advanced="true">
+		<item-type>Image</item-type>
+		<label>Cover Art</label>
+		<description>Cover Art for the currently played track</description>
+		<state readOnly="true"/>
+	</channel-type>
+	
+	<channel-type id="trackType" advanced="true">
+		<item-type>String</item-type>
+		<label>trackType</label>
+		<description>Tracktype of the currently played track</description>
+		<state readOnly="true"/>
+	</channel-type>
 
-    <channel-type id="playRadioStream" advanced="true">
-        <item-type>String</item-type>
-        <label>Play radio stream</label>
-        <description>Play the given radio stream</description>
-    </channel-type>
-    
-    <channel-type id="playPlaylist" advanced="true">
-        <item-type>String</item-type>
-        <label>Play playlist</label>
-        <description>Playback a playlist identifed by its name</description>
-    </channel-type>
-    
-    <channel-type id="clearQueue" advanced="true">
-        <item-type>Switch</item-type>
-        <label>Clear queue</label>
-        <description>Clear the current queue</description>
-    </channel-type>
+	<channel-type id="playRadioStream" advanced="true">
+		<item-type>String</item-type>
+		<label>Play radio stream</label>
+		<description>Play the given radio stream</description>
+	</channel-type>
+	
+	<channel-type id="playPlaylist" advanced="true">
+		<item-type>String</item-type>
+		<label>Play playlist</label>
+		<description>Playback a playlist identifed by its name</description>
+	</channel-type>
+	
+	<channel-type id="clearQueue" advanced="true">
+		<item-type>Switch</item-type>
+		<label>Clear queue</label>
+		<description>Clear the current queue</description>
+	</channel-type>
 
-    <channel-type id="playRandom" advanced="true">
-        <item-type>Switch</item-type>
-        <label>Random</label>
-        <description>Activate random mode</description>
-    </channel-type>
+	<channel-type id="playRandom" advanced="true">
+		<item-type>Switch</item-type>
+		<label>Random</label>
+		<description>Activate random mode</description>
+	</channel-type>
 
-    <channel-type id="playRepeat" advanced="true">
-        <item-type>Switch</item-type>
-        <label>Repeat</label>
-        <description>Activate repeat mode</description>
-    </channel-type>
+	<channel-type id="playRepeat" advanced="true">
+		<item-type>Switch</item-type>
+		<label>Repeat</label>
+		<description>Activate repeat mode</description>
+	</channel-type>
 
-    <channel-type id="playURI" advanced="true">
-        <item-type>String</item-type>
-        <label>Play URI</label>
-        <description>Play the stream at given uri</description>
-    </channel-type>
-    
-    <channel-type id="playFile" advanced="true">
-        <item-type>String</item-type>
-        <label>Play file</label>
-        <description>Play a file, located on your Volumio2 device at the given absolute path, e.g. "mnt/INTERNAL/song.mp3"</description>
-    </channel-type>
+	<channel-type id="playURI" advanced="true">
+		<item-type>String</item-type>
+		<label>Play URI</label>
+		<description>Play the stream at given uri</description>
+	</channel-type>
+	
+	<channel-type id="playFile" advanced="true">
+		<item-type>String</item-type>
+		<label>Play file</label>
+		<description>Play a file, located on your Volumio2 device at the given absolute path, e.g. "mnt/INTERNAL/song.mp3"</description>
+	</channel-type>
 
 </thing:thing-descriptions>
diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: volumio2 Binding
 Bundle-SymbolicName: org.openhab.binding.volumio2;singleton:=true
 Bundle-Vendor: openHAB
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.4.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ClassPath: .,lib/socket.io-client-0.8.1.jar,lib/engine.io-client-0.8.1.jar,lib/json-20090211.jar,lib/okhttp-3.4.1.jar,lib/okhttp-ws-3.4.1.jar,lib/okio-1.9.0.jar
 Export-Package: org.openhab.binding.volumio2,
@@ -12,6 +12,7 @@ Import-Package:
  javax.jmdns,
  org.apache.commons.io,
  org.apache.commons.lang,
+ org.eclipse.jdt.annotation;resolution:=optional,
  org.eclipse.smarthome.config.core,
  org.eclipse.smarthome.config.discovery,
  org.eclipse.smarthome.config.discovery.inbox,
@@ -24,6 +25,7 @@ Import-Package:
  org.eclipse.smarthome.core.thing.binding.builder,
  org.eclipse.smarthome.core.thing.type,
  org.eclipse.smarthome.core.types,
+ org.eclipse.smarthome.core.util,
  org.eclipse.smarthome.io.transport.mdns,
  org.eclipse.smarthome.io.transport.mdns.discovery,
  org.openhab.binding.volumio2,
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		eclipse.preferences.version=1
		org.eclipse.jdt.apt.aptEnabled=false