Merge pull request #39 from jcorporation/devel

Merge devel v4.0.0 into master

CMakeLists.txt

@@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 2.6)
 
 project (mympd C)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake/")
-set(CPACK_PACKAGE_VERSION_MAJOR "3")
-set(CPACK_PACKAGE_VERSION_MINOR "5")
+set(CPACK_PACKAGE_VERSION_MAJOR "4")
+set(CPACK_PACKAGE_VERSION_MINOR "0")
 set(CPACK_PACKAGE_VERSION_PATCH "0")
 
 if(CMAKE_BUILD_TYPE MATCHES RELEASE)
@@ -48,9 +48,8 @@ install(FILES dist/htdocs/player.html DESTINATION share/${PROJECT_NAME}/htdocs/)
 install(FILES dist/htdocs/sw.min.js DESTINATION share/${PROJECT_NAME}/htdocs/)
 install(FILES dist/htdocs/js/player.min.js DESTINATION share/${PROJECT_NAME}/htdocs/js/)
 install(FILES dist/htdocs/js/bootstrap-native-v4.min.js DESTINATION share/${PROJECT_NAME}/htdocs/js/)
-install(FILES dist/htdocs/js/mpd.min.js DESTINATION share/${PROJECT_NAME}/htdocs/js/)
+install(FILES dist/htdocs/js/mympd.min.js DESTINATION share/${PROJECT_NAME}/htdocs/js/)
 install(FILES dist/htdocs/css/bootstrap.min.css DESTINATION share/${PROJECT_NAME}/htdocs/css/)
-install(FILES dist/htdocs/css/mpd.min.css DESTINATION share/${PROJECT_NAME}/htdocs/css/)
+install(FILES dist/htdocs/css/mympd.min.css DESTINATION share/${PROJECT_NAME}/htdocs/css/)
 install(DIRECTORY htdocs/assets DESTINATION share/${PROJECT_NAME}/htdocs)
 install(DIRECTORY DESTINATION /var/lib/${PROJECT_NAME}/)
-install(FILES contrib/mympd.conf DESTINATION /etc/${PROJECT_NAME}/)

README.md

@@ -25,6 +25,8 @@ This fork provides a reworked ui based on Bootstrap 4, a modernized backend and
  - Local coverart support
  - HTTP stream support
  - Local playback of mpd http stream (html5 audio api)
+ - Play statistics and song voting (uses mpd stickers)
+ - Embedded Webserver (mongoose)
 
 myMPD is work in progress. Bugreportes and feature requests are very welcome.
 - Issues and feature requests: https://github.com/jcorporation/myMPD/issues
@@ -61,7 +63,7 @@ Build Dependencies
 Unix Build Instructions
 -----------------------
 
-1. Install dependencies: cmake, libmpdclient (dev) and OpenSSL (dev), java are available from all major distributions.
+1. Install dependencies: cmake, libmpdclient (dev), OpenSSL (dev) and java are available from all major distributions.
 2. Build and install: ```cd /path/to/src; ./mkrelease.sh```.
 3. Link your mpd music directory to ```/usr/share/mympd/htdocs/library``` and put ```folder.jpg``` files in your album directories (mkrelease.sh tries to do this for you).
 4. Configure your mpd with http stream output to use the local player.

contrib/mympd.1

@@ -1,6 +1,6 @@
 .\" Manpage for myMPD.
 .\" Contact [email protected] to correct errors or typos.
-.TH man 1 "06 Aug 2018" "3.5.0" "myMPD man page"
+.TH man 1 "22 Aug 2018" "4.0.0" "myMPD man page"
 .SH NAME
 myMPD \- Standalone MPD Web GUI written in C, utilizing Websockets and Bootstrap/JS
 .SH SYNOPSIS

contrib/mympd.conf

@@ -25,3 +25,9 @@ coverimage = folder.jpg
 
 #myMPD statefile
 statefile = /var/lib/mympd/mympd.state
+
+#Enable mixramp settings
+mixramp = false
+
+#Enable usage of mpd stickers for play statistics and voting
+stickers = true