Skip to content

Commit

Permalink
Version change + config for VLC on Ubuntu
Browse files Browse the repository at this point in the history
  • Loading branch information
egyedia committed May 5, 2016
1 parent 9f15fd9 commit 8219f41
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 9 deletions.
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.dubylon</groupId>
<artifactId>photo-chaos-organizer-project</artifactId>
<version>0.1.5-SNAPSHOT</version>
<version>0.1.5</version>
<packaging>pom</packaging>

<properties>
Expand All @@ -19,7 +19,7 @@
<dependency>
<groupId>com.dubylon</groupId>
<artifactId>photo-chaos-organizer-server</artifactId>
<version>0.1.5-SNAPSHOT</version>
<version>0.1.5</version>
</dependency>
</dependencies>

Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/bin/start-pco.cmd
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
cls
@echo ----------------------------------------------
@echo Launching Photo Chaos Organizer 0.1.5-SNAPSHOT
@echo Launching Photo Chaos Organizer 0.1.5
@echo ----------------------------------------------
@echo off
set DIRNAME=%~dp0

java -jar "%DIRNAME%/photo-chaos-organizer-0.1.5-SNAPSHOT.jar"
java -jar "%DIRNAME%/photo-chaos-organizer-0.1.5.jar"
4 changes: 2 additions & 2 deletions src/main/resources/bin/start-pco.command
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/bin/sh
clear
echo ----------------------------------------------
echo Launching Photo Chaos Organizer 0.1.5-SNAPSHOT
echo Launching Photo Chaos Organizer 0.1.5
echo ----------------------------------------------
echo
DIRNAME=`dirname "$0"`

java -jar $DIRNAME/photo-chaos-organizer-0.1.5-SNAPSHOT.jar
java -jar $DIRNAME/photo-chaos-organizer-0.1.5.jar
4 changes: 2 additions & 2 deletions src/main/resources/bin/start-pco.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/bin/sh
clear
echo ----------------------------------------------
echo Launching Photo Chaos Organizer 0.1.5-SNAPSHOT
echo Launching Photo Chaos Organizer 0.1.5
echo ----------------------------------------------
echo
DIRNAME=`dirname "$0"`

java -jar $DIRNAME/photo-chaos-organizer-0.1.5-SNAPSHOT.jar
java -jar $DIRNAME/photo-chaos-organizer-0.1.5.jar
8 changes: 7 additions & 1 deletion src/main/resources/config/pco.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,18 @@
"${videoFile}"
]
},
"VLC": {
"VLC on OS X": {
"executable": "/Applications/VLC 2.1.0.app/Contents/MacOS/VLC",
"arguments": [
"--intf macosx",
"${videoFile}"
]
},
"VLC on Ubuntu": {
"executable": "/usr/bin/vlc",
"arguments": [
"${videoFile}"
]
}
},
"defaultPlayer": "MPlayer"
Expand Down

0 comments on commit 8219f41

Please sign in to comment.