Merge pull request #49 from Felix-Franz/unstable

release 2.0 stable
Felix-Franz · Oct 28, 2017 · 3b30dbc · 3b30dbc
2 parents 99dd162 + c4ec217
commit 3b30dbc
Show file tree

Hide file tree

Showing 316 changed files with 34,326 additions and 883 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+*.sh eol=lf
diff --git a/.gitignore b/.gitignore
@@ -1,10 +1,9 @@
 *.class
-.classpath
-.project
-/.settings
 
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
+.settings/
+.idea/
+target/
+out/
 
 # Package Files #
 *.jar
@@ -13,3 +12,5 @@
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
+
+*.iml
diff --git a/README.md b/README.md
@@ -3,9 +3,11 @@ A desktop software to control one or more instances of VLC media player simultan
 
 ## Using the software
 
-If you are interested in using the software just go to the releases:
-[Releases](//github.com/Felix-Franz/VLCController/releases)
+If you are interested in using the software read the wiki first or just go to the releases:
+* [Wiki](//github.com/Felix-Franz/VLCController/wiki/)
+* [Releases](//github.com/Felix-Franz/VLCController/releases)
 
 ## Using the Code
 
-Just [clone the repository](https://youtu.be/ptK9-CNms98) and import it into eclipse!
+Just clone the repository into [IntelliJ](https://www.jetbrains.com/idea/)!
+This project is using Maven!
diff --git a/bin/.gitignore b/bin/.gitignore
diff --git a/bin/README.txt b/bin/README.txt
diff --git a/bin/Start.bat b/bin/Start.bat
diff --git a/bin/Start.sh b/bin/Start.sh
diff --git a/bin/conf/server.conf b/bin/conf/server.conf
diff --git a/bin/conf/webpage/index-advanced.html b/bin/conf/webpage/index-advanced.html
diff --git a/bin/conf/webpage/index-simple.html b/bin/conf/webpage/index-simple.html
diff --git a/bin/conf/webpage/index.html b/bin/conf/webpage/index.html
diff --git a/bin/conf/webpage/styles.css b/bin/conf/webpage/styles.css
diff --git a/bin/docs/1.PNG b/bin/docs/1.PNG
diff --git a/bin/docs/2.PNG b/bin/docs/2.PNG
diff --git a/conf/player.json b/conf/player.json
@@ -0,0 +1,8 @@
+[
+  {
+    "name": "local_device",
+    "host": "127.0.0.1",
+    "port": 4212,
+    "password": "pass"
+  }
+]
diff --git a/conf/settings.json b/conf/settings.json
@@ -0,0 +1,8 @@
+{
+  "loggingLevel": "INFO",
+  "port": 8080,
+  "connectorTimeout": 1000,
+  "openBrowserOnStart": true,
+  "maxVLCConnectionThreads": 10,
+  "shutdownTime": 30
+}
diff --git a/frontend.webapp/WEB-INF/web.xml b/frontend.webapp/WEB-INF/web.xml
@@ -0,0 +1,15 @@
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+    <servlet>
+        <servlet-name>backend.rest.core.Application</servlet-name>
+        <servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class>
+        <init-param>
+            <param-name>javax.ws.rs.Application</param-name>
+            <param-value>backend.rest.core.Application</param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>backend.rest.core.Application</servlet-name>
+        <url-pattern>/api/*</url-pattern>
+    </servlet-mapping>
+</web-app>
diff --git a/frontend.webapp/desktop.css b/frontend.webapp/desktop.css
@@ -0,0 +1,14 @@
+.controlbtn  {
+	padding: 1em;
+	padding-left: 1.5em;
+	padding-right: 1.5em;
+  	margin-top: 1em;
+}
+
+#controlBackward {
+	margin-right: 1em;
+}
+
+#controlForward {
+	margin-left: 1em;
+}