Skip to content

Commit 8660b23

Browse files
committed
Merge pull request #7 from eluchsinger/media-player-enhancement
Media player enhancement
2 parents 52638f3 + 58c98c9 commit 8660b23

File tree

71 files changed

+1311
-310
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+1311
-310
lines changed

.gitignore

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,16 @@
11
#Idea Projects
22
**/.idea/workspace.xml
3+
**/.idea/dictionaries/eluch.xml
34
**/.idea/tasks.xml
4-
**/.idea
5+
**/.idea/modules
6+
**/.idea/libraries
7+
**/.idea/compiler.xml
8+
**/.idea/gradle.xml
9+
**/.idea/misc.xml
10+
**/.idea/modules.xml
11+
**/.idea/vcs.xml
12+
**/.idea/uiDesigner.xml
13+
514
#WirelessSoundSystem.iml
615

716
# Windows image file caches
@@ -11,6 +20,7 @@ ehthumbs.db
1120
# Folder config file
1221
Desktop.ini
1322

23+
1424
# Recycle Bin used on file shares
1525
$RECYCLE.BIN/
1626

.idea/.name

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/copyright/profiles_settings.xml

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/dictionaries/Esteban.xml

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/encodings.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/file.template.settings.xml

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/fileTemplates/includes/File Header.java

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/inspectionProfiles/Project_Default.xml

Lines changed: 24 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/inspectionProfiles/profiles_settings.xml

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Client/build.gradle

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,20 @@ plugins {
55

66
repositories {
77
jcenter()
8+
9+
flatDir {
10+
dirs 'resources/libs'
11+
}
812
}
913

14+
mainClassName = "controllers.MainApp"
15+
version = 0.2
16+
1017
mainClassName = "controllers.MainApp"
1118

1219
dependencies {
1320
testCompile group: 'junit', name: 'junit', version: '4.11'
21+
compile files('resources/libs/jl1.0.1.jar')
1422
compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.+'
1523
compile group: 'ch.qos.logback', name: 'logback-classic', version: '1.+'
1624
compile project (':shared')

0 commit comments

Comments
 (0)