diff --git a/CMakeLists.txt b/CMakeLists.txt index d092bc3bf..bdf5a81b0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,7 +36,7 @@ set(CANTATA_VERSION_FULL "${CANTATA_VERSION}.${CPACK_PACKAGE_VERSION_PATCH}") set(CANTATA_VERSION_WITH_SPIN "${CANTATA_VERSION_FULL}${CPACK_PACKAGE_VERSION_SPIN}") set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CANTATA_VERSION_WITH_SPIN}") set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CANTATA_VERSION_WITH_SPIN}") -set(CPACK_SOURCE_IGNORE_FILES "/.svn/;/.git/;.gitignore;.project;CMakeLists.txt.user;README.md") +set(CPACK_SOURCE_IGNORE_FILES "/.svn/;/.git/;.gitignore;.project;CMakeLists.txt.user;README.md;/screenshots/") include(CPack) include(MacroLogFeature) diff --git a/README.md b/README.md index bebf15d34..e7317b39f 100644 --- a/README.md +++ b/README.md @@ -1,48 +1,33 @@ -Introduction -============ +Cantata +======= -Cantata is a graphical client for MPD, supporting the following features: +![ScreenShot](screenshots/mainwindow.png) - 1. Support for Linux, MacOSX, and Windows. - 2. Multiple MPD collections. - 3. Highly customisable layout. - 4. Songs grouped by album in play queue. - 5. Context view to show artist, album, and song information of current track. - 6. Simple tag editor. - 7. File organizer - use tags to organize files and folders. - 8. Ability to calculate ReplyGain tags. (Linux only, and if relevant libraries - installed) - 9. Dynamic playlists. - 10. Online services; Jamendo, Magnatune, SoundCloud, and Podcasts. - 11. Radio stream support - with the ability to search for streams via TuneIn, - ShoutCast, or Dirble. - 12. USB-Mass-Storage and MTP device support. (Linux only, and if relevant - libraries installed) - 13. Audio CD ripping and playback. (Linux only, and if relevant libraries - installed) - 14. Playback of non-MPD songs - via simple in-built HTTP server if connected - to MPD via a standard socket, otherwise filepath is sent to MPD. - 15. MPRISv2 DBUS interface. - 16. Basic support for touch-style interface (views are made 'flickable') + +A graphical (Qt5) client for MPD, supporting the following features: + + 1. Supports Linux, macOS, and Windows. + 2. Multiple MPD collections. + 3. Highly customisable layout. + 4. Songs (optionally) grouped by album in play queue. + 5. Context view to show artist, album, and song information of current track. + 6. Simple tag editor. + 7. File organizer - use tags to organize files and folders. + 8. Ability to calculate ReplyGain tags. (Linux only, and if relevant libraries installed) + 9. Dynamic playlists. + 10. Smart Playlists. + 11. Online services; Jamendo, Magnatune, SoundCloud, and Podcasts. + 12. Radio stream support - with the ability to search for streams via TuneIn, ShoutCast, or Dirble. + 13. USB-Mass-Storage and MTP device support. (Linux only, and if relevant libraries installed) + 14. Audio CD ripping and playback. (Linux only, and if relevant libraries installed) + 15. Playback of non-MPD songs - via simple in-built HTTP server. + 16. MPRISv2 DBUS interface. 17. Scrobbling. 18. Ratings support. -Cantata started off as a fork of QtMPC, however, the code (and user interface) -is now *very* different to that of QtMPC. +Cantata started off as a fork of QtMPC, however, the code (and user interface) is now *very* different to that of QtMPC. For more detailed information, please refer to the main [README](https://raw.githubusercontent.com/CDrummond/cantata/master/README) -Screenshots -=========== - -Some (outdated, 1.x) screenshots can be found at the [kde-apps](http://kde-apps.org/content/show.php/Cantata?content=147733) page. - -Downloads -========= - -Curently I'm developing v2, and as such the older 1.x is no longer actively -maintained (the code base is *very* different). However, these older versions -may still be downloaded from [Cantata's github wiki](https://github.com/CDrummond/cantata/wiki/Previous-%28Google-Code%29-Downloads) - --- diff --git a/screenshots/mainwindow.png b/screenshots/mainwindow.png new file mode 100644 index 000000000..9a2305a79 Binary files /dev/null and b/screenshots/mainwindow.png differ